mx-bluesky 0.3.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

mx_bluesky/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.1'
-__version_tuple__ = version_tuple = (0, 3, 1)
+__version__ = version = '1.2.0'
+__version_tuple__ = version_tuple = (1, 2, 0)

mx_bluesky/beamlines/i04/__init__.py

@@ -0,0 +1,3 @@
+from mx_bluesky.beamlines.i04.thawing_plan import thaw, thaw_and_stream_to_redis
+
+__all__ = ["thaw", "thaw_and_stream_to_redis"]

mx_bluesky/{i04 → beamlines/i04}/thawing_plan.py

@@ -10,10 +10,10 @@ from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon
 from dodal.devices.thawer import Thawer, ThawerStates
 
-from mx_bluesky.i04.callbacks.murko_callback import MurkoCallback
+from mx_bluesky.beamlines.i04.callbacks.murko_callback import MurkoCallback
 
 
-def thaw_and_center(
+def thaw_and_stream_to_redis(
     time_to_thaw: float,
     rotation: float = 360,
     robot: BartRobot = inject("robot"),
@@ -26,6 +26,7 @@ def thaw_and_center(
     sample_id = yield from bps.rd(robot.sample_id)
 
     yield from bps.abs_set(oav.zoom_controller.level, "1.0x", wait=True)
+    yield from bps.abs_set(oav_to_redis_forwarder.sample_id, sample_id)
 
     @subs_decorator(MurkoCallback(REDIS_HOST, REDIS_PASSWORD, MURKO_REDIS_DB))
     @run_decorator(
@@ -38,14 +39,14 @@ def thaw_and_center(
             "sample_id": sample_id,
         }
     )
-    def _thaw_and_center():
+    def _thaw_and_stream_to_redis():
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
         yield from bps.monitor(smargon.omega.user_readback, name="smargon")
         yield from bps.monitor(oav_to_redis_forwarder.uuid, name="oav")
         yield from thaw(time_to_thaw, rotation, thawer, smargon)
         yield from bps.complete(oav_to_redis_forwarder)
 
-    yield from _thaw_and_center()
+    yield from _thaw_and_stream_to_redis()
 
 
 def thaw(

mx_bluesky/{i24 → beamlines/i24}/serial/blueapi_config.yaml

@@ -3,7 +3,7 @@ env:
     - kind: dodal
       module: dodal.beamlines.i24
     - kind: planFunctions
-      module: mx_bluesky.i24.serial
+      module: mx_bluesky.beamlines.i24.serial
   events:
     broadcast_status_events: False
 api:

mx_bluesky/{i24 → beamlines/i24}/serial/dcid.py

@@ -10,8 +10,8 @@ from functools import lru_cache
 
 import requests
 
-from mx_bluesky.i24.serial.parameters import SSXType
-from mx_bluesky.i24.serial.setup_beamline import (
+from mx_bluesky.beamlines.i24.serial.parameters import SSXType
+from mx_bluesky.beamlines.i24.serial.setup_beamline import (
     Detector,
     Eiger,
     Pilatus,

mx_bluesky/{i24 → beamlines/i24}/serial/extruder/EX-gui-edm/DetStage.edl

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 3338
-y 572
+x 1316
+y 573
 w 450
 h 180
 font "arial-medium-r-18.0"
@@ -113,7 +113,7 @@ font "arial-medium-r-18.0"
 buttonLabel "Move Stage"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Jet\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Jet\",\"detector_stage\":\"detector_motion\"\}'"
 }
 endObjectProperties
 

mx_bluesky/{i24 → beamlines/i24}/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 1018
-y 277
+x 1006
+y 192
 w 700
 h 900
 font "arial-medium-r-18.0"
@@ -370,7 +370,7 @@ font "arial-medium-r-24.0"
 buttonLabel "Start"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run run_extruder_plan"
+  0 "blueapi -c CONFIG_LOCATION controller run run_extruder_plan '\{\"zebra\":\"zebra\",\"aperture\":\"aperture\",\"backlight\":\"backlight\",\"beamstop\":\"beamstop\",\"detector_stage\":\"detector_motion\",\"shutter\":\"shutter\",\"dcm\":\"dcm\"\}'"
 }
 endObjectProperties
 
@@ -832,7 +832,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run initialise_extruder"
+  0 "blueapi -c CONFIG_LOCATION controller run initialise_extruder '\{\"detector_stage\":\"detector_motion\"\}'"
 }
 endObjectProperties
 
@@ -2179,7 +2179,7 @@ font "arial-medium-r-20.0"
 buttonLabel "Laser On"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseron\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseron\",\"zebra\":\"zebra\",\"detector_stage\":\"detector_motion\"\}'"
 }
 endObjectProperties
 
@@ -2201,7 +2201,7 @@ font "arial-medium-r-20.0"
 buttonLabel "Laser Off"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseroff\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseroff\",\"zebra\":\"zebra\",\"detector_stage\":\"detector_motion\"\}'"
 }
 endObjectProperties
 
@@ -2223,7 +2223,7 @@ font "arial-medium-r-18.0"
 buttonLabel "Enter hutch"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run enter_hutch"
+  0 "blueapi -c CONFIG_LOCATION controller run enter_hutch '\{\"detector_stage\":\"detector_motion\"\}'"
 }
 endObjectProperties
 

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

@@ -27,17 +27,20 @@ from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.zebra import DISCONNECT, SOFT_IN3, Zebra
 
-from mx_bluesky.i24.serial import log
-from mx_bluesky.i24.serial.dcid import DCID
-from mx_bluesky.i24.serial.parameters import ExtruderParameters, SSXType
-from mx_bluesky.i24.serial.parameters.constants import PARAM_FILE_NAME, PARAM_FILE_PATH
-from mx_bluesky.i24.serial.setup_beamline import Pilatus, caget, caput, pv
-from mx_bluesky.i24.serial.setup_beamline import setup_beamline as sup
-from mx_bluesky.i24.serial.setup_beamline.setup_detector import (
+from mx_bluesky.beamlines.i24.serial import log
+from mx_bluesky.beamlines.i24.serial.dcid import DCID
+from mx_bluesky.beamlines.i24.serial.parameters import ExtruderParameters, SSXType
+from mx_bluesky.beamlines.i24.serial.parameters.constants import (
+    PARAM_FILE_NAME,
+    PARAM_FILE_PATH,
+)
+from mx_bluesky.beamlines.i24.serial.setup_beamline import Pilatus, caget, caput, pv
+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,
     get_detector_type,
 )
-from mx_bluesky.i24.serial.setup_beamline.setup_zebra_plans import (
+from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_zebra_plans import (
     GATE_START,
     TTL_EIGER,
     TTL_PILATUS,
@@ -49,7 +52,7 @@ from mx_bluesky.i24.serial.setup_beamline.setup_zebra_plans import (
     setup_zebra_for_extruder_with_pump_probe_plan,
     setup_zebra_for_quickshot_plan,
 )
-from mx_bluesky.i24.serial.write_nexus import call_nexgen
+from mx_bluesky.beamlines.i24.serial.write_nexus import call_nexgen
 
 usage = "%(prog)s command [options]"
 logger = logging.getLogger("I24ssx.extruder")

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

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 1202
-y 1158
+x 1203
+y 544
 w 550
 h 380
 font "arial-medium-r-18.0"
@@ -690,7 +690,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run cs_reset"
+  0 "blueapi -c CONFIG_LOCATION controller run cs_reset '\{\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 

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

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 1943
-y 793
+x 1205
+y 579
 w 450
 h 180
 font "arial-medium-r-18.0"
@@ -113,7 +113,7 @@ font "arial-medium-r-18.0"
 buttonLabel "Move Stage"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Fixed\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Fixed\",\"detector_stage\":\"detector_motion\"\}'"
 }
 endObjectProperties