mx-bluesky 1.5.3__py3-none-any.whl → 1.5.5__py3-none-any.whl

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

@@ -25,31 +25,6 @@ def __which__():
 
 requested_transmission = "BL24I-OP-ATTN-01:T2A:SETVAL1"
 
-# PILATUS
-pilat_filepath = "BL24I-EA-PILAT-01:cam1:FilePath"
-pilat_filename = "BL24I-EA-PILAT-01:cam1:FileName"
-pilat_filetemplate = "BL24I-EA-PILAT-01:cam1:FileTemplate"
-pilat_numimages = "BL24I-EA-PILAT-01:cam1:NumImages"
-pilat_numexpimage = "BL24I-EA-PILAT-01:cam1:NumExposures"
-pilat_filenumber = "BL24I-EA-PILAT-01:cam1:FileNumber"
-pilat_acquire = "BL24I-EA-PILAT-01:cam1:Acquire"
-pilat_acquiretime = "BL24I-EA-PILAT-01:cam1:AcquireTime"
-pilat_acquireperiod = "BL24I-EA-PILAT-01:cam1:AcquirePeriod"
-pilat_imagemode = "BL24I-EA-PILAT-01:cam1:ImageMode"
-pilat_triggermode = "BL24I-EA-PILAT-01:cam1:TriggerMode"
-pilat_delaytime = "BL24I-EA-PILAT-01:cam1:DelayTime"
-pilat_wavelength = "BL24I-EA-PILAT-01:cam1:Wavelength"
-pilat_detdist = "BL24I-EA-PILAT-01:cam1:DetDist"
-pilat_filtertrasm = "BL24I-EA-PILAT-01:cam1:FilterTransm"
-pilat_filetemplate = "BL24I-EA-PILAT-01:cam1:FileTemplate"
-pilat_beamx = "BL24I-EA-PILAT-01:cam1:BeamX"
-pilat_beamy = "BL24I-EA-PILAT-01:cam1:BeamY"
-pilat_startangle = "BL24I-EA-PILAT-01:cam1:StartAngle"
-pilat_angleincr = "BL24I-EA-PILAT-01:cam1:AngleIncr"
-pilat_omegaincr = "BL24I-EA-PILAT-01:cam1:OmegaIncr"
-pilat_cbftemplate = "BL24I-EA-PILAT-01:cam1:CbfTemplateFile"
-pilat_filenum = "BL24I-EA-PILAT-01:cam1:FileNumber_RBV"
-
 
 # Eiger
 eiger_filepath = "BL24I-EA-EIGER-01:CAM:FilePath"
@@ -246,17 +221,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 +252,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/beamlines/i24/serial/setup_beamline/pv_abstract.py

@@ -8,35 +8,6 @@ abstract wrapper around them.
 from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
 
 
-class Pilatus:
-    id = 58
-    name = "pilatus"
-
-    # fast, slow / width, height
-    image_size_pixels = (2463, 2527)
-    pixel_size_mm = (0.172, 0.172)
-    image_size_mm = tuple(
-        round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm, strict=False)
-    )
-
-    det_y_threshold = 640.0
-    det_y_target = 647.0
-
-    class pv:
-        detector_distance = pv.pilat_detdist
-        wavelength = pv.pilat_wavelength
-        transmission = pv.pilat_filtertrasm
-        file_name = pv.pilat_filename
-        file_path = pv.pilat_filepath
-        file_template = pv.pilat_filetemplate
-        file_number = pv.pilat_filenumber
-        beamx = pv.pilat_beamx
-        beamy = pv.pilat_beamy
-
-    def __str__(self) -> str:
-        return self.name
-
-
 class Eiger:
     id = 94
     name = "eiger"
@@ -68,4 +39,4 @@ class Eiger:
         return self.name
 
 
-Detector = Pilatus | Eiger
+Detector = Eiger

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

@@ -275,100 +275,6 @@ def modechange(action):
     return 1
 
 
-def pilatus(action, args_list):
-    SSX_LOGGER.debug("***** Entering Pilatus")
-    SSX_LOGGER.info(f"Setup pilatus - {action}")
-    if args_list:
-        for arg in args_list:
-            SSX_LOGGER.debug(f"Argument: {arg}")
-
-    caput(pv.pilat_detdist, caget(pv.det_z))
-    caput(pv.pilat_filtertrasm, caget(pv.attn_match))
-
-    # Fixed Target stage (very fast start and stop w/ triggering from GeoBrick
-    if action == "fastchip":
-        [filepath, filename, total_numb_imgs, exptime] = args_list
-        rampath = filepath.replace("dls/i24/data", "ramdisk")
-        acqtime = float(exptime) - 0.001
-        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)
-        caput(pv.pilat_filepath, rampath + "/")
-        caput(pv.pilat_filename, filename)
-        caput(pv.pilat_numimages, str(total_numb_imgs))
-        caput(pv.pilat_acquiretime, str(acqtime))
-        caput(pv.pilat_acquireperiod, str(exptime))
-        caput(pv.pilat_imagemode, "Single")
-        caput(pv.pilat_triggermode, "Mult. Trigger")
-        caput(pv.pilat_delaytime, 0)
-
-    # Quick set of images no coordinated motion
-    elif action == "quickshot":
-        SSX_LOGGER.debug("quickshot")
-        [filepath, filename, num_imgs, exptime] = args_list
-        rampath = filepath.replace("dls/i24/data", "ramdisk")
-        caput(pv.pilat_filepath, rampath)
-        yield from bps.sleep(0.1)
-        caput(pv.pilat_filename, filename)
-        yield from bps.sleep(0.1)
-        acqtime = float(exptime) - 0.001
-        caput(pv.pilat_acquiretime, str(acqtime))
-        caput(pv.pilat_acquireperiod, str(exptime))
-        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")
-        yield from bps.sleep(2)
-        caput(pv.pilat_delaytime, 0.00)
-        caput(pv.pilat_numimages, str(num_imgs))
-        caput(pv.pilat_imagemode, "Continuous")
-        caput(pv.pilat_triggermode, "Ext. Trigger")
-        yield from bps.sleep(0.2)
-
-    elif action == "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)
-        yield from bps.sleep(0.1)
-        caput(pv.pilat_filename, filename)
-        yield from bps.sleep(0.1)
-        acqtime = float(exptime) - 0.001
-        caput(pv.pilat_acquiretime, str(acqtime))
-        caput(pv.pilat_acquireperiod, str(exptime))
-        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")
-        yield from bps.sleep(2)
-        caput(pv.pilat_delaytime, 0.00)
-        caput(pv.pilat_numimages, str(num_imgs))
-        caput(pv.pilat_imagemode, "Continuous")
-        caput(pv.pilat_triggermode, "Internal")
-        yield from bps.sleep(0.2)
-
-    # Put it all back to GDA acceptable defaults
-    elif action == "return to normal":
-        caput(pv.pilat_imagemode, "Continuous")
-        caput(pv.pilat_triggermode, "Ext. Trigger")
-        caput(pv.pilat_numexpimage, 1)
-    SSX_LOGGER.debug("***** leaving pilatus")
-    yield from bps.sleep(0.1)
-    return 0
-
-
 def eiger(action, args_list, dcm: DCM):
     SSX_LOGGER.debug("***** Entering Eiger")
     SSX_LOGGER.info(f"Setup eiger - {action}")

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

@@ -17,7 +17,6 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caget, caput
 from mx_bluesky.beamlines.i24.serial.setup_beamline.pv_abstract import (
     Detector,
     Eiger,
-    Pilatus,
 )
 
 EXPT_TYPE_DETECTOR_PVS = {
@@ -28,7 +27,6 @@ EXPT_TYPE_DETECTOR_PVS = {
 
 class DetRequest(IntEnum):
     eiger = 0
-    pilatus = 1
 
     def __str__(self) -> str:
         return self.name
@@ -45,9 +43,6 @@ def get_detector_type(detector_stage: YZStage) -> Generator[Msg, None, Detector]
     if float(det_y) < Eiger.det_y_threshold:
         SSX_LOGGER.info("Eiger detector in use.")
         return Eiger()
-    elif float(det_y) > Pilatus.det_y_threshold:
-        SSX_LOGGER.info("Pilatus detector in use.")
-        return Pilatus()
     else:
         SSX_LOGGER.error("Detector not found.")
         raise UnknownDetectorType("Detector not found.")
@@ -68,10 +63,10 @@ def _get_requested_detector(det_type_pv: str) -> str:
             a string or and int.
 
     Returns:
-        str: The detector name as a string, currently "eiger" or "pilatus".
+        str: The detector name as a string, currently "eiger".
     """
     det_type = caget(det_type_pv)
-    if det_type in ["pilatus", "eiger"]:
+    if det_type in ["eiger"]:
         return det_type
     else:
         try:
@@ -89,9 +84,8 @@ def setup_detector_stage(
     det_type_pv = EXPT_TYPE_DETECTOR_PVS[expt_type]
     requested_detector = _get_requested_detector(det_type_pv)
     SSX_LOGGER.info(f"Requested detector: {requested_detector}.")
-    det_y_target = (
-        Eiger.det_y_target if requested_detector == "eiger" else Pilatus.det_y_target
-    )
+    det_y_target = Eiger.det_y_target
+
     yield from _move_detector_stage(detector_stage, det_y_target)
     caput(det_type_pv, requested_detector)
     SSX_LOGGER.info("Detector setup done.")

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

@@ -24,7 +24,7 @@ from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
 
 # Detector specific outs
 TTL_EIGER = 1
-TTL_PILATUS = 2
+TTL_LASER = 2
 TTL_FAST_SHUTTER = 4
 
 SHUTTER_MODE = {
@@ -171,12 +171,11 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
 
     For this use case, both the laser and detector set up is taken care of by the Zebra.
     WARNING. This means that some hardware changes have been made.
-    Because all four of the zebra ttl outputs are in use in this mode, when the \
-    detector in use is the Eiger, the Pilatus cable is repurposed to trigger the light \
-    source, and viceversa.
+    All four of the zebra ttl outputs are in use in this mode. When the \
+    detector in use is the Eiger, the previous Pilatus cable is repurposed to trigger \
+    the light source.
 
-    The data collection output is OUT1_TTL for Eiger and OUT2_TTL for Pilatus and \
-    should be set to AND3.
+    The data collection output is OUT1_TTL for Eiger and should be set to AND3.
 
     Position compare settings:
         - The gate input is on SOFT_IN2.
@@ -191,7 +190,7 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
 
     Args:
         zebra (Zebra): The zebra ophyd device.
-        det_type (str): Detector in use, current choices are Eiger or Pilatus.
+        det_type (str): Detector in use.
         exp_time (float): Collection exposure time, in s.
         num_images (int): Number of images to be collected.
         pump_exp (float): Laser dwell, in s.
@@ -210,8 +209,8 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
     yield from set_logic_gates_for_porto_triggering(zebra)
 
     # Set TTL out depending on detector type
-    DET_TTL = TTL_EIGER if det_type == "eiger" else TTL_PILATUS
-    LASER_TTL = TTL_PILATUS if det_type == "eiger" else TTL_EIGER
+    DET_TTL = TTL_EIGER
+    LASER_TTL = TTL_LASER  # may change with additional detectors
     yield from bps.abs_set(
         zebra.output.out_pvs[DET_TTL], zebra.mapping.sources.AND4, group=group
     )
@@ -281,8 +280,7 @@ def setup_zebra_for_fastchip_plan(
 
     For this use case, the laser set up is taken care of by the geobrick, leaving only \
     the detector side set up to the Zebra.
-    The data collection output is OUT1_TTL for Eiger and OUT2_TTL for Pilatus and \
-    should be set to AND3.
+    The data collection output is OUT1_TTL for Eiger and should be set to AND3.
 
     Position compare settings:
         - The gate input is on IN3_TTL.
@@ -291,16 +289,14 @@ def setup_zebra_for_fastchip_plan(
         - Trigger source set to the exposure time with a 100us buffer in order to \
             avoid missing any triggers.
         - The trigger width is calculated depending on which detector is in use: the \
-            Pilatus only needs the trigger rising edge to collect for a set time, while \
-            the Eiger (used here in Externally Interrupter Exposure Series mode) \
+            Eiger (used here in Externally Interrupter Exposure Series mode) \
             will only collect while the signal is high and will stop once a falling \
             edge is detected. For this reason a square wave pulse width will be set to \
-            half the exposure time in the Pilatus case, and to the exposure time minus \
-            a small drop (~100um) for the Eiger.
+            the exposure time minus a small drop (~100um) for the Eiger.
 
     Args:
         zebra (Zebra): The zebra ophyd device.
-        det_type (str): Detector in use, current choices are Eiger or Pilatus.
+        det_type (str): Detector in use.
         num_gates (int): Number of apertures to visit in a chip.
         num_exposures (int): Number of times data is collected in each aperture.
         exposure_time_s (float): Exposure time for each shot.
@@ -335,10 +331,6 @@ def setup_zebra_for_fastchip_plan(
         yield from bps.abs_set(
             zebra.output.out_pvs[TTL_EIGER], zebra.mapping.sources.AND3, group=group
         )
-    if det_type == "pilatus":
-        yield from bps.abs_set(
-            zebra.output.out_pvs[TTL_PILATUS], zebra.mapping.sources.AND3, group=group
-        )
 
     # Square wave - needs a small drop to make it work for eiger
     pulse_width = (