mx-bluesky 1.5.2__py3-none-any.whl → 1.5.4__py3-none-any.whl

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

@@ -246,17 +246,21 @@ det_z = "BL24I-EA-DET-01:Z"
 # Fast grid diagnostics
 pmc_gridstatus = "BL24I-MO-STEP-10:signal:P2401"
 pmc_gridcounter = "BL24I-MO-STEP-10:signal:P2402"
+
 # PMAC Strings
 step08_pmac_str = "BL24I-MO-IOC-08:ASYN8.AOUT"
 step09_pmac_str = "BL24I-MO-IOC-09:ASYN9.AOUT"
 step10_pmac_str = "BL24I-MO-IOC-10:ASYN10.AOUT"
 step11_pmac_str = "BL24I-MO-IOC-11:ASYN11.AOUT"
 step12_pmac_str = "BL24I-MO-IOC-12:ASYN12.AOUT"
+step13_pmac_str = "BL24I-MO-IOC-13:PMAC:console"
 step08_pmac_response = "BL24I-MO-IOC-08:ASYN8.AINP"
 step09_pmac_response = "BL24I-MO-IOC-09:ASYN9.AINP"
 step10_pmac_response = "BL24I-MO-IOC-10:ASYN10.AINP"
 step11_pmac_response = "BL24I-MO-IOC-11:ASYN11.AINP"
 step12_pmac_response = "BL24I-MO-IOC-12:ASYN12.AINP"
+step13_pmac_response = "BL24I-MO-IOC-13:PMAC:console_RBV"
+
 # General Purpose PV. Now use STEP13
 ioc13_gp1 = "BL24I-MO-IOC-13:GP1"
 ioc13_gp2 = "BL24I-MO-IOC-13:GP2"
@@ -273,138 +277,141 @@ ioc13_gp12 = "BL24I-MO-IOC-13:GP12"
 ioc13_gp13 = "BL24I-MO-IOC-13:GP13"
 ioc13_gp14 = "BL24I-MO-IOC-13:GP14"
 ioc13_gp15 = "BL24I-MO-IOC-13:GP15"
-# ME14E
-me14e_pmac_str = "ME14E-MO-CHIP-01:PMAC_STRING"
-me14e_stage_x = "ME14E-MO-CHIP-01:X"
-me14e_stage_y = "ME14E-MO-CHIP-01:Y"
-me14e_stage_z = "ME14E-MO-CHIP-01:Z"
-me14e_filter = "ME14E-MO-CHIP-01:FILTER"
-me14e_filepath = "ME14E-MO-CHIP-01:filePath"
-me14e_chip_name = "ME14E-MO-CHIP-01:chipName"
-me14e_chipcapacity = "ME14E-MO-CHIP-01:chipCapacity"
-me14e_blockcapacity = "ME14E-MO-CHIP-01:blockCapacity"
-me14e_exptime = "ME14E-MO-CHIP-01:expTime"
-me14e_dcdetdist = "ME14E-MO-CHIP-01:detDistance"
-me14e_scanstatus = "BL24I-MO-STEP-14:signal:P2401"
-me14e_counter = "BL24I-MO-STEP-14:signal:P2402"
-# ME14E General Purpose PV
-me14e_gp1 = "ME14E-MO-IOC-01:GP1"
-me14e_gp2 = "ME14E-MO-IOC-01:GP2"
-me14e_gp3 = "ME14E-MO-IOC-01:GP3"
-me14e_gp4 = "ME14E-MO-IOC-01:GP4"
-me14e_gp5 = "ME14E-MO-IOC-01:GP5"
-me14e_gp6 = "ME14E-MO-IOC-01:GP6"
-me14e_gp7 = "ME14E-MO-IOC-01:GP7"
-me14e_gp8 = "ME14E-MO-IOC-01:GP8"
-me14e_gp9 = "ME14E-MO-IOC-01:GP9"
-me14e_gp10 = "ME14E-MO-IOC-01:GP10"
-me14e_gp11 = "ME14E-MO-IOC-01:GP11"
-me14e_gp12 = "ME14E-MO-IOC-01:GP12"
-me14e_gp13 = "ME14E-MO-IOC-01:GP13"
-me14e_gp14 = "ME14E-MO-IOC-01:GP14"
-me14e_gp15 = "ME14E-MO-IOC-01:GP15"
-me14e_gp16 = "ME14E-MO-IOC-01:GP16"
-me14e_gp17 = "ME14E-MO-IOC-01:GP17"
-me14e_gp18 = "ME14E-MO-IOC-01:GP18"
-me14e_gp19 = "ME14E-MO-IOC-01:GP19"
-me14e_gp20 = "ME14E-MO-IOC-01:GP20"
-me14e_gp21 = "ME14E-MO-IOC-01:GP21"
-me14e_gp22 = "ME14E-MO-IOC-01:GP22"
-me14e_gp23 = "ME14E-MO-IOC-01:GP23"
-me14e_gp24 = "ME14E-MO-IOC-01:GP24"
-me14e_gp25 = "ME14E-MO-IOC-01:GP25"
-me14e_gp26 = "ME14E-MO-IOC-01:GP26"
-me14e_gp27 = "ME14E-MO-IOC-01:GP27"
-me14e_gp28 = "ME14E-MO-IOC-01:GP28"
-me14e_gp29 = "ME14E-MO-IOC-01:GP29"
-me14e_gp30 = "ME14E-MO-IOC-01:GP30"
-me14e_gp31 = "ME14E-MO-IOC-01:GP31"
-me14e_gp32 = "ME14E-MO-IOC-01:GP32"
-me14e_gp33 = "ME14E-MO-IOC-01:GP33"
-me14e_gp34 = "ME14E-MO-IOC-01:GP34"
-me14e_gp35 = "ME14E-MO-IOC-01:GP35"
-me14e_gp36 = "ME14E-MO-IOC-01:GP36"
-me14e_gp37 = "ME14E-MO-IOC-01:GP37"
-me14e_gp38 = "ME14E-MO-IOC-01:GP38"
-me14e_gp39 = "ME14E-MO-IOC-01:GP39"
-me14e_gp40 = "ME14E-MO-IOC-01:GP40"
-me14e_gp41 = "ME14E-MO-IOC-01:GP41"
-me14e_gp42 = "ME14E-MO-IOC-01:GP42"
-me14e_gp43 = "ME14E-MO-IOC-01:GP43"
-me14e_gp44 = "ME14E-MO-IOC-01:GP44"
-me14e_gp45 = "ME14E-MO-IOC-01:GP45"
-me14e_gp46 = "ME14E-MO-IOC-01:GP46"
-me14e_gp47 = "ME14E-MO-IOC-01:GP47"
-me14e_gp48 = "ME14E-MO-IOC-01:GP48"
-me14e_gp49 = "ME14E-MO-IOC-01:GP49"
-me14e_gp50 = "ME14E-MO-IOC-01:GP50"
-me14e_gp51 = "ME14E-MO-IOC-01:GP51"
-me14e_gp52 = "ME14E-MO-IOC-01:GP52"
-me14e_gp53 = "ME14E-MO-IOC-01:GP53"
-me14e_gp54 = "ME14E-MO-IOC-01:GP54"
-me14e_gp55 = "ME14E-MO-IOC-01:GP55"
-me14e_gp56 = "ME14E-MO-IOC-01:GP56"
-me14e_gp57 = "ME14E-MO-IOC-01:GP57"
-me14e_gp58 = "ME14E-MO-IOC-01:GP58"
-me14e_gp59 = "ME14E-MO-IOC-01:GP59"
-me14e_gp60 = "ME14E-MO-IOC-01:GP60"
-me14e_gp61 = "ME14E-MO-IOC-01:GP61"
-me14e_gp62 = "ME14E-MO-IOC-01:GP62"
-me14e_gp63 = "ME14E-MO-IOC-01:GP63"
-me14e_gp64 = "ME14E-MO-IOC-01:GP64"
-me14e_gp65 = "ME14E-MO-IOC-01:GP65"
-me14e_gp66 = "ME14E-MO-IOC-01:GP66"
-me14e_gp67 = "ME14E-MO-IOC-01:GP67"
-me14e_gp68 = "ME14E-MO-IOC-01:GP68"
-me14e_gp69 = "ME14E-MO-IOC-01:GP69"
-me14e_gp70 = "ME14E-MO-IOC-01:GP70"
-me14e_gp71 = "ME14E-MO-IOC-01:GP71"
-me14e_gp72 = "ME14E-MO-IOC-01:GP72"
-me14e_gp73 = "ME14E-MO-IOC-01:GP73"
-me14e_gp74 = "ME14E-MO-IOC-01:GP74"
-me14e_gp75 = "ME14E-MO-IOC-01:GP75"
-me14e_gp76 = "ME14E-MO-IOC-01:GP76"
-me14e_gp77 = "ME14E-MO-IOC-01:GP77"
-me14e_gp78 = "ME14E-MO-IOC-01:GP78"
-me14e_gp79 = "ME14E-MO-IOC-01:GP79"
-me14e_gp80 = "ME14E-MO-IOC-01:GP80"
-me14e_gp81 = "ME14E-MO-IOC-01:GP81"
-me14e_gp82 = "ME14E-MO-IOC-01:GP82"
-me14e_gp83 = "ME14E-MO-IOC-01:GP83"
-me14e_gp84 = "ME14E-MO-IOC-01:GP84"
-me14e_gp85 = "ME14E-MO-IOC-01:GP85"
-me14e_gp86 = "ME14E-MO-IOC-01:GP86"
-me14e_gp87 = "ME14E-MO-IOC-01:GP87"
-me14e_gp88 = "ME14E-MO-IOC-01:GP88"
-me14e_gp89 = "ME14E-MO-IOC-01:GP89"
-me14e_gp90 = "ME14E-MO-IOC-01:GP90"
-me14e_gp91 = "ME14E-MO-IOC-01:GP91"
-me14e_gp92 = "ME14E-MO-IOC-01:GP92"
-me14e_gp93 = "ME14E-MO-IOC-01:GP93"
-me14e_gp94 = "ME14E-MO-IOC-01:GP94"
-me14e_gp95 = "ME14E-MO-IOC-01:GP95"
-me14e_gp96 = "ME14E-MO-IOC-01:GP96"
-me14e_gp97 = "ME14E-MO-IOC-01:GP97"
-me14e_gp98 = "ME14E-MO-IOC-01:GP98"
-me14e_gp99 = "ME14E-MO-IOC-01:GP99"
-me14e_gp100 = "ME14E-MO-IOC-01:GP100"
-me14e_gp101 = "ME14E-MO-IOC-01:GP101"  # Detector in use
-me14e_gp102 = "ME14E-MO-IOC-01:GP102"
-me14e_gp103 = "ME14E-MO-IOC-01:GP103"
-me14e_gp104 = "ME14E-MO-IOC-01:GP104"
-me14e_gp105 = "ME14E-MO-IOC-01:GP105"
-me14e_gp106 = "ME14E-MO-IOC-01:GP106"
-me14e_gp107 = "ME14E-MO-IOC-01:GP107"
-me14e_gp108 = "ME14E-MO-IOC-01:GP108"
-me14e_gp109 = "ME14E-MO-IOC-01:GP109"
-me14e_gp110 = "ME14E-MO-IOC-01:GP110"
-me14e_gp111 = "ME14E-MO-IOC-01:GP111"
-me14e_gp112 = "ME14E-MO-IOC-01:GP112"
-me14e_gp113 = "ME14E-MO-IOC-01:GP113"
-me14e_gp114 = "ME14E-MO-IOC-01:GP114"
-me14e_gp115 = "ME14E-MO-IOC-01:GP115"
-me14e_gp116 = "ME14E-MO-IOC-01:GP116"
-me14e_gp117 = "ME14E-MO-IOC-01:GP117"
-me14e_gp118 = "ME14E-MO-IOC-01:GP118"
-me14e_gp119 = "ME14E-MO-IOC-01:GP119"
-me14e_gp120 = "ME14E-MO-IOC-01:GP120"
+
+# BL24I beamline-specific labelled PVs
+me14e_filter = "BL24I-EA-CHIP-01:FILTER"  # to check
+me14e_filepath = "BL24I-MO-CHIP-01:filePath"
+me14e_chip_name = "BL24I-MO-CHIP-01:chipName"
+me14e_chipcapacity = "BL24I-MO-CHIP-01:chipCapacity"
+me14e_blockcapacity = "BL24I-MO-CHIP-01:blockCapacity"
+me14e_exptime = "BL24I-MO-CHIP-01:expTime"
+me14e_dcdetdist = "BL24I-MO-CHIP-01:detDistance"
+
+# STEP-13 chip motion
+ioc13_filepath = "BL24I-MO-CHIP-01:filePath"
+ioc13_chip_name = "BL24I-MO-CHIP-01:chipName"
+ioc13_chipcapacity = "BL24I-MO-CHIP-01:chipCapacity"
+ioc13_blockcapacity = "BL24I-MO-CHIP-01:blockCapacity"
+ioc13_exptime = "BL24I-MO-CHIP-01:expTime"
+ioc13_dcdetdist = "BL24I-MO-CHIP-01:detDistance"
+
+me14e_gp1 = "BL24I-MO-IOC-13:GP1"
+me14e_gp2 = "BL24I-MO-IOC-13:GP2"
+me14e_gp3 = "BL24I-MO-IOC-13:GP3"
+me14e_gp4 = "BL24I-MO-IOC-13:GP4"
+me14e_gp5 = "BL24I-MO-IOC-13:GP5"
+me14e_gp6 = "BL24I-MO-IOC-13:GP6"
+me14e_gp7 = "BL24I-MO-IOC-13:GP7"
+me14e_gp8 = "BL24I-MO-IOC-13:GP8"
+me14e_gp9 = "BL24I-MO-IOC-13:GP9"
+me14e_gp10 = "BL24I-MO-IOC-13:GP10"
+me14e_gp11 = "BL24I-MO-IOC-13:GP11"
+me14e_gp12 = "BL24I-MO-IOC-13:GP12"
+me14e_gp13 = "BL24I-MO-IOC-13:GP13"
+me14e_gp14 = "BL24I-MO-IOC-13:GP14"
+me14e_gp15 = "BL24I-MO-IOC-13:GP15"
+me14e_gp16 = "BL24I-MO-IOC-13:GP16"
+me14e_gp17 = "BL24I-MO-IOC-13:GP17"
+me14e_gp18 = "BL24I-MO-IOC-13:GP18"
+me14e_gp19 = "BL24I-MO-IOC-13:GP19"
+me14e_gp20 = "BL24I-MO-IOC-13:GP20"
+me14e_gp21 = "BL24I-MO-IOC-13:GP21"
+me14e_gp22 = "BL24I-MO-IOC-13:GP22"
+me14e_gp23 = "BL24I-MO-IOC-13:GP23"
+me14e_gp24 = "BL24I-MO-IOC-13:GP24"
+me14e_gp25 = "BL24I-MO-IOC-13:GP25"
+me14e_gp26 = "BL24I-MO-IOC-13:GP26"
+me14e_gp27 = "BL24I-MO-IOC-13:GP27"
+me14e_gp28 = "BL24I-MO-IOC-13:GP28"
+me14e_gp29 = "BL24I-MO-IOC-13:GP29"
+me14e_gp30 = "BL24I-MO-IOC-13:GP30"
+me14e_gp31 = "BL24I-MO-IOC-13:GP31"
+me14e_gp32 = "BL24I-MO-IOC-13:GP32"
+me14e_gp33 = "BL24I-MO-IOC-13:GP33"
+me14e_gp34 = "BL24I-MO-IOC-13:GP34"
+me14e_gp35 = "BL24I-MO-IOC-13:GP35"
+me14e_gp36 = "BL24I-MO-IOC-13:GP36"
+me14e_gp37 = "BL24I-MO-IOC-13:GP37"
+me14e_gp38 = "BL24I-MO-IOC-13:GP38"
+me14e_gp39 = "BL24I-MO-IOC-13:GP39"
+me14e_gp40 = "BL24I-MO-IOC-13:GP40"
+me14e_gp41 = "BL24I-MO-IOC-13:GP41"
+me14e_gp42 = "BL24I-MO-IOC-13:GP42"
+me14e_gp43 = "BL24I-MO-IOC-13:GP43"
+me14e_gp44 = "BL24I-MO-IOC-13:GP44"
+me14e_gp45 = "BL24I-MO-IOC-13:GP45"
+me14e_gp46 = "BL24I-MO-IOC-13:GP46"
+me14e_gp47 = "BL24I-MO-IOC-13:GP47"
+me14e_gp48 = "BL24I-MO-IOC-13:GP48"
+me14e_gp49 = "BL24I-MO-IOC-13:GP49"
+me14e_gp50 = "BL24I-MO-IOC-13:GP50"
+me14e_gp51 = "BL24I-MO-IOC-13:GP51"
+me14e_gp52 = "BL24I-MO-IOC-13:GP52"
+me14e_gp53 = "BL24I-MO-IOC-13:GP53"
+me14e_gp54 = "BL24I-MO-IOC-13:GP54"
+me14e_gp55 = "BL24I-MO-IOC-13:GP55"
+me14e_gp56 = "BL24I-MO-IOC-13:GP56"
+me14e_gp57 = "BL24I-MO-IOC-13:GP57"
+me14e_gp58 = "BL24I-MO-IOC-13:GP58"
+me14e_gp59 = "BL24I-MO-IOC-13:GP59"
+me14e_gp60 = "BL24I-MO-IOC-13:GP60"
+me14e_gp61 = "BL24I-MO-IOC-13:GP61"
+me14e_gp62 = "BL24I-MO-IOC-13:GP62"
+me14e_gp63 = "BL24I-MO-IOC-13:GP63"
+me14e_gp64 = "BL24I-MO-IOC-13:GP64"
+me14e_gp65 = "BL24I-MO-IOC-13:GP65"
+me14e_gp66 = "BL24I-MO-IOC-13:GP66"
+me14e_gp67 = "BL24I-MO-IOC-13:GP67"
+me14e_gp68 = "BL24I-MO-IOC-13:GP68"
+me14e_gp69 = "BL24I-MO-IOC-13:GP69"
+me14e_gp70 = "BL24I-MO-IOC-13:GP70"
+me14e_gp71 = "BL24I-MO-IOC-13:GP71"
+me14e_gp72 = "BL24I-MO-IOC-13:GP72"
+me14e_gp73 = "BL24I-MO-IOC-13:GP73"
+me14e_gp74 = "BL24I-MO-IOC-13:GP74"
+me14e_gp75 = "BL24I-MO-IOC-13:GP75"
+me14e_gp76 = "BL24I-MO-IOC-13:GP76"
+me14e_gp77 = "BL24I-MO-IOC-13:GP77"
+me14e_gp78 = "BL24I-MO-IOC-13:GP78"
+me14e_gp79 = "BL24I-MO-IOC-13:GP79"
+me14e_gp80 = "BL24I-MO-IOC-13:GP80"
+me14e_gp81 = "BL24I-MO-IOC-13:GP81"
+me14e_gp82 = "BL24I-MO-IOC-13:GP82"
+me14e_gp83 = "BL24I-MO-IOC-13:GP83"
+me14e_gp84 = "BL24I-MO-IOC-13:GP84"
+me14e_gp85 = "BL24I-MO-IOC-13:GP85"
+me14e_gp86 = "BL24I-MO-IOC-13:GP86"
+me14e_gp87 = "BL24I-MO-IOC-13:GP87"
+me14e_gp88 = "BL24I-MO-IOC-13:GP88"
+me14e_gp89 = "BL24I-MO-IOC-13:GP89"
+me14e_gp90 = "BL24I-MO-IOC-13:GP90"
+me14e_gp91 = "BL24I-MO-IOC-13:GP91"
+me14e_gp92 = "BL24I-MO-IOC-13:GP92"
+me14e_gp93 = "BL24I-MO-IOC-13:GP93"
+me14e_gp94 = "BL24I-MO-IOC-13:GP94"
+me14e_gp95 = "BL24I-MO-IOC-13:GP95"
+me14e_gp96 = "BL24I-MO-IOC-13:GP96"
+me14e_gp97 = "BL24I-MO-IOC-13:GP97"
+me14e_gp98 = "BL24I-MO-IOC-13:GP98"
+me14e_gp99 = "BL24I-MO-IOC-13:GP99"
+me14e_gp100 = "BL24I-MO-IOC-13:GP100"
+me14e_gp101 = "BL24I-MO-IOC-13:GP101"  # Detector in use
+me14e_gp102 = "BL24I-MO-IOC-13:GP102"
+me14e_gp103 = "BL24I-MO-IOC-13:GP103"
+me14e_gp104 = "BL24I-MO-IOC-13:GP104"
+me14e_gp105 = "BL24I-MO-IOC-13:GP105"
+me14e_gp106 = "BL24I-MO-IOC-13:GP106"
+me14e_gp107 = "BL24I-MO-IOC-13:GP107"
+me14e_gp108 = "BL24I-MO-IOC-13:GP108"
+me14e_gp109 = "BL24I-MO-IOC-13:GP109"
+me14e_gp110 = "BL24I-MO-IOC-13:GP110"
+me14e_gp111 = "BL24I-MO-IOC-13:GP111"
+me14e_gp112 = "BL24I-MO-IOC-13:GP112"
+me14e_gp113 = "BL24I-MO-IOC-13:GP113"
+me14e_gp114 = "BL24I-MO-IOC-13:GP114"
+me14e_gp115 = "BL24I-MO-IOC-13:GP115"
+me14e_gp116 = "BL24I-MO-IOC-13:GP116"
+me14e_gp117 = "BL24I-MO-IOC-13:GP117"
+me14e_gp118 = "BL24I-MO-IOC-13:GP118"
+me14e_gp119 = "BL24I-MO-IOC-13:GP119"
+me14e_gp120 = "BL24I-MO-IOC-13:GP120"

mx_bluesky/common/device_setup_plans/manipulate_sample.py

@@ -5,7 +5,7 @@ from dodal.devices.aperturescatterguard import (
     ApertureScatterguard,
     ApertureValue,
 )
-from dodal.devices.backlight import Backlight, BacklightPosition
+from dodal.devices.backlight import Backlight, InOut
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.smargon import CombinedMove, Smargon
 
@@ -22,7 +22,7 @@ def setup_sample_environment(
     group="setup_senv",
 ):
     """Move the aperture into required position, move out the backlight."""
-    yield from bps.abs_set(backlight, BacklightPosition.OUT, group=group)
+    yield from bps.abs_set(backlight, InOut.OUT, group=group)
 
     aperture_value = (
         None

mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py

@@ -7,7 +7,7 @@ from bluesky import plan_stubs as bps
 from bluesky import preprocessors as bpp
 from bluesky.preprocessors import subs_decorator
 from bluesky.utils import MsgGenerator
-from dodal.devices.backlight import BacklightPosition
+from dodal.devices.backlight import InOut
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.oav.oav_parameters import OAVParameters
 
@@ -168,7 +168,7 @@ def detect_grid_and_do_gridscan(
 
     yield from bps.abs_set(
         composite.backlight,
-        BacklightPosition.OUT,
+        InOut.OUT,
         group=PlanGroupCheckpointConstants.GRID_READY_FOR_DC,
     )
 

mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py

@@ -0,0 +1,65 @@
+import bluesky.plan_stubs as bps
+import pydantic
+from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
+from dodal.devices.collimation_table import CollimationTable
+from dodal.devices.cryostream import CryoStream
+from dodal.devices.cryostream import InOut as CryoInOut
+from dodal.devices.fluorescence_detector_motion import (
+    FluorescenceDetector,
+)
+from dodal.devices.fluorescence_detector_motion import InOut as FlouInOut
+from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.scintillator import InOut as ScinInOut
+from dodal.devices.scintillator import Scintillator
+
+
+@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
+class UDCDefaultDevices:
+    cryostream: CryoStream
+    fluorescence_det_motion: FluorescenceDetector
+    beamstop: Beamstop
+    scintillator: Scintillator
+    aperture_scatterguard: ApertureScatterguard
+    collimation_table: CollimationTable
+
+
+def move_to_udc_default_state(devices: UDCDefaultDevices):
+    """Moves beamline to known positions prior to UDC start"""
+
+    cryostream_temp = yield from bps.rd(devices.cryostream.temperature_k)
+    cryostream_pressure = yield from bps.rd(devices.cryostream.back_pressure_bar)
+    if cryostream_temp > devices.cryostream.MAX_TEMP_K:
+        raise ValueError("Cryostream temperature is too high, not starting UDC")
+    if cryostream_pressure > devices.cryostream.MAX_PRESSURE_BAR:
+        raise ValueError("Cryostream back pressure is too high, not starting UDC")
+
+    yield from bps.abs_set(devices.scintillator.selected_pos, ScinInOut.OUT, wait=True)
+
+    yield from bps.abs_set(
+        devices.fluorescence_det_motion.pos, FlouInOut.OUT, group="udc_default"
+    )
+
+    yield from bps.abs_set(devices.collimation_table.inboard_y, 0, group="udc_default")
+    yield from bps.abs_set(devices.collimation_table.outboard_y, 0, group="udc_default")
+    yield from bps.abs_set(devices.collimation_table.upstream_y, 0, group="udc_default")
+    yield from bps.abs_set(devices.collimation_table.upstream_x, 0, group="udc_default")
+    yield from bps.abs_set(
+        devices.collimation_table.downstream_x, 0, group="udc_default"
+    )
+
+    yield from bps.abs_set(
+        devices.beamstop.selected_pos,
+        BeamstopPositions.DATA_COLLECTION,
+        group="udc_default",
+    )
+
+    yield from bps.abs_set(
+        devices.aperture_scatterguard.selected_aperture,
+        ApertureValue.SMALL,
+        group="udc_default",
+    )
+
+    yield from bps.abs_set(devices.cryostream.course, CryoInOut.IN, group="udc_default")
+    yield from bps.abs_set(devices.cryostream.fine, CryoInOut.IN, group="udc_default")
+
+    yield from bps.wait("udc_default")

mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING
 import bluesky.plan_stubs as bps
 import numpy as np
 from blueapi.core import BlueskyContext
+from bluesky.utils import MsgGenerator
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.oav.pin_image_recognition.utils import NONE_VALUE
@@ -49,6 +50,16 @@ def get_min_and_max_y_of_pin(
     return min_y, max_y
 
 
+def optimum_grid_detect_angles(smargon: Smargon) -> MsgGenerator[list[float]]:
+    """We need to match the 0 and -90 that the fast grid scan performs but the order in
+    which we do the grid detection does not matter so we do the closest angle first."""
+    current_omega = yield from bps.rd(smargon.omega)
+    if current_omega < -45:
+        return [-90, 0]
+    else:
+        return [0, -90]
+
+
 def grid_detection_plan(
     composite: OavGridDetectionComposite,
     parameters: OAVParameters,
@@ -90,8 +101,7 @@ def grid_detection_plan(
 
     grid_width_pixels = int(grid_width_microns / microns_per_pixel_x)
 
-    # The FGS uses -90 so we need to match it
-    for angle in [0, -90]:
+    for angle in (yield from optimum_grid_detect_angles(smargon)):
         yield from bps.mv(smargon.omega, angle)
         # need to wait for the OAV image to update
         # See #673 for improvements

mx_bluesky/common/experiment_plans/oav_snapshot_plan.py

@@ -4,7 +4,7 @@ from typing import Protocol
 from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
-from dodal.devices.backlight import Backlight, BacklightPosition
+from dodal.devices.backlight import Backlight, InOut
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.smargon import Smargon
@@ -36,7 +36,7 @@ def setup_beamline_for_OAV(
 ):
     max_vel = yield from bps.rd(smargon.omega.max_velocity)
     yield from bps.abs_set(smargon.omega.velocity, max_vel, group=group)
-    yield from bps.abs_set(backlight, BacklightPosition.IN, group=group)
+    yield from bps.abs_set(backlight, InOut.IN, group=group)
     yield from bps.abs_set(
         aperture_scatterguard.selected_aperture, ApertureValue.OUT_OF_BEAM, group=group
     )

mx_bluesky/common/external_interaction/alerting/__init__.py

@@ -0,0 +1,13 @@
+from mx_bluesky.common.external_interaction.alerting._service import (
+    AlertService,
+    Metadata,
+    get_alerting_service,
+    set_alerting_service,
+)
+
+__all__ = [
+    "AlertService",
+    "Metadata",
+    "get_alerting_service",
+    "set_alerting_service",
+]

mx_bluesky/common/external_interaction/alerting/_service.py

@@ -0,0 +1,82 @@
+from datetime import UTC, datetime, timedelta
+from enum import StrEnum
+from typing import Protocol
+from urllib.parse import quote, urlencode
+
+
+class Metadata(StrEnum):
+    """Metadata fields that can be specified by the caller when raising an alert."""
+
+    CONTAINER = "container"
+    SAMPLE_ID = "sample_id"
+    VISIT = "visit"
+
+
+class ExtraMetadata(StrEnum):
+    """Additional metadata fields that are automatically appended by
+    the AlertService implementations."""
+
+    ALERT_CONTENT = "alert_content"
+    ALERT_SUMMARY = "alert_summary"
+    BEAMLINE = "beamline"
+    GRAYLOG_URL = "graylog_url"
+    ISPYB_URL = "ispyb_url"
+    PROPOSAL = "proposal"
+
+
+class AlertService(Protocol):
+    """
+    Implemented by any backend that provides the ability to dispatch alerts to some
+    service that is capable of disseminating them via any of a variety of media such
+    as email, SMS, instant messaging, etc etc.
+    """
+
+    def raise_alert(self, summary: str, content: str, metadata: dict[Metadata, str]):
+        """
+        Raise an alert that will be forwarded to beamline support staff, which might
+        for example be used as the basis for an incident in an incident reporting system.
+        Args:
+            summary: One line summary of the alert, that might for instance be used
+                in an email subject line.
+            content: Plain text content detailing the nature of the incident.
+            metadata: A dict of strings that can be included as metadata in the alert for
+                those backends that support it. The summary and content will be included
+                by default.
+        """
+        pass
+
+
+_alert_service: AlertService
+
+
+def get_alerting_service() -> AlertService:
+    """Get the alert service for this instance."""
+    return _alert_service
+
+
+def set_alerting_service(service: AlertService):
+    """Set the alert service for this instance, call when the beamline is initialised."""
+    global _alert_service
+    _alert_service = service
+
+
+def ispyb_url(sample_id: str):
+    return f"https://ispyb.diamond.ac.uk/samples/sid/{quote(sample_id)}"
+
+
+def graylog_url(stream_id: str):
+    now = datetime.now(UTC)
+    from_utc = now - timedelta(minutes=5)
+    from_timestamp = from_utc.isoformat()
+    # Add 1 second for graylog timing jitter
+    to_utc = now + timedelta(seconds=1)
+    to_timestamp = to_utc.isoformat()
+    query_string = urlencode(
+        {
+            "streams": stream_id,
+            "rangetype": "absolute",
+            "from": from_timestamp,
+            "to": to_timestamp,
+        }
+    )
+    return "https://graylog.diamond.ac.uk/search?" + query_string

mx_bluesky/common/external_interaction/alerting/log_based_service.py

@@ -0,0 +1,57 @@
+import logging
+from typing import cast
+
+from dodal.log import LOGGER
+from dodal.utils import get_beamline_name
+
+from mx_bluesky.common.external_interaction.alerting import Metadata
+from mx_bluesky.common.external_interaction.alerting._service import (
+    ExtraMetadata,
+    graylog_url,
+    ispyb_url,
+)
+from mx_bluesky.common.external_interaction.callbacks.common.ispyb_mapping import (
+    get_proposal_and_session_from_visit_string,
+)
+
+
+class LoggingAlertService:
+    """
+    Implement an alert service that raises alerts by generating a specially formatted
+    log message, that may be intercepted by a logging service such as graylog and
+    used to dispatch the alert.
+    """
+
+    def __init__(self, graylog_stream_id: str, level=logging.WARNING):
+        """
+        Create a new instance of the service
+        Args:
+            level: The python logging level at which to generate the message
+        """
+        super().__init__()
+        self._level = level
+        self._graylog_stream_id = graylog_stream_id
+
+    def _append_extra_metadata(self, metadata: dict[Metadata, str]) -> dict[str, str]:
+        with_extras = cast(dict, metadata.copy())
+        with_extras[ExtraMetadata.GRAYLOG_URL] = graylog_url(self._graylog_stream_id)
+        with_extras[ExtraMetadata.BEAMLINE] = get_beamline_name("")
+        if sample_id := metadata.get(Metadata.SAMPLE_ID, None):
+            with_extras[ExtraMetadata.ISPYB_URL] = ispyb_url(sample_id)
+        if visit := metadata.get(Metadata.VISIT, None):
+            proposal, _ = get_proposal_and_session_from_visit_string(visit)
+            with_extras[ExtraMetadata.PROPOSAL] = proposal
+        return with_extras
+
+    def raise_alert(self, summary: str, content: str, metadata: dict[Metadata, str]):
+        message = f"***ALERT*** summary={summary} content={content}"
+        with_extras = self._append_extra_metadata(metadata)
+        LOGGER.log(
+            self._level,
+            message,
+            extra={
+                ExtraMetadata.ALERT_SUMMARY: summary,
+                ExtraMetadata.ALERT_CONTENT: content,
+            }
+            | with_extras,
+        )