Add xia2.overload to udc strategy pipeline (#359)

pblowey · pjnaughton · web-flow · commit f3fdabcd181d · 2026-04-22T12:01:31.000+01:00
Co-authored-by: Paul Naughton &lt;paul.naughton@diamond.ac.uk&gt;
diff --git a/src/dlstbx/services/strategy.py b/src/dlstbx/services/strategy.py
@@ -193,9 +193,12 @@ def generate_strategy(
             )
         beamline_config = parse_config_file(beamline_config_file)
 
+        scaled_transmission = parameters.get("scaled_transmission", 1.0) 
+
         transmission_limits = (
             get_beamline_param(beamline_config, ("gda.mx.udc.minTransmission",), 0.0),
-            get_beamline_param(beamline_config, ("gda.mx.udc.maxTransmission",), 1.0),
+            min(get_beamline_param(beamline_config, ("gda.mx.udc.maxTransmission",), 1.0), 
+                scaled_transmission)
         )
         exposure_time_limits = (
             get_beamline_param(
diff --git a/src/dlstbx/wrapper/xia2_overload.py b/src/dlstbx/wrapper/xia2_overload.py
@@ -13,52 +13,6 @@
 class Xia2OverloadWrapper(Wrapper):
     _logger_name = "dlstbx.wrap.xia2_overload"
 
-    def send_to_ispyb(self, transmission):
-        ispyb_command_list = []
-
-        d = {
-            "program": "xia2.overload",
-            "ispyb_command": "insert_screening_output",
-            "screening_id": "$ispyb_screening_id",
-            "store_result": "ispyb_screening_output_id",
-        }
-        ispyb_command_list.append(d)
-
-        d = {
-            "ispyb_command": "insert_screening_strategy",
-            "transmission": transmission,
-            "screening_output_id": "$ispyb_screening_output_id",
-            "store_result": "ispyb_screening_strategy_id",
-        }
-        ispyb_command_list.append(d)
-        
-        d = {
-            "ispyb_command": "insert_screening_strategy_wedge",
-            "screening_strategy_id": "$ispyb_screening_strategy_id",
-            "store_result": "ispyb_screening_strategy_wedge_id",
-        }
-        ispyb_command_list.append(d)
-        
-        d = {
-            "ispyb_command": "insert_screening_strategy_sub_wedge",
-            "transmission": transmission,
-            "screening_strategy_wedge_id": "$ispyb_screening_strategy_wedge_id",
-            "store_result": "ispyb_screening_strategy_sub_wedge_id",
-        }
-        ispyb_command_list.append(d)
-        
-        d = {
-            "ispyb_command": "update_processing_status",
-            "program_id": "$ispyb_autoprocprogram_id",
-            "message": "Processing successful",
-            "status": "success",
-        }
-        ispyb_command_list.append(d)
-
-        self.recwrap.send_to("ispyb", {"ispyb_command_list": ispyb_command_list})
-        self.log.info("Sent %d commands to ISPyB", len(ispyb_command_list))
-        self.log.debug("Sending %s", json.dumps(ispyb_command_list, indent=2))
-
     def run(self):
         assert hasattr(self, "recwrap"), "No recipewrapper object found"
 
@@ -121,9 +75,9 @@ def run(self):
         saturation = (max_count / overload_limit) * average_to_peak
         scale_factor = target_countrate_pct / saturation
 
-        scaled_transmission = transmission * scale_factor
-        self.send_to_ispyb(min(100, scaled_transmission))
+        scaled_transmission = min(1, ( transmission * scale_factor ) / 100)
 
+        self.recwrap.send_to("strategy", {"parameters": {"scaled_transmission": scaled_transmission}})
         self.log.info("Done.")
         return True
 

Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,12 @@ def generate_strategy(`
`193`	`193`	`)`
`194`	`194`	`beamline_config = parse_config_file(beamline_config_file)`
`195`	`195`
	`196`	`+ scaled_transmission = parameters.get("scaled_transmission", 1.0)`
	`197`	`+`
`196`	`198`	`transmission_limits = (`
`197`	`199`	`get_beamline_param(beamline_config, ("gda.mx.udc.minTransmission",), 0.0),`
`198`		`- get_beamline_param(beamline_config, ("gda.mx.udc.maxTransmission",), 1.0),`
	`200`	`+ min(get_beamline_param(beamline_config, ("gda.mx.udc.maxTransmission",), 1.0),`
	`201`	`+ scaled_transmission)`
`199`	`202`	`)`
`200`	`203`	`exposure_time_limits = (`
`201`	`204`	`get_beamline_param(`