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

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

@@ -48,174 +48,14 @@ eiger_beamy = "BL24I-EA-EIGER-01:CAM:BeamY"
 eiger_omegaincr = "BL24I-EA-EIGER-01:CAM:OmegaIncr"
 eiger_od_filename_rbv = "BL24I-EA-EIGER-01:OD:FP:FileName_RBV"
 
-# BPMs
-qbpm1_inten = "BL24I-DI-QBPM-01:INTEN"
-qbpm1_inten_n = "BL24I-DI-QBPM-01:INTEN_N"
-qbpm2_inten = "BL24I-DI-QBPM-02:INTEN"
-qbpm2_inten_n = "BL24I-DI-QBPM-02:INTEN_N"
-qbpm3_inten = "BL24I-DI-QBPM-03:INTEN"
-qbpm3_inten_n = "BL24I-DI-QBPM-03:INTEN_N"
-# Cividec
-cividec_x = "BL24I-AL-XBPM-01:XS"
-cividec_y = "BL24I-AL-XBPM-01:YS"
-cividec_sum_i = "BL24I-EA-XBPM-01:SumAll:Sigma_RBV"
-cividec_beamx = "BL24I-EA-XBPM-01:PosX:MeanValue_RBV"
-cividec_beamy = "BL24I-EA-XBPM-01:PosY:MeanValue_RBV"
-# Lancelot
-lance_x = "BL24I-EA-DET-03:X"
-lance_y = "BL24I-EA-DET-03:Y"
-lance_beamx = "BL24I-EA-DET-03:STAT:CentroidX_RBV"
-lance_beamy = "BL24I-EA-DET-03:STAT:CentroidY_RBV"
-# FAST SHUTTER
-shtr_ctrl1 = "BL24I-EA-SHTR-01:CTRL1"
-shtr_ctrl2 = "BL24I-EA-SHTR-01:CTRL2"
-shtr_toggle = shtr_ctrl1
-shtr_pos = shtr_ctrl2
-# XPRESS3
-xsp3_acquire = "BL24I-EA-XSP3-01:Acquire"
-xsp3_erase = "BL24I-EA-XSP3-01:ERASE"
-xsp3_acquiretime = "BL24I-EA-XSP3-01:AcquireTime"
-xsp3_hdf5_filename = "BL24I-EA-XSP3-01:HDF5:FileName"
-xsp3_hdf5_filepath = "BL24I-EA-XSP3-01:HDF5:FilePath"
-xsp3_numimages = "BL24I-EA-XSP3-01:NumImages"
-xsp3_triggermode = "BL24I-EA-XSP3-01:TriggerMode"
-xsp3_c1_mca_roi1_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI1_LLM"
-xsp3_c1_mca_roi2_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI2_LLM"
-xsp3_c1_mca_roi3_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI3_LLM"
-xsp3_c1_mca_roi4_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI4_LLM"
-xsp3_c1_mca_roi1_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI1_HLM"
-xsp3_c1_mca_roi2_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI2_HLM"
-xsp3_c1_mca_roi3_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI3_HLM"
-xsp3_c1_mca_roi4_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI4_HLM"
-xsp3_c1_roi1_value_rbv = "BL24I-EA-XSP3-01:C1_ROI1:Value_RBV"
-xsp3_c1_roi2_value_rbv = "BL24I-EA-XSP3-01:C1_ROI2:Value_RBV"
-xsp3_c1_roi3_value_rbv = "BL24I-EA-XSP3-01:C1_ROI3:Value_RBV"
-xsp3_c1_roi4_value_rbv = "BL24I-EA-XSP3-01:C1_ROI4:Value_RBV"
-# Ring parameter
-ring_current = "SR-DI-DCCT-01:SIGNAL"
-ring_energy = "CS-CS-MSTAT-01:BEAMENERGY"
-beam_energy = "BL24I-OP-DCM-01:ENERGY.RBV"
-# Shutter status
-port_shutter_status = "FE24I-PS-SHTR-01:STA"
-optics_hutch_shutter_status = "FE24I-VA-GROUP-01:BLENABLE"
-experimental_hutch_shutter_status = "BL24I-PS-SHTR-01:STA"
-# S1
-s1_x_gap = "BL24I-AL-SLITS-01:X:GAP"
-s1_x_inboard = "BL24I-AL-SLITS-01:X:INBOARD"
-s1_y_gap = "BL24I-AL-SLITS-01:Y:GAP"
-s1_y_bottom = "BL24I-AL-SLITS-01:Y:BOTTOM"
-# Mono
-dcm_bragg = "BL24I-MO-DCM-01:BRAGG"
-dcm_gap = "BL24I-MO-DCM-01:GAP"
-dcm_roll1 = "BL24I-MO-DCM-01:XTAL1:ROLL"
-dcm_roll2 = "BL24I-MO-DCM-01:XTAL2:ROLL"
-dcm_pitch2 = "BL24I-MO-DCM-01:XTAL2:PITCH"
-dcm_energy = "BL24I-MO-DCM-01:ENERGY"
-
-# S2
-s2_x_plus = "BL24I-AL-SLITS-02:X:PLUS"
-s2_x_minus = "BL24I-AL-SLITS-02:X:MINUS"
-s2_y_plus = "BL24I-AL-SLITS-02:Y:PLUS"
-s2_y_minus = "BL24I-AL-SLITS-02:Y:MINUS"
-# PreFocussing Mirrors
-hpfm_y1 = "BL24I-OP-HPFM-01:Y1"
-hpfm_y2 = "BL24I-OP-HPFM-01:Y2"
-hpfm_y3 = "BL24I-OP-HPFM-01:Y3"
-hpfm_x1 = "BL24I-OP-HPFM-01:X1"
-hpfm_x2 = "BL24I-OP-HPFM-01:X2"
-vpfm_y1 = "BL24I-OP-VPFM-01:Y1"
-vpfm_y2 = "BL24I-OP-VPFM-01:Y2"
-vpfm_y3 = "BL24I-OP-VPFM-01:Y3"
-vpfm_x1 = "BL24I-OP-VPFM-01:X1"
-vpfm_x2 = "BL24I-OP-VPFM-01:X2"
-# S3
-s3_x_gap = "BL24I-AL-SLITS-03:X:GAP"
-s3_x_inboard = "BL24I-AL-SLITS-03:X:INBOARD"
-s3_y_gap = "BL24I-AL-SLITS-03:Y:GAP"
-s3_y_top = "BL24I-AL-SLITS-03:Y:TOP"
-# MicroFocussing Mirrors
-hmfm_x = "BL24I-OP-HMFM-01:X"
-hmfm_y = "BL24I-OP-HMFM-01:Y"
-hmfm_pitch = "BL24I-OP-HMFM-01:PITCH"
-vmfm_x = "BL24I-OP-VMFM-01:X"
-vmfm_y = "BL24I-OP-VMFM-01:Y"
-vmfm_pitch = "BL24I-OP-VMFM-01:PITCH"
-mtab_z = "BL24I-OP-MTAB-01:Z"
-# Collimation Table
-ctab_x1 = "BL24I-MO-CTAB-01:X1"
-ctab_x2 = "BL24I-MO-CTAB-01:X2"
-# Attenuators
-attn_disc1 = "BL24I-OP-ATTN-01:DISC1"
-attn_disc2 = "BL24I-OP-ATTN-01:DISC2"
-attn_match = "BL24I-OP-ATTN-01:MATCH"
-# AP1
-aptr1_x = "BL24I-AL-APTR-01:X"
-aptr1_y = "BL24I-AL-APTR-01:Y"
-aptr1_mp_select = "BL24I-AL-APTR-01:MP:SELECT"
-# AP2
-aptr2_x = "BL24I-AL-APTR-02:X"
-aptr2_y = "BL24I-AL-APTR-02:Y"
-aptr2_mp_select = "BL24I-AL-APTR-02:MP:SELECT"
-# Vertical Pin Goniometer
-vgon_omega = "BL24I-MO-VGON-01:OMEGA"
-vgon_kappa = "BL24I-MO-VGON-01:KAPPA"
-vgon_phi = "BL24I-MO-VGON-01:PHI"
-vgon_pinxs = "BL24I-MO-VGON-01:PINXS"
-vgon_pinys = "BL24I-MO-VGON-01:PINYS"
-vgon_pinzs = "BL24I-MO-VGON-01:PINZS"
-vgon_pinyh = "BL24I-MO-VGON-01:PINYH"
-ptab_x = "BL24I-MO-PTAB-01:X"
-ptab_z = "BL24I-MO-PTAB-01:Z"
-ptab_y = "BL24I-MO-PTAB-01:Y"
-# Horizontal Tray Goniometer
-hgon_omega = "BL24I-MO-HGON-01:OMEGA"
-hgon_trayys = "BL24I-MO-HGON-01:TRAYYS"
-hgon_trayzs = "BL24I-MO-HGON-01:TRAYZS"
-ttab_x = "BL24I-MO-TTAB-01:X"
-ttab_y = "BL24I-MO-TTAB-01:Y"
-ttab_z = "BL24I-MO-TTAB-01:Z"
-# Cryo
-cstrm_trans = "BL24I-MO-CSTRM-01:TRANS"
-cstrm_mp_select = "BL24I-MO-CSTRM-01:MP:SELECT"
-cstrm_p1701 = "BL24I-MO-CSTRM-01:P1701"
-# Fluorescence Detector
-fluo_trans = "BL24I-EA-DET-02:TRANS"
-fluo_out_limit = "BL24I-EA-DET-02:OUT:LIMIT"
-fluo_in_limit = "BL24I-EA-DET-02:IN:LIMIT"
-# Beamstop
-bs_x = "BL24I-MO-BS-01:X"
-bs_y = "BL24I-MO-BS-01:Y"
-bs_z = "BL24I-MO-BS-01:Z"
-bs_roty = "BL24I-MO-BS-01:ROTY"
-bs_mp_select = "BL24I-MO-BS-01:MP:SELECT"
-# Backlight
-bl_y = "BL24I-MO-BL-01:Y"
-bl_mp_select = "BL24I-MO-BL-01:MP:SELECT"
-# LED
-led1_doxcurrent_ouputcurrent = "BL24I-DI-LED-01:DOXCURRENT:OUTPUTCURRENT"
-led2_doxcurrent_ouputcurrent = "BL24I-DI-LED-02:DOXCURRENT:OUTPUTCURRENT"
-led3_doxcurrent_ouputcurrent = "BL24I-DI-LED-03:DOXCURRENT:OUTPUTCURRENT"
-led4_doxcurrent_ouputcurrent = "BL24I-DI-LED-04:DOXCURRENT:OUTPUTCURRENT"
-# Detector
-det_y = "BL24I-EA-DET-01:Y"
-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"
+# 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"
 
 # General Purpose PV. Now use STEP13
 ioc13_gp1 = "BL24I-MO-IOC-13:GP1"
@@ -233,141 +73,108 @@ 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"
-
-# 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"
+ioc13_gp16 = "BL24I-MO-IOC-13:GP16"
+ioc13_gp17 = "BL24I-MO-IOC-13:GP17"
+ioc13_gp18 = "BL24I-MO-IOC-13:GP18"
+ioc13_gp19 = "BL24I-MO-IOC-13:GP19"
+ioc13_gp20 = "BL24I-MO-IOC-13:GP20"
+ioc13_gp21 = "BL24I-MO-IOC-13:GP21"
+ioc13_gp22 = "BL24I-MO-IOC-13:GP22"
+ioc13_gp23 = "BL24I-MO-IOC-13:GP23"
+ioc13_gp24 = "BL24I-MO-IOC-13:GP24"
+ioc13_gp25 = "BL24I-MO-IOC-13:GP25"
+ioc13_gp26 = "BL24I-MO-IOC-13:GP26"
+ioc13_gp27 = "BL24I-MO-IOC-13:GP27"
+ioc13_gp28 = "BL24I-MO-IOC-13:GP28"
+ioc13_gp29 = "BL24I-MO-IOC-13:GP29"
+ioc13_gp30 = "BL24I-MO-IOC-13:GP30"
+ioc13_gp31 = "BL24I-MO-IOC-13:GP31"
+ioc13_gp32 = "BL24I-MO-IOC-13:GP32"
+ioc13_gp33 = "BL24I-MO-IOC-13:GP33"
+ioc13_gp34 = "BL24I-MO-IOC-13:GP34"
+ioc13_gp35 = "BL24I-MO-IOC-13:GP35"
+ioc13_gp36 = "BL24I-MO-IOC-13:GP36"
+ioc13_gp37 = "BL24I-MO-IOC-13:GP37"
+ioc13_gp38 = "BL24I-MO-IOC-13:GP38"
+ioc13_gp39 = "BL24I-MO-IOC-13:GP39"
+ioc13_gp40 = "BL24I-MO-IOC-13:GP40"
+ioc13_gp41 = "BL24I-MO-IOC-13:GP41"
+ioc13_gp42 = "BL24I-MO-IOC-13:GP42"
+ioc13_gp43 = "BL24I-MO-IOC-13:GP43"
+ioc13_gp44 = "BL24I-MO-IOC-13:GP44"
+ioc13_gp45 = "BL24I-MO-IOC-13:GP45"
+ioc13_gp46 = "BL24I-MO-IOC-13:GP46"
+ioc13_gp47 = "BL24I-MO-IOC-13:GP47"
+ioc13_gp48 = "BL24I-MO-IOC-13:GP48"
+ioc13_gp49 = "BL24I-MO-IOC-13:GP49"
+ioc13_gp50 = "BL24I-MO-IOC-13:GP50"
+ioc13_gp51 = "BL24I-MO-IOC-13:GP51"
+ioc13_gp52 = "BL24I-MO-IOC-13:GP52"
+ioc13_gp53 = "BL24I-MO-IOC-13:GP53"
+ioc13_gp54 = "BL24I-MO-IOC-13:GP54"
+ioc13_gp55 = "BL24I-MO-IOC-13:GP55"
+ioc13_gp56 = "BL24I-MO-IOC-13:GP56"
+ioc13_gp57 = "BL24I-MO-IOC-13:GP57"
+ioc13_gp58 = "BL24I-MO-IOC-13:GP58"
+ioc13_gp59 = "BL24I-MO-IOC-13:GP59"
+ioc13_gp60 = "BL24I-MO-IOC-13:GP60"
+ioc13_gp61 = "BL24I-MO-IOC-13:GP61"
+ioc13_gp62 = "BL24I-MO-IOC-13:GP62"
+ioc13_gp63 = "BL24I-MO-IOC-13:GP63"
+ioc13_gp64 = "BL24I-MO-IOC-13:GP64"
+ioc13_gp65 = "BL24I-MO-IOC-13:GP65"
+ioc13_gp66 = "BL24I-MO-IOC-13:GP66"
+ioc13_gp67 = "BL24I-MO-IOC-13:GP67"
+ioc13_gp68 = "BL24I-MO-IOC-13:GP68"
+ioc13_gp69 = "BL24I-MO-IOC-13:GP69"
+ioc13_gp70 = "BL24I-MO-IOC-13:GP70"
+ioc13_gp71 = "BL24I-MO-IOC-13:GP71"
+ioc13_gp72 = "BL24I-MO-IOC-13:GP72"
+ioc13_gp73 = "BL24I-MO-IOC-13:GP73"
+ioc13_gp74 = "BL24I-MO-IOC-13:GP74"
+ioc13_gp75 = "BL24I-MO-IOC-13:GP75"
+ioc13_gp76 = "BL24I-MO-IOC-13:GP76"
+ioc13_gp77 = "BL24I-MO-IOC-13:GP77"
+ioc13_gp78 = "BL24I-MO-IOC-13:GP78"
+ioc13_gp79 = "BL24I-MO-IOC-13:GP79"
+ioc13_gp80 = "BL24I-MO-IOC-13:GP80"
+ioc13_gp81 = "BL24I-MO-IOC-13:GP81"
+ioc13_gp82 = "BL24I-MO-IOC-13:GP82"
+ioc13_gp83 = "BL24I-MO-IOC-13:GP83"
+ioc13_gp84 = "BL24I-MO-IOC-13:GP84"
+ioc13_gp85 = "BL24I-MO-IOC-13:GP85"
+ioc13_gp86 = "BL24I-MO-IOC-13:GP86"
+ioc13_gp87 = "BL24I-MO-IOC-13:GP87"
+ioc13_gp88 = "BL24I-MO-IOC-13:GP88"
+ioc13_gp89 = "BL24I-MO-IOC-13:GP89"
+ioc13_gp90 = "BL24I-MO-IOC-13:GP90"
+ioc13_gp91 = "BL24I-MO-IOC-13:GP91"
+ioc13_gp92 = "BL24I-MO-IOC-13:GP92"
+ioc13_gp93 = "BL24I-MO-IOC-13:GP93"
+ioc13_gp94 = "BL24I-MO-IOC-13:GP94"
+ioc13_gp95 = "BL24I-MO-IOC-13:GP95"
+ioc13_gp96 = "BL24I-MO-IOC-13:GP96"
+ioc13_gp97 = "BL24I-MO-IOC-13:GP97"
+ioc13_gp98 = "BL24I-MO-IOC-13:GP98"
+ioc13_gp99 = "BL24I-MO-IOC-13:GP99"
+ioc13_gp100 = "BL24I-MO-IOC-13:GP100"
+ioc13_gp101 = "BL24I-MO-IOC-13:GP101"
+ioc13_gp102 = "BL24I-MO-IOC-13:GP102"
+ioc13_gp103 = "BL24I-MO-IOC-13:GP103"
+ioc13_gp104 = "BL24I-MO-IOC-13:GP104"
+ioc13_gp105 = "BL24I-MO-IOC-13:GP105"
+ioc13_gp106 = "BL24I-MO-IOC-13:GP106"
+ioc13_gp107 = "BL24I-MO-IOC-13:GP107"
+ioc13_gp108 = "BL24I-MO-IOC-13:GP108"
+ioc13_gp109 = "BL24I-MO-IOC-13:GP109"
+ioc13_gp110 = "BL24I-MO-IOC-13:GP110"
+ioc13_gp111 = "BL24I-MO-IOC-13:GP111"
+ioc13_gp112 = "BL24I-MO-IOC-13:GP112"
+ioc13_gp113 = "BL24I-MO-IOC-13:GP113"
+ioc13_gp114 = "BL24I-MO-IOC-13:GP114"
+ioc13_gp115 = "BL24I-MO-IOC-13:GP115"
+ioc13_gp116 = "BL24I-MO-IOC-13:GP116"
+ioc13_gp117 = "BL24I-MO-IOC-13:GP117"
+ioc13_gp118 = "BL24I-MO-IOC-13:GP118"
+ioc13_gp119 = "BL24I-MO-IOC-13:GP119"
+ioc13_gp120 = "BL24I-MO-IOC-13:GP120"

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

@@ -96,13 +96,19 @@ def set_detector_beam_center_plan(
         yield from bps.wait(group=group)
 
 
-def eiger(action, args_list, dcm: DCM):
+def eiger(
+    action,
+    args_list,
+    dcm: DCM,
+    detector_stage: YZStage,
+):
     SSX_LOGGER.debug("***** Entering Eiger")
     SSX_LOGGER.info(f"Setup eiger - {action}")
     if args_list:
         for arg in args_list:
             SSX_LOGGER.debug(f"Argument: {arg}")
-    caput(pv.eiger_detdist, str(float(caget(pv.det_z)) / 1000))
+    det_z = yield from bps.rd(detector_stage.z.user_readback)
+    caput(pv.eiger_detdist, str(det_z / 1000))
     dcm_wavelength_a = yield from bps.rd(dcm.wavelength_in_a.user_readback)
     caput(pv.eiger_wavelength, dcm_wavelength_a)
     caput(pv.eiger_omegaincr, 0.0)

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

@@ -20,7 +20,7 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.pv_abstract import (
 )
 
 EXPT_TYPE_DETECTOR_PVS = {
-    SSXType.FIXED: pv.me14e_gp101,
+    SSXType.FIXED: pv.ioc13_gp101,
     SSXType.EXTRUDER: pv.ioc13_gp15,
 }
 

mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py

@@ -108,7 +108,7 @@ def gui_move_detector(
     yield from _move_detector_stage(detector_stage, det_y_target)
     # Make the output readable
     SSX_LOGGER.debug(f"Detector move done, resetting general PV to {det}")
-    caput(pv.me14e_gp101, det)
+    caput(pv.ioc13_gp101, det)
 
 
 @bpp.run_decorator()

mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py

@@ -0,0 +1,64 @@
+from enum import Enum
+
+import bluesky.plan_stubs as bps
+from dodal.common import inject
+from dodal.devices.i24.pmac import PMAC
+
+
+class MoveSize(Enum):
+    SMALL = "small"
+    BIG = "big"
+
+
+class Direction(Enum):
+    UP = "up"
+    DOWN = "down"
+    LEFT = "left"
+    RIGHT = "right"
+
+
+def _move_direction(magnitude: float, direction: Direction, pmac):
+    y_move = 0.0
+    x_move = 0.0
+
+    match direction:
+        case Direction.UP:
+            y_move = magnitude
+        case Direction.DOWN:
+            y_move = -magnitude
+        case Direction.LEFT:
+            x_move = -magnitude
+        case Direction.RIGHT:
+            x_move = magnitude
+
+    yield from bps.abs_set(pmac.x, x_move, wait=True)
+    yield from bps.abs_set(pmac.y, y_move, wait=True)
+
+
+def move_block_on_arrow_click(direction: Direction, pmac: PMAC = inject("pmac")):
+    magnitude = 3.1750
+    yield from _move_direction(magnitude, direction, pmac)
+
+
+def move_window_on_arrow_click(
+    direction: Direction, size_of_move: MoveSize, pmac: PMAC = inject("pmac")
+):
+    match size_of_move:
+        case MoveSize.SMALL:
+            magnitude = 0.1250
+        case MoveSize.BIG:
+            magnitude = 0.3750
+
+    yield from _move_direction(magnitude, direction, pmac)
+
+
+def move_nudge_on_arrow_click(
+    direction: Direction, size_of_move: MoveSize, pmac: PMAC = inject("pmac")
+):
+    match size_of_move:
+        case MoveSize.SMALL:
+            magnitude = 0.0010
+        case MoveSize.BIG:
+            magnitude = 0.0060
+
+    yield from _move_direction(magnitude, direction, pmac)

mx_bluesky/{hyperion/device_setup_plans/smargon.py → common/device_setup_plans/gonio.py}

@@ -1,20 +1,23 @@
 import numpy as np
 from bluesky import plan_stubs as bps
 from bluesky.utils import FailedStatus
-from dodal.devices.smargon import CombinedMove, Smargon
+from dodal.devices.motors import XYZOmegaStage
 from ophyd_async.epics.motor import MotorLimitsError
 
 from mx_bluesky.common.utils.exceptions import SampleError
 
 
-def move_smargon_warn_on_out_of_range(
-    smargon: Smargon, position: np.ndarray | list[float] | tuple[float, float, float]
+def move_gonio_warn_on_out_of_range(
+    gonio: XYZOmegaStage,
+    position: np.ndarray | list[float] | tuple[float, float, float],
 ):
-    """Throws a SampleError if the specified position is out of range for the
-    smargon. Otherwise moves to that position. The check is from ophyd-async"""
+    """
+    Throws a SampleException if the specified position is out of range for the
+    gonio. Otherwise moves to that position. The check is from ophyd-async
+    """
     try:
         yield from bps.mv(
-            smargon, CombinedMove(x=position[0], y=position[1], z=position[2])
+            gonio.x, position[0], gonio.y, position[1], gonio.z, position[2]
         )
     except FailedStatus as fs:
         if isinstance(fs.__cause__, MotorLimitsError):

mx_bluesky/common/device_setup_plans/manipulate_sample.py

@@ -8,6 +8,7 @@ from dodal.devices.aperturescatterguard import (
 from dodal.devices.backlight import Backlight, InOut
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.smargon import CombinedMove, Smargon
+from dodal.devices.thawer import OnOff, Thawer
 
 from mx_bluesky.common.parameters.constants import PlanGroupCheckpointConstants
 from mx_bluesky.common.utils.log import LOGGER
@@ -19,9 +20,13 @@ def setup_sample_environment(
     aperture_scatterguard: ApertureScatterguard,
     aperture_position_gda_name: str | None,
     backlight: Backlight,
+    thawer: Thawer,
     group="setup_senv",
 ):
-    """Move the aperture into required position, move out the backlight."""
+    """Move the aperture into required position, move out the backlight so that it
+    doesn't cause a shadow on the detector and turn off thawing so it doesn't vibrate
+    the pin."""
+
     yield from bps.abs_set(backlight, InOut.OUT, group=group)
 
     aperture_value = (
@@ -33,6 +38,8 @@ def setup_sample_environment(
         aperture_scatterguard, aperture_value, group=group
     )
 
+    yield from bps.abs_set(thawer, OnOff.OFF, group=group)
+
 
 def move_aperture_if_required(
     aperture_scatterguard: ApertureScatterguard,

mx_bluesky/common/device_setup_plans/robot_load_unload.py

@@ -117,7 +117,7 @@ def robot_unload(
         yield from bps.save()
 
         def _unload():
-            yield from bps.trigger(robot.unload, wait=True)
+            yield from bps.abs_set(robot, None, wait=True)
             yield from wait_for_smargon_not_disabled(smargon)
 
         gonio_finished = yield from do_plan_while_lower_gonio_at_home(

mx_bluesky/common/device_setup_plans/setup_oav.py

@@ -28,6 +28,11 @@ def setup_pin_tip_detection_params(
         pin_tip_detect_device.preprocess_ksize, parameters.preprocess_K_size
     )
 
+    # sets iteration for blur
+    yield from set_using_group(
+        pin_tip_detect_device.preprocess_iterations, parameters.preprocess_iter
+    )
+
     # Canny edge detect - lower
     yield from set_using_group(
         pin_tip_detect_device.canny_lower_threshold,
@@ -40,6 +45,9 @@ def setup_pin_tip_detection_params(
         parameters.canny_edge_upper_threshold,
     )
 
+    # "Open" morphological operation
+    yield from set_using_group(pin_tip_detect_device.open_ksize, parameters.open_ksize)
+
     # "Close" morphological operation
     yield from set_using_group(
         pin_tip_detect_device.close_ksize, parameters.close_ksize

mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py

@@ -183,11 +183,6 @@ def setup_zebra_for_rotation(
 
     ttl_detector = ttl_input_for_detector_to_use or zebra.mapping.outputs.TTL_DETECTOR
 
-    if not isinstance(direction, RotationDirection):
-        raise ValueError(
-            "Disallowed rotation direction provided to Zebra setup plan. "
-            "Use RotationDirection.POSITIVE or RotationDirection.NEGATIVE."
-        )
     yield from bps.abs_set(zebra.pc.dir, direction.value, group=group)
     LOGGER.info("ZEBRA SETUP: START")
     # Set gate start, adjust for shutter opening time if necessary