Skip to content

Commit

Permalink
Merge pull request #430 from xchem/ccdc-csds
Browse files Browse the repository at this point in the history
update mogul path to CSDS 2024
  • Loading branch information
rowanwalker96 authored Jan 6, 2025
2 parents 0fbf3a0 + 28f040a commit 6294bbb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion XChemExplorer_dls
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module load buster/20240123
module load phenix/1.20
module load ccp4/7.1.018

export BDG_TOOL_MOGUL="/dls_sw/apps/ccdc/CSD_2020/bin/mogul"
export BDG_TOOL_MOGUL="/dls_sw/apps/CSDS/2024.1.0/ccdc-software/mogul/bin/mogul"
export XChemExplorer_DIR=$(readlink -e $0 | xargs dirname)
export LD_PRELOAD="/usr/lib64/libfreetype.so:${LD_PRELOAD}"

Expand Down
3 changes: 2 additions & 1 deletion xce/lib/XChemRefine.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,8 @@ def add_validation(self, cmd, cycle, program):
)
buster_report += "cd " + self.ProjectPath + "/" + self.xtalID + "\n"
buster_report += (
"export BDG_TOOL_MOGUL=/dls_sw/apps/ccdc/CSD_2020/bin/mogul\n"
"export BDG_TOOL_MOGUL="
"/dls_sw/apps/CSDS/2024.1.0/ccdc-software/mogul/bin/mogul\n"
)
buster_report += "buster-report -d Refine_%s\n" % cycle

Expand Down
6 changes: 4 additions & 2 deletions xce/lib/XChemUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ def make_png(
software += "module load buster/20240123\n"
software += (
"export BDG_TOOL_MOGUL="
"/dls_sw/apps/ccdc/CSD_2020/bin/mogul\n"
"/dls_sw/apps/CSDS/2024.1.0/ccdc-software/mogul/bin/mogul"
"\n"
)
software += "export BDG_TOOL_OBABEL='none'\n"

Expand Down Expand Up @@ -184,7 +185,8 @@ def make_png(
software += "module load ccp4/7.1.018\n"
software += "module load buster/20240123\n"
software += (
"export BDG_TOOL_MOGUL=/dls_sw/apps/ccdc/CSD_2020/bin/mogul\n"
"export BDG_TOOL_MOGUL="
"/dls_sw/apps/CSDS/2024.1.0/ccdc-software/mogul/bin/mogul\n"
)
software += "export BDG_TOOL_OBABEL='none'\n"
if external_software["mogul"]:
Expand Down

0 comments on commit 6294bbb

Please sign in to comment.