mx-bluesky 1.4.0__py3-none-any.whl → 1.4.1a0__py3-none-any.whl

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py

@@ -1,4 +1,3 @@
-import logging
 from time import sleep
 
 import bluesky.plan_stubs as bps
@@ -7,11 +6,10 @@ from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 
+from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
 from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caget, caput
 
-logger = logging.getLogger("I24ssx.sup")
-
 
 def setup_beamline_for_collection_plan(
     aperture: Aperture,
@@ -20,7 +18,7 @@ def setup_beamline_for_collection_plan(
     group: str = "setup_beamline_collect",
     wait: bool = True,
 ):
-    logger.debug("Setup beamline: collect.")
+    SSX_LOGGER.debug("Setup beamline: collect.")
     yield from bps.abs_set(aperture.position, AperturePositions.IN, group=group)
     yield from bps.abs_set(backlight, BacklightPositions.OUT, group=group)
     yield from bps.sleep(3)  # Not sure needed - to test
@@ -38,8 +36,8 @@ def move_detector_stage_to_position_plan(
     detector_stage: DetectorMotion,
     detector_distance: float,
 ):
-    logger.debug("Setup beamline: moving detector stage.")
-    logger.debug(
+    SSX_LOGGER.debug("Setup beamline: moving detector stage.")
+    SSX_LOGGER.debug(
         f"Waiting for detector move. Detector distance: {detector_distance} mm."
     )
     yield from bps.mv(detector_stage.z, detector_distance)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
@@ -60,7 +58,7 @@ def modechange(action):
         caput(pv.fluo_trans, "OUT")
         caput(pv.cstrm_p1701, 0)
         caput(pv.cstrm_mp_select, "Out")
-        logger.debug("Pin Hand Mount Done")
+        SSX_LOGGER.debug("Pin Hand Mount Done")
 
     # Pin Room Tempreature Hand Mount
     elif action == "Pin_rt_hand_mount":
@@ -75,7 +73,7 @@ def modechange(action):
         caput(pv.vgon_pinxs, 0)
         caput(pv.vgon_pinzs, 0)
         caput(pv.fluo_trans, "OUT")
-        logger.debug("RT Pin Hand Mount Done")
+        SSX_LOGGER.debug("RT Pin Hand Mount Done")
 
     # Pin Data Collection
     elif action == "Pin_data_collection":
@@ -94,11 +92,11 @@ def modechange(action):
         caput(pv.bs_mp_select, "Data Collection")
         sleep(2.3)
         caput(pv.bl_mp_select, "In")
-        logger.debug("Pin Data Collection Done")
+        SSX_LOGGER.debug("Pin Data Collection Done")
 
     # Pin Room Tempreature Data Collection
     elif action == "Pin_rt_data_collection":
-        logger.debug("RT Mode")
+        SSX_LOGGER.debug("RT Mode")
         caput(pv.cstrm_p1701, 0)
         caput(pv.cstrm_mp_select, "Away")
         caput(pv.aptr1_mp_select, "In")
@@ -114,7 +112,7 @@ def modechange(action):
         sleep(2.6)
         caput(pv.bl_mp_select, "In")
         caput(pv.bs_mp_select, "Data Collection")
-        logger.debug("RT Data Collection Done")
+        SSX_LOGGER.debug("RT Data Collection Done")
 
     # Tray Hand Mount
     elif action == "Tray_hand_mount":
@@ -128,7 +126,7 @@ def modechange(action):
         caput(pv.bs_mp_select, "Tray Mount")
         while float(caget(pv.ttab_x + ".RBV")) > 3:
             sleep(1)
-        logger.debug("Tray Hand Mount Done")
+        SSX_LOGGER.debug("Tray Hand Mount Done")
 
     # Tray Robot Load. This action needs to be reviewed and revised
     elif action == "Tray_robot_load":
@@ -150,11 +148,11 @@ def modechange(action):
         caput(pv.bs_roty, 0)
         sleep(4)
         caput(pv.bl_mp_select, "In")
-        logger.debug("Tray Robot Mount Done")
+        SSX_LOGGER.debug("Tray Robot Mount Done")
 
     # Tray Data Collection
     elif action == "Tray_data_collection":
-        logger.debug("This should be E11 on the test tray (CrystalQuickX)")
+        SSX_LOGGER.debug("This should be E11 on the test tray (CrystalQuickX)")
         caput(pv.ttab_x, 37.4)
         caput(pv.hgon_trayys, -8.0)
         caput(pv.hgon_trayzs, -2.1)
@@ -171,7 +169,7 @@ def modechange(action):
         caput(pv.bs_roty, 0)
         sleep(4)
         caput(pv.bl_mp_select, "In")
-        logger.debug("Tray Data Collection Done")
+        SSX_LOGGER.debug("Tray Data Collection Done")
 
     # Pin Switch to Tray
     elif action == "Pin_switch2tray":
@@ -192,19 +190,19 @@ def modechange(action):
         caput(pv.vgon_pinyh, 0)
         caput(pv.vgon_pinzs, 0)
         while float(caget(pv.ttab_x + ".RBV")) > 1:
-            logger.debug(f"moving ttab_x {caget(pv.ttab_x)}")
+            SSX_LOGGER.debug(f"moving ttab_x {caget(pv.ttab_x)}")
             sleep(0.1)
         while caget(pv.fluo_out_limit) == "OFF":
-            logger.debug("waiting on fluorescence detector")
+            SSX_LOGGER.debug("waiting on fluorescence detector")
             sleep(0.1)
         while caget(pv.bl_mp_select) != "Out":
-            logger.debug("waiting on back light to move to out")
+            SSX_LOGGER.debug("waiting on back light to move to out")
             sleep(0.1)
         caput(pv.bs_mp_select, "Robot")
         caput(pv.bs_roty, 0)
         while float(caget(pv.ptab_y + ".RBV")) > -89.0:
             sleep(1)
-        logger.debug("Switch To Tray Done")
+        SSX_LOGGER.debug("Switch To Tray Done")
 
     # Tray Switch to Pin
     elif action == "Tray_switch2pin":
@@ -218,26 +216,26 @@ def modechange(action):
         while float(caget(pv.ptab_y + ".RBV")) < -1.0:
             sleep(1)
         modechange("Pin_data_collection")
-        logger.debug("Switch To Pin Done")
+        SSX_LOGGER.debug("Switch To Pin Done")
     else:
-        logger.debug(f"Unknown action: {action}")
+        SSX_LOGGER.debug(f"Unknown action: {action}")
     return 1
 
 
 def pilatus(action, args_list):
-    logger.debug("***** Entering Pilatus")
-    logger.info(f"Setup pilatus - {action}")
+    SSX_LOGGER.debug("***** Entering Pilatus")
+    SSX_LOGGER.info(f"Setup pilatus - {action}")
     if args_list:
         for arg in args_list:
-            logger.debug(f"Argument: {arg}")
+            SSX_LOGGER.debug(f"Argument: {arg}")
 
     # caput(pv.pilat_wavelength, caget(pv.dcm_lambda))
     caput(pv.pilat_detdist, caget(pv.det_z))
     caput(pv.pilat_filtertrasm, caget(pv.attn_match))
-    logger.warning("WARNING: Have you set beam X and Y?")
+    SSX_LOGGER.warning("WARNING: Have you set beam X and Y?")
     # 16 Fed 2022 last change DA
-    caput(pv.pilat_beamx, 1298)
-    caput(pv.pilat_beamy, 1307)
+    caput(pv.pilat_beamx, 1284.7)
+    caput(pv.pilat_beamy, 1308.6)
     sleep(0.1)
 
     # Fixed Target stage (very fast start and stop w/ triggering from GeoBrick
@@ -245,12 +243,12 @@ def pilatus(action, args_list):
         [filepath, filename, total_numb_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         acqtime = float(exptime) - 0.001
-        logger.debug(f"Filepath was set as {filepath}")
-        logger.debug(f"Rampath set as {rampath}")
-        logger.debug(f"Filename set as {filename}")
-        logger.debug(f"total_numb_imgs {total_numb_imgs}")
-        logger.debug(f"Exposure time set as {exptime} s")
-        logger.debug(f"Acquire time set as {acqtime} s")
+        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
+        SSX_LOGGER.debug(f"Rampath set as {rampath}")
+        SSX_LOGGER.debug(f"Filename set as {filename}")
+        SSX_LOGGER.debug(f"total_numb_imgs {total_numb_imgs}")
+        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
+        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
         caput(pv.pilat_startangle, 0.0)
         caput(pv.pilat_angleincr, 0.0)
         caput(pv.pilat_omegaincr, 0.0)
@@ -265,7 +263,7 @@ def pilatus(action, args_list):
 
     # Quick set of images no coordinated motion
     elif action == "quickshot":
-        logger.debug("quickshot")
+        SSX_LOGGER.debug("quickshot")
         [filepath, filename, num_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         caput(pv.pilat_filepath, rampath)
@@ -275,13 +273,13 @@ def pilatus(action, args_list):
         acqtime = float(exptime) - 0.001
         caput(pv.pilat_acquiretime, str(acqtime))
         caput(pv.pilat_acquireperiod, str(exptime))
-        logger.debug(f"Filepath was set as {filepath}")
-        logger.debug(f"Rampath set as {rampath}")
-        logger.debug(f"Filename set as {filename}")
-        logger.debug(f"num_imgs {num_imgs}")
-        logger.debug(f"Exposure time set as {exptime} s")
-        logger.debug(f"Acquire time set as {acqtime} s")
-        logger.debug("Pilatus takes time apprx 2sec")
+        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
+        SSX_LOGGER.debug(f"Rampath set as {rampath}")
+        SSX_LOGGER.debug(f"Filename set as {filename}")
+        SSX_LOGGER.debug(f"num_imgs {num_imgs}")
+        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
+        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
+        SSX_LOGGER.debug("Pilatus takes time apprx 2sec")
         sleep(2)
         caput(pv.pilat_delaytime, 0.00)
         caput(pv.pilat_numimages, str(num_imgs))
@@ -290,7 +288,7 @@ def pilatus(action, args_list):
         sleep(0.2)
 
     elif action == "quickshot-internaltrig":
-        logger.debug("quickshot-internaltrig")
+        SSX_LOGGER.debug("quickshot-internaltrig")
         [filepath, filename, num_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         caput(pv.pilat_filepath, rampath)
@@ -300,13 +298,13 @@ def pilatus(action, args_list):
         acqtime = float(exptime) - 0.001
         caput(pv.pilat_acquiretime, str(acqtime))
         caput(pv.pilat_acquireperiod, str(exptime))
-        logger.debug(f"Filepath was set as {filepath}")
-        logger.debug(f"Rampath set as {rampath}")
-        logger.debug(f"Filename set as {filename}")
-        logger.debug(f"num_imgs {num_imgs}")
-        logger.debug(f"Exposure time set as {exptime} s")
-        logger.debug(f"Acquire time set as {acqtime} s")
-        logger.debug("Pilatus takes time apprx 2sec")
+        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
+        SSX_LOGGER.debug(f"Rampath set as {rampath}")
+        SSX_LOGGER.debug(f"Filename set as {filename}")
+        SSX_LOGGER.debug(f"num_imgs {num_imgs}")
+        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
+        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
+        SSX_LOGGER.debug("Pilatus takes time apprx 2sec")
         sleep(2)
         caput(pv.pilat_delaytime, 0.00)
         caput(pv.pilat_numimages, str(num_imgs))
@@ -319,24 +317,24 @@ def pilatus(action, args_list):
         caput(pv.pilat_imagemode, "Continuous")
         caput(pv.pilat_triggermode, "Ext. Trigger")
         caput(pv.pilat_numexpimage, 1)
-    logger.debug("***** leaving pilatus")
+    SSX_LOGGER.debug("***** leaving pilatus")
     sleep(0.1)
     return 0
 
 
 def eiger(action, args_list):
-    logger.debug("***** Entering Eiger")
-    logger.info(f"Setup eiger - {action}")
+    SSX_LOGGER.debug("***** Entering Eiger")
+    SSX_LOGGER.info(f"Setup eiger - {action}")
     if args_list:
         for arg in args_list:
-            logger.debug(f"Argument: {arg}")
+            SSX_LOGGER.debug(f"Argument: {arg}")
     # caput(pv.eiger_wavelength, caget(pv.dcm_lambda))
     caput(pv.eiger_detdist, str(float(caget(pv.det_z)) / 1000))
-    logger.warning("WARNING: Have you set header info?")
+    SSX_LOGGER.warning("WARNING: Have you set header info?")
     caput(pv.eiger_wavelength, caget(pv.dcm_lambda))
     caput(pv.eiger_omegaincr, 0.0)
-    caput(pv.eiger_beamx, 1605.7)
-    caput(pv.eiger_beamy, 1702.7)
+    caput(pv.eiger_beamx, 1600.0)
+    caput(pv.eiger_beamy, 1697.4)
     sleep(0.1)
     # Setup common to all collections ###
     caput(pv.eiger_filewriter, "No")
@@ -354,7 +352,7 @@ def eiger(action, args_list):
     # Quick set of images no coordinated motion
     if action == "quickshot":
         # Sends a single trigger to start data collection
-        logger.debug("Eiger quickshot")
+        SSX_LOGGER.debug("Eiger quickshot")
         [filepath, filename, num_imgs, exptime] = args_list
         filename = filename + "_" + str(caget(pv.eiger_seqID))
         caput(pv.eiger_ODfilepath, filepath)
@@ -363,11 +361,11 @@ def eiger(action, args_list):
         sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
-        logger.debug(f"Filepath was set as {filepath}")
-        logger.debug(f"Filename set as {filename}")
-        logger.debug(f"num_imgs {num_imgs}")
-        logger.debug(f"Exposure time set as {exptime} s")
-        logger.debug(f"Acquire time set as {acqtime} s")
+        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
+        SSX_LOGGER.debug(f"Filename set as {filename}")
+        SSX_LOGGER.debug(f"num_imgs {num_imgs}")
+        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
+        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
         caput(pv.eiger_acquireperiod, str(exptime))
         caput(pv.eiger_numimages, str(num_imgs))
         caput(pv.eiger_imagemode, "Continuous")
@@ -376,7 +374,7 @@ def eiger(action, args_list):
         caput(pv.eiger_manualtrigger, "Yes")
         sleep(1.0)
         # ODIN setup
-        logger.info("Setting up Odin")
+        SSX_LOGGER.info("Setting up Odin")
         caput(pv.eiger_ODfilename, filename)
         caput(pv.eiger_ODfilepath, filepath)
         caput(pv.eiger_ODnumcapture, str(num_imgs))
@@ -386,17 +384,17 @@ def eiger(action, args_list):
         caput(pv.eiger_ODcompress, "BSL24")
         sleep(1.0)
         # All done. Now get Odin to wait for data and start Eiger
-        logger.info("Done: Odin waiting for data")
+        SSX_LOGGER.info("Done: Odin waiting for data")
         caput(pv.eiger_ODcapture, "Capture")
         # If detector fails to arm first time can try twice with a sleep inbetween
-        logger.info("Arming Eiger")
+        SSX_LOGGER.info("Arming Eiger")
         caput(pv.eiger_acquire, "1")
         # Will now wait for Manual trigger. Add the below line to your DAQ script ###
         # caput(pv.eiger_trigger, 1)
 
     if action == "triggered":
         # Send a trigger for every image. Records while TTL is high
-        logger.info("Eiger triggered")
+        SSX_LOGGER.info("Eiger triggered")
         [filepath, filename, num_imgs, exptime] = args_list
         filename = filename + "_" + str(caget(pv.eiger_seqID))
         caput(pv.eiger_ODfilepath, filepath)
@@ -405,11 +403,11 @@ def eiger(action, args_list):
         sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
-        logger.debug(f"Filepath was set as {filepath}")
-        logger.debug(f"Filename set as {filename}")
-        logger.debug(f"num_imgs {num_imgs}")
-        logger.debug(f"Exposure time set as {exptime} s")
-        logger.debug(f"Acquire time set as {acqtime} s")
+        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
+        SSX_LOGGER.debug(f"Filename set as {filename}")
+        SSX_LOGGER.debug(f"num_imgs {num_imgs}")
+        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
+        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
         caput(pv.eiger_acquireperiod, str(exptime))
         caput(pv.eiger_numimages, 1)
         caput(pv.eiger_imagemode, "Continuous")
@@ -418,7 +416,7 @@ def eiger(action, args_list):
         caput(pv.eiger_manualtrigger, "Yes")
         sleep(1.0)
         # ODIN setup #
-        logger.info("Setting up Odin")
+        SSX_LOGGER.info("Setting up Odin")
         caput(pv.eiger_ODfilename, filename)
         caput(pv.eiger_ODfilepath, filepath)
         caput(pv.eiger_ODnumcapture, str(num_imgs))
@@ -428,10 +426,10 @@ def eiger(action, args_list):
         caput(pv.eiger_ODcompress, "BSL24")
         sleep(1.0)
         # All done. Now get Odin to wait for data and start Eiger
-        logger.info("Done: Odin waiting for data")
+        SSX_LOGGER.info("Done: Odin waiting for data")
         caput(pv.eiger_ODcapture, "Capture")
         # If detector fails to arm first time can try twice with a sleep inbetween
-        logger.info("Arming Eiger")
+        SSX_LOGGER.info("Arming Eiger")
         caput(pv.eiger_acquire, "1")
         # Will now wait for Manual trigger. Add the below line to your DAQ script
         # caput(pv.eiger_trigger, 1)
@@ -440,17 +438,17 @@ def eiger(action, args_list):
     elif action == "return-to-normal":
         caput(pv.eiger_manualtrigger, "No")
         # caput(pv.eiger_seqID, int(caget(pv.eiger_seqID))+1)
-    logger.debug("***** leaving Eiger")
+    SSX_LOGGER.debug("***** leaving Eiger")
     sleep(0.1)
     return 0
 
 
 def xspress3(action, args_list):
-    logger.debug("***** Entering xspress3")
-    logger.info(f"xspress3 - {action}")
+    SSX_LOGGER.debug("***** Entering xspress3")
+    SSX_LOGGER.info(f"xspress3 - {action}")
     if args_list:
         for arg in args_list:
-            logger.debug(f"Argument: {arg}")
+            SSX_LOGGER.debug(f"Argument: {arg}")
 
     if action == "stop-and-start":
         [exp_time, lo, hi] = args_list
@@ -486,8 +484,8 @@ def xspress3(action, args_list):
         caput(pv.xsp3_erase, 0)
 
     else:
-        logger.error("Unknown action for xspress3 method:", action)
+        SSX_LOGGER.error("Unknown action for xspress3 method:", action)
 
     sleep(0.1)
-    logger.debug("***** leaving xspress3")
+    SSX_LOGGER.debug("***** leaving xspress3")
     return 1

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py

@@ -6,8 +6,7 @@ from collections.abc import Generator
 from enum import IntEnum
 
 import bluesky.plan_stubs as bps
-from blueapi.core import MsgGenerator
-from bluesky.utils import Msg
+from bluesky.utils import Msg, MsgGenerator
 from dodal.common import inject
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py

@@ -9,8 +9,6 @@ the edm screen, while on the schematics they are 0 indexed. Thus, `Soft In 1` fr
 schematics corresponds to soft_in_2 in the code.
 """
 
-import logging
-
 import bluesky.plan_stubs as bps
 from dodal.devices.zebra import (
     AND3,
@@ -35,6 +33,8 @@ from dodal.devices.zebra import (
     Zebra,
 )
 
+from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
+
 # Detector specific outs
 TTL_EIGER = 1
 TTL_PILATUS = 2
@@ -48,8 +48,6 @@ SHUTTER_MODE = {
 GATE_START = 1.0
 SHUTTER_OPEN_TIME = 0.05  # For pp with long delays
 
-logger = logging.getLogger("I24ssx.setup_zebra")
-
 
 def get_zebra_settings_for_extruder(
     exp_time: float,
@@ -71,28 +69,28 @@ def get_zebra_settings_for_extruder(
 
 def arm_zebra(zebra: Zebra):
     yield from bps.abs_set(zebra.pc.arm, ArmDemand.ARM, wait=True)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    logger.info("Zebra armed.")
+    SSX_LOGGER.info("Zebra armed.")
 
 
 def disarm_zebra(zebra: Zebra):
     yield from bps.abs_set(zebra.pc.arm, ArmDemand.DISARM, wait=True)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    logger.info("Zebra disarmed.")
+    SSX_LOGGER.info("Zebra disarmed.")
 
 
 def open_fast_shutter(zebra: Zebra):
     yield from bps.abs_set(zebra.inputs.soft_in_2, SoftInState.YES, wait=True)
-    logger.info("Fast shutter open.")
+    SSX_LOGGER.info("Fast shutter open.")
 
 
 def close_fast_shutter(zebra: Zebra):
     yield from bps.abs_set(zebra.inputs.soft_in_2, SoftInState.NO, wait=True)
-    logger.info("Fast shutter closed.")
+    SSX_LOGGER.info("Fast shutter closed.")
 
 
 def set_shutter_mode(zebra: Zebra, mode: str):
     # SOFT_IN:B0 has to be disabled for manual mode
     yield from bps.abs_set(zebra.inputs.soft_in_1, SHUTTER_MODE[mode], wait=True)
-    logger.info(f"Shutter mode set to {mode}.")
+    SSX_LOGGER.info(f"Shutter mode set to {mode}.")
 
 
 def setup_pc_sources(
@@ -124,12 +122,12 @@ def setup_zebra_for_quickshot_plan(
         exp_time (float): Collection exposure time, in s.
         num_images (float): Number of images to be collected.
     """
-    logger.info("Setup ZEBRA for quickshot collection.")
+    SSX_LOGGER.info("Setup ZEBRA for quickshot collection.")
     yield from bps.abs_set(zebra.pc.arm_source, ArmSource.SOFT, group=group)
     yield from setup_pc_sources(zebra, TrigSource.TIME, TrigSource.EXTERNAL)
 
     gate_width = exp_time * num_images + 0.5
-    logger.info(f"Gate start set to {GATE_START}, with width {gate_width}.")
+    SSX_LOGGER.info(f"Gate start set to {GATE_START}, with width {gate_width}.")
     yield from bps.abs_set(zebra.pc.gate_start, GATE_START, group=group)
     yield from bps.abs_set(zebra.pc.gate_width, gate_width, group=group)
 
@@ -138,7 +136,7 @@ def setup_zebra_for_quickshot_plan(
 
     if wait:
         yield from bps.wait(group)
-    logger.info("Finished setting up zebra.")
+    SSX_LOGGER.info("Finished setting up zebra.")
 
 
 def set_logic_gates_for_porto_triggering(
@@ -204,7 +202,7 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
         pulse1_delay (float, optional): Delay to start pulse1 (the laser control) after \
             gate start. Defaults to 0.0.
     """
-    logger.info("Setup ZEBRA for pump probe extruder collection.")
+    SSX_LOGGER.info("Setup ZEBRA for pump probe extruder collection.")
 
     yield from set_shutter_mode(zebra, "manual")
 
@@ -226,7 +224,7 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
     gate_width, gate_step = get_zebra_settings_for_extruder(
         exp_time, pump_exp, pump_delay
     )
-    logger.info(
+    SSX_LOGGER.info(
         f"""
         Gate start set to {GATE_START}, with calculated width {gate_width}
         and step {gate_step}.
@@ -241,13 +239,13 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
     # Settings for extruder pump probe:
     # PULSE1_DLY is the start (0 usually), PULSE1_WID is the laser dwell set on edm
     # PULSE2_DLY is the laser delay set on edm, PULSE2_WID is the exposure time
-    logger.info(
+    SSX_LOGGER.info(
         f"Pulse1 starting at {pulse1_delay} with width set to laser dwell {pump_exp}."
     )
     yield from bps.abs_set(zebra.output.pulse_1.input, PC_GATE, group=group)
     yield from bps.abs_set(zebra.output.pulse_1.delay, pulse1_delay, group=group)
     yield from bps.abs_set(zebra.output.pulse_1.width, pump_exp, group=group)
-    logger.info(
+    SSX_LOGGER.info(
         f"""
         Pulse2 starting at laser delay {pump_delay} with width set to \
         exposure time {exp_time}.
@@ -259,7 +257,7 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
 
     if wait:
         yield from bps.wait(group)
-    logger.info("Finished setting up zebra.")
+    SSX_LOGGER.info("Finished setting up zebra.")
 
 
 def setup_zebra_for_fastchip_plan(
@@ -302,7 +300,7 @@ def setup_zebra_for_fastchip_plan(
         start_time_offset (float): Delay on the start of the position compare. \
             Defaults to 0.0 (standard chip collection).
     """
-    logger.info("Setup ZEBRA for a fixed target collection.")
+    SSX_LOGGER.info("Setup ZEBRA for a fixed target collection.")
 
     yield from set_shutter_mode(zebra, "manual")
 
@@ -341,7 +339,7 @@ def setup_zebra_for_fastchip_plan(
 
     if wait:
         yield from bps.wait(group)
-    logger.info("Finished setting up zebra.")
+    SSX_LOGGER.info("Finished setting up zebra.")
 
 
 def open_fast_shutter_at_each_position_plan(
@@ -371,10 +369,10 @@ def open_fast_shutter_at_each_position_plan(
         num_exposures (int): Number of times data is collected in each aperture.
         exposure_time (float): Exposure time for each shot.
     """
-    logger.info(
+    SSX_LOGGER.info(
         "ZEBRA setup for fastchip collection with long delays between exposures."
     )
-    logger.debug("Controlling the fast shutter on PULSE2.")
+    SSX_LOGGER.debug("Controlling the fast shutter on PULSE2.")
     # Output panel pulse_2 settings
     yield from bps.abs_set(zebra.output.pulse_2.input, PC_GATE, group=group)
     yield from bps.abs_set(zebra.output.pulse_2.delay, 0.0, group=group)
@@ -386,7 +384,7 @@ def open_fast_shutter_at_each_position_plan(
 
     if wait:
         yield from bps.wait(group=group)
-    logger.debug("Finished setting up for long delays.")
+    SSX_LOGGER.debug("Finished setting up for long delays.")
 
 
 def reset_pc_gate_and_pulse(zebra: Zebra, group: str = "reset_pc"):
@@ -444,16 +442,16 @@ def zebra_return_to_normal_plan(
 
     if wait:
         yield from bps.wait(group)
-    logger.info("Zebra settings back to normal.")
+    SSX_LOGGER.info("Zebra settings back to normal.")
 
 
 def reset_zebra_when_collection_done_plan(zebra: Zebra):
     """
     End of collection zebra operations: close fast shutter, disarm and reset settings.
     """
-    logger.debug("Close the fast shutter.")
+    SSX_LOGGER.debug("Close the fast shutter.")
     yield from close_fast_shutter(zebra)
-    logger.debug("Disarm the zebra.")
+    SSX_LOGGER.debug("Disarm the zebra.")
     yield from disarm_zebra(zebra)
-    logger.debug("Set zebra back to normal.")
+    SSX_LOGGER.debug("Set zebra back to normal.")
     yield from zebra_return_to_normal_plan(zebra, wait=True)

mx_bluesky/beamlines/i24/serial/write_nexus.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import pathlib
 import pprint
@@ -9,14 +8,13 @@ from typing import Literal
 import requests
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType, MappingType
+from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
 from mx_bluesky.beamlines.i24.serial.parameters import (
     ExtruderParameters,
     FixedTargetParameters,
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline import Eiger, caget, cagetstring
 
-logger = logging.getLogger("I24ssx.nexus_writer")
-
 
 def call_nexgen(
     chip_prog_dict: dict | None,
@@ -54,23 +52,23 @@ def call_nexgen(
     )
     t0 = time.time()
     max_wait = 60  # seconds
-    logger.info(f"Watching for {meta_h5}")
+    SSX_LOGGER.info(f"Watching for {meta_h5}")
     while time.time() - t0 < max_wait:
         if meta_h5.exists():
-            logger.info(f"Found {meta_h5} after {time.time() - t0:.1f} seconds")
+            SSX_LOGGER.info(f"Found {meta_h5} after {time.time() - t0:.1f} seconds")
             time.sleep(5)
             break
-        logger.debug(f"Waiting for {meta_h5}")
+        SSX_LOGGER.debug(f"Waiting for {meta_h5}")
         time.sleep(1)
     if not meta_h5.exists():
-        logger.warning(f"Giving up waiting for {meta_h5} after {max_wait} seconds")
+        SSX_LOGGER.warning(f"Giving up waiting for {meta_h5} after {max_wait} seconds")
         return False
 
     transmission = (float(caget(Eiger.pv.transmission)),)
 
     if det_type == Eiger.name:
         bit_depth = int(caget(Eiger.pv.bit_depth))
-        logger.debug(
+        SSX_LOGGER.debug(
             f"Call to nexgen server with the following chip definition: \n{chip_prog_dict}"
         )
 
@@ -96,10 +94,12 @@ def call_nexgen(
             "wavelength": wavelength,
             "bit_depth": bit_depth,
         }
-        logger.info(f"Sending POST request to {url} with payload:")
-        logger.info(pprint.pformat(payload))
+        SSX_LOGGER.info(f"Sending POST request to {url} with payload:")
+        SSX_LOGGER.info(pprint.pformat(payload))
         response = requests.post(url, headers=headers, json=payload)
-        logger.info(f"Response: {response.text} (status code: {response.status_code})")
+        SSX_LOGGER.info(
+            f"Response: {response.text} (status code: {response.status_code})"
+        )
         # the following will raise an error if the request was unsuccessful
         return response.status_code == requests.codes.ok
     return False