mx-bluesky 1.5.10__py3-none-any.whl → 1.5.12__py3-none-any.whl

mx_bluesky/beamlines/i24/serial/extruder/{i24ssx_Extruder_Collect_py3v2.py → i24ssx_extruder_collect_py3v2.py}

@@ -46,7 +46,7 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline import (
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline import setup_beamline as sup
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
-    UnknownDetectorType,
+    UnknownDetectorTypeError,
     get_detector_type,
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_zebra_plans import (
@@ -113,17 +113,17 @@ def laser_check(
     """
     SSX_LOGGER.debug(f"Laser check: {mode}")
 
-    LASER_TTL = zebra.mapping.outputs.TTL_PILATUS  # Update with dodal changes
+    laser_ttl = zebra.mapping.outputs.TTL_PILATUS  # Update with dodal changes
 
     if mode == "laseron":
         yield from bps.abs_set(
-            zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.SOFT_IN3
+            zebra.output.out_pvs[laser_ttl], zebra.mapping.sources.SOFT_IN3
         )
         yield from set_shutter_mode(zebra, "auto")
 
     if mode == "laseroff":
         yield from bps.abs_set(
-            zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.DISCONNECT
+            zebra.output.out_pvs[laser_ttl], zebra.mapping.sources.DISCONNECT
         )
         yield from set_shutter_mode(zebra, "manual")
 
@@ -230,7 +230,7 @@ def main_extruder_plan(
 
         SSX_LOGGER.debug(f"Creating the directory for the collection in {filepath}.")
 
-        caput(pv.eiger_seqID, int(caget(pv.eiger_seqID)) + 1)
+        caput(pv.eiger_seq_id, int(caget(pv.eiger_seq_id)) + 1)
         SSX_LOGGER.info(f"Eiger quickshot setup: filepath {filepath}")
         SSX_LOGGER.info(f"Eiger quickshot setup: filepath {parameters.filename}")
         SSX_LOGGER.info(
@@ -253,6 +253,7 @@ def main_extruder_plan(
                     parameters.exposure_time_s,
                 ],
                 dcm,
+                detector_stage,
             )
             yield from setup_zebra_for_extruder_with_pump_probe_plan(
                 zebra,
@@ -275,6 +276,7 @@ def main_extruder_plan(
                     parameters.exposure_time_s,
                 ],
                 dcm,
+                detector_stage,
             )
             yield from setup_zebra_for_quickshot_plan(
                 zebra, parameters.exposure_time_s, parameters.num_images, wait=True
@@ -282,7 +284,7 @@ def main_extruder_plan(
     else:
         err = f"Unknown Detector Type, det_type = {parameters.detector_name}"
         SSX_LOGGER.error(err)
-        raise UnknownDetectorType(err)
+        raise UnknownDetectorTypeError(err)
 
     beam_settings = yield from read_beam_info_from_hardware(
         dcm, mirrors, beam_center_device, parameters.detector_name
@@ -291,7 +293,7 @@ def main_extruder_plan(
     # Do DCID creation BEFORE arming the detector
     filetemplate = f"{parameters.filename}.nxs"
     if parameters.detector_name == "eiger":
-        complete_filename = cagetstring(pv.eiger_ODfilenameRBV)
+        complete_filename = cagetstring(pv.eiger_od_filename_rbv)
         filetemplate = f"{complete_filename}.nxs"
     dcid.generate_dcid(
         beam_settings=beam_settings,
@@ -374,6 +376,7 @@ def tidy_up_at_collection_end_plan(
     parameters: ExtruderParameters,
     dcid: DCID,
     dcm: DCM,
+    detector_stage: YZStage,
 ) -> MsgGenerator:
     """A plan to tidy up at the end of a collection, successful or aborted.
 
@@ -386,8 +389,8 @@ def tidy_up_at_collection_end_plan(
 
     # Clean Up
     if parameters.detector_name == "eiger":
-        yield from sup.eiger("return-to-normal", None, dcm)
-        SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seqID)}")
+        yield from sup.eiger("return-to-normal", None, dcm, detector_stage)
+        SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seq_id)}")
     SSX_LOGGER.debug("End of Run")
     SSX_LOGGER.info("Close hutch shutter")
     yield from bps.abs_set(shutter, ShutterDemand.CLOSE, wait=True)
@@ -402,7 +405,7 @@ def collection_complete_plan(
     if detector_name == "eiger":
         SSX_LOGGER.info("Eiger Acquire STOP")
         caput(pv.eiger_acquire, 0)
-        caput(pv.eiger_ODcapture, "Done")
+        caput(pv.eiger_od_capture, "Done")
 
     yield from bps.sleep(0.5)
 
@@ -413,32 +416,20 @@ def collection_complete_plan(
     yield from bps.null()
 
 
-def run_extruder_plan(
-    zebra: Zebra = inject("zebra"),
-    aperture: Aperture = inject("aperture"),
-    backlight: DualBacklight = inject("backlight"),
-    beamstop: Beamstop = inject("beamstop"),
-    detector_stage: YZStage = inject("detector_motion"),
-    shutter: HutchShutter = inject("shutter"),
-    dcm: DCM = inject("dcm"),
-    mirrors: FocusMirrorsMode = inject("focus_mirrors"),
-    attenuator: ReadOnlyAttenuator = inject("attenuator"),
-    beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+def run_plan_in_wrapper(
+    zebra: Zebra,
+    aperture: Aperture,
+    backlight: DualBacklight,
+    beamstop: Beamstop,
+    detector_stage: YZStage,
+    shutter: HutchShutter,
+    dcm: DCM,
+    mirrors: FocusMirrorsMode,
+    beam_center_eiger: DetectorBeamCenter,
+    parameters: ExtruderParameters,
+    dcid: DCID,
+    start_time: datetime,
 ) -> MsgGenerator:
-    start_time = datetime.now()
-    SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
-
-    parameters: ExtruderParameters = yield from read_parameters(
-        detector_stage, attenuator
-    )
-    # Create collection directory
-    parameters.collection_directory.mkdir(parents=True, exist_ok=True)
-
-    beam_center_device = beam_center_eiger
-
-    # DCID - not generated yet
-    dcid = DCID(emit_errors=False, expt_params=parameters)
-
     yield from bpp.contingency_wrapper(
         main_extruder_plan(
             zebra=zebra,
@@ -449,7 +440,7 @@ def run_extruder_plan(
             shutter=shutter,
             dcm=dcm,
             mirrors=mirrors,
-            beam_center_device=beam_center_device,
+            beam_center_device=beam_center_eiger,
             parameters=parameters,
             dcid=dcid,
             start_time=start_time,
@@ -464,8 +455,50 @@ def run_extruder_plan(
         ),
         final_plan=lambda: (
             yield from tidy_up_at_collection_end_plan(
-                zebra, shutter, parameters, dcid, dcm
+                zebra, shutter, parameters, dcid, dcm, detector_stage
             )
         ),
         auto_raise=False,
     )
+
+
+def run_extruder_plan(
+    zebra: Zebra = inject("zebra"),
+    aperture: Aperture = inject("aperture"),
+    backlight: DualBacklight = inject("backlight"),
+    beamstop: Beamstop = inject("beamstop"),
+    detector_stage: YZStage = inject("detector_motion"),
+    shutter: HutchShutter = inject("shutter"),
+    dcm: DCM = inject("dcm"),
+    mirrors: FocusMirrorsMode = inject("focus_mirrors"),
+    attenuator: ReadOnlyAttenuator = inject("attenuator"),
+    beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+) -> MsgGenerator:
+    start_time = datetime.now()
+    SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
+
+    parameters: ExtruderParameters = yield from read_parameters(
+        detector_stage, attenuator
+    )
+    # Create collection directory
+    parameters.collection_directory.mkdir(parents=True, exist_ok=True)
+
+    beam_center_device = beam_center_eiger
+
+    # DCID - not generated yet
+    dcid = DCID(emit_errors=False, expt_params=parameters)
+
+    yield from run_plan_in_wrapper(
+        zebra,
+        aperture,
+        backlight,
+        beamstop,
+        detector_stage,
+        shutter,
+        dcm,
+        mirrors,
+        beam_center_device,
+        parameters,
+        dcid,
+        start_time,
+    )

mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 1203
-y 544
+y 581
 w 550
 h 380
 font "arial-medium-r-18.0"
@@ -89,7 +89,7 @@ x 143
 y 82
 w 110
 h 30
-controlPv "BL24I-MO-IOC-01:GP6"
+controlPv "BL24I-MO-IOC-13:GP6"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25
@@ -180,7 +180,7 @@ x 144
 y 126
 w 110
 h 30
-controlPv "BL24I-MO-IOC-01:GP7"
+controlPv "BL24I-MO-IOC-13:GP7"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25
@@ -464,7 +464,7 @@ x 145
 y 171
 w 110
 h 30
-controlPv "BL24I-MO-IOC-01:GP8"
+controlPv "BL24I-MO-IOC-13:GP8"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25
@@ -580,7 +580,7 @@ h 144
 lineColor index 7
 fill
 fillColor index 7
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -598,7 +598,7 @@ h 143
 lineColor index 7
 fill
 fillColor index 7
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -618,7 +618,7 @@ fontAlign "center"
 fgColor index 14
 bgColor index 0
 useDisplayBg
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 value {
@@ -648,7 +648,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "caput BL24I-EA-CHIP-01:PMAC_STRING \\#5hmz\\#6hmz\\#7hmz"
+  0 "caput BL24I-MO-IOC-13:PMAC:console \\#5hmz\\#6hmz\\#7hmz"
 }
 endObjectProperties
 
@@ -728,7 +728,7 @@ h 143
 lineColor index 7
 fill
 fillColor index 7
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -748,7 +748,7 @@ fontAlign "center"
 fgColor index 14
 bgColor index 0
 useDisplayBg
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 value {
@@ -792,7 +792,7 @@ x 146
 y 209
 w 110
 h 25
-controlPv "BL24I-MO-IOC-01:GP99"
+controlPv "BL24I-MO-IOC-13:GP99"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25

mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 1205
-y 616
+y 653
 w 450
 h 180
 font "arial-medium-r-18.0"
@@ -78,9 +78,9 @@ fgColour index 14
 bgColour index 4
 topShadowColour index 1
 botShadowColour index 8
-controlPv "BL24I-MO-IOC-01:GP101"
+controlPv "BL24I-MO-IOC-13:GP101"
 font "arial-medium-r-18.0"
-numItems 2
+numItems 1
 symbolTag {
   0 "Eiger"
 }