From d4de26d8497fcc6c5e829bfd6c9719384cc4b6ee Mon Sep 17 00:00:00 2001 From: Phil Blowey Date: Fri, 13 Mar 2026 12:38:09 +0000 Subject: [PATCH 1/3] Pick up swap of xia2/XDS and xia2/3dii labels --- src/dlstbx/mimas/core.py | 4 +--- src/dlstbx/mimas/vmxi.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/dlstbx/mimas/core.py b/src/dlstbx/mimas/core.py index 47e1ebb4b..f4a561615 100644 --- a/src/dlstbx/mimas/core.py +++ b/src/dlstbx/mimas/core.py @@ -335,10 +335,8 @@ def handle_rotation_end( ) for ppl, recipe in ( ("xia2/DIALS", "autoprocessing-xia2-dials"), - ("xia2/XDS", "autoprocessing-xia2-3dii"), + ("xia2/3dii", "autoprocessing-xia2-3dii"), ("autoPROC", "autoprocessing-autoPROC"), - ("mxia2/DIALS", "autoprocessing-multi-xia2-dials"), - ("mxia2/XDS", "autoprocessing-multi-xia2-3dii"), ): ppl_autostart[ppl] = False ppl_suffix[ppl] = suffix_pref diff --git a/src/dlstbx/mimas/vmxi.py b/src/dlstbx/mimas/vmxi.py index f2283b8bf..7f6ca309f 100644 --- a/src/dlstbx/mimas/vmxi.py +++ b/src/dlstbx/mimas/vmxi.py @@ -112,7 +112,7 @@ def handle_vmxi_rotation_scan( # xia2-3dii mimas.MimasISPyBJobInvocation( DCID=scenario.DCID, - autostart=scenario.preferred_processing == "xia2/XDS", + autostart=scenario.preferred_processing == "xia2/3dii", recipe="autoprocessing-xia2-3dii-eiger", source="automatic", displayname="xia2 3dii", From 71da4535818cb63d6967715eda4dfa6c6aafe506 Mon Sep 17 00:00:00 2001 From: Phil Blowey Date: Fri, 13 Mar 2026 12:43:43 +0000 Subject: [PATCH 2/3] Add new pipeline id definitions --- src/dlstbx/services/ispybsvc.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dlstbx/services/ispybsvc.py b/src/dlstbx/services/ispybsvc.py index 7f23a4a97..f9a314091 100644 --- a/src/dlstbx/services/ispybsvc.py +++ b/src/dlstbx/services/ispybsvc.py @@ -377,9 +377,11 @@ def get_pipeline_id(self, program: str, upstream_source: str | None) -> int | No "fast_dp": 3, "xia2.multiplex": 5, "xia2 dials": 6, - "xia2 dials (multi)": 6, - "xia2 3dii": 7, # xds + "xia2 dials (multi)": 15, + "xia2 3dii": 7, + "xia2 3dii (multi)": 16, "autoPROC": 8, + "autoPROC+STARANISO": 14, "fast_ep": 9, "dimple": 10, "MrBUMP": 11, From 4e4d8260123b75e2d42258434bc6ca467b99fac4 Mon Sep 17 00:00:00 2001 From: Phil Blowey Date: Fri, 13 Mar 2026 14:20:59 +0000 Subject: [PATCH 3/3] Re-add multi xia2 labels and change missed keys --- src/dlstbx/mimas/core.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/dlstbx/mimas/core.py b/src/dlstbx/mimas/core.py index f4a561615..93e9648ad 100644 --- a/src/dlstbx/mimas/core.py +++ b/src/dlstbx/mimas/core.py @@ -337,6 +337,8 @@ def handle_rotation_end( ("xia2/DIALS", "autoprocessing-xia2-dials"), ("xia2/3dii", "autoprocessing-xia2-3dii"), ("autoPROC", "autoprocessing-autoPROC"), + ("mxia2/DIALS", "autoprocessing-multi-xia2-dials"), + ("mxia2/3dii", "autoprocessing-multi-xia2-3dii"), ): ppl_autostart[ppl] = False ppl_suffix[ppl] = suffix_pref @@ -370,8 +372,8 @@ def handle_rotation_end( # xia2-3dii mimas.MimasISPyBJobInvocation( DCID=scenario.DCID, - autostart=ppl_autostart["xia2/XDS"], - recipe=f"autoprocessing-xia2-3dii{ppl_suffix['xia2/XDS']}", + autostart=ppl_autostart["xia2/3dii"], + recipe=f"autoprocessing-xia2-3dii{ppl_suffix['xia2/3dii']}", source="automatic", displayname="xia2 3dii", parameters=( @@ -380,7 +382,7 @@ def handle_rotation_end( ), *params, ), - triggervariables=ppl_triggervars["xia2/XDS"], + triggervariables=ppl_triggervars["xia2/3dii"], ), # autoPROC mimas.MimasISPyBJobInvocation( @@ -419,7 +421,7 @@ def handle_rotation_end( mimas.MimasISPyBJobInvocation( DCID=scenario.DCID, autostart=False, # no priority processing for multi-xia2 - recipe=f"autoprocessing-multi-xia2-3dii{ppl_suffix['mxia2/XDS']}", + recipe=f"autoprocessing-multi-xia2-3dii{ppl_suffix['mxia2/3dii']}", source="automatic", displayname="xia2 3dii (multi)", parameters=( @@ -429,7 +431,7 @@ def handle_rotation_end( *params, ), sweeps=tuple(scenario.getsweepslistfromsamedcg), - triggervariables=ppl_triggervars["mxia2/XDS"], + triggervariables=ppl_triggervars["mxia2/3dii"], ), ] )