Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update mogul path to CSDS 2024 #430

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading