Accommodate ispyb pipelineid changes (#349)

* Pick up swap of xia2/XDS and xia2/3dii labels

* Add new pipeline id definitions

Author: pblowey

src/dlstbx/mimas/core.py

@@ -335,10 +335,10 @@ 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"),
+        ("mxia2/3dii", "autoprocessing-multi-xia2-3dii"),
     ):
         ppl_autostart[ppl] = False
         ppl_suffix[ppl] = suffix_pref
@@ -372,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=(
@@ -382,7 +382,7 @@ def handle_rotation_end(
                         ),
                         *params,
                     ),
-                    triggervariables=ppl_triggervars["xia2/XDS"],
+                    triggervariables=ppl_triggervars["xia2/3dii"],
                 ),
                 # autoPROC
                 mimas.MimasISPyBJobInvocation(
@@ -421,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=(
@@ -431,7 +431,7 @@ def handle_rotation_end(
                             *params,
                         ),
                         sweeps=tuple(scenario.getsweepslistfromsamedcg),
-                        triggervariables=ppl_triggervars["mxia2/XDS"],
+                        triggervariables=ppl_triggervars["mxia2/3dii"],
                     ),
                 ]
             )

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",

src/dlstbx/services/ispybsvc.py

@@ -387,9 +387,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,