mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 72 Wiki Activity

Devices: added det_cov, coll_z, scin_z, beamstop_x,y,z and cryojet_x, and fixed PV name bugs

Browse Source
This commit is contained in:
appleb_m
2026-02-18 10:56:07 +01:00
parent 4e880acb8c
commit 4f84eb67f2
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/daq/devices.py
+19 -7
View File
@@ -34,20 +34,25 @@ class BeamlineDevices:
self.__ring_current_pv = PV(f"ARS07-DPCT-0100:CURR")
self.__dtz = MyMotor(f"{BEAMLINE}-ES-DET:TRZ")
self.__dty = MyMotor(f"{BEAMLINE}-ES-DET:TRY")
self.__det_cov = EnumPV(name="det_cov",
setpv=f"{BEAMLINE}-ES-DETCOV:SET",
getpv=f"{BEAMLINE}-ES-DETCOV:GET")
self.__sample_cam = epicsAD(f"{BEAMLINE}-SAMCAM:")
self.__front_light = PredefinedPV(name='front_light',
setpv="{BEAMLINE}-ES-FL:SET",
getpv="{BEAMLINE}-ES-FL:GET",
setpv=f"{BEAMLINE}-ES-FL:SET",
getpv=f"{BEAMLINE}-ES-FL:GET",
predefs={"off":1.49,
'half':2.0,
'max':3.0},
timeout=10.0
)
self.__back_light = PredefinedPV(name='back_light',
setpv ="{BEAMLINE}-ES-BL:SET",
getpv="{BEAMLINE}-ES-BL:GET",
setpv =f"{BEAMLINE}-ES-BL:SET",
getpv=f"{BEAMLINE}-ES-BL:GET",
predefs={"off": 0,
'half': 0.98,
'max': 1.2},
@@ -59,15 +64,20 @@ class BeamlineDevices:
getpv = f"{BEAMLINE}-ES-BL:POS-GET",
timeout = 10.0)
self.__collimator_pos = PV(f"{BEAMLINE}-ES-COL:TRY") # HOW TO HANDLE!!!
self.__collimator_pos = PV(f"{BEAMLINE}-ES-COL:TRY")
self.__collimator_z = MyMotor(f"{BEAMLINE}-ES-COL:TRZ") # HOW TO HANDLE!!!
self.__scintillator_pos = PV(f"{BEAMLINE}-ES-SCL:TRY") # how to handle!!!
self.__scintillator_z = PV(f"{BEAMLINE}-ES-SCL:TRZ")
self.__beamstop_pos = EnumPV(name = "beamstop_pos",
setpv = f"{BEAMLINE}-ES-BS:POS-SET",
getpv = f"{BEAMLINE}-ES-BS:POS-GET",
timeout = 10.0)
self.__beamstop_x = MyMotor(f"{BEAMLINE}-ES-BS:TRX")
self.__beamstop_y = MyMotor(f"{BEAMLINE}-ES-BS:TRY")
self.__beamstop_z = MyMotor(f"{BEAMLINE}-ES-BS:TRZ")
self.__zoom = SetGetPV(name = f"zoom",
@@ -75,10 +85,12 @@ class BeamlineDevices:
getpv = f"{BEAMLINE}-ES-SAMCAM:ZOOM.RBV")
self.__cryojet_pos = EnumPV(name='cryojet_pos',
setpv = f"{BEAMLINE}-ES-CJ:POS-SET",
getpv = f"{BEAMLINE}-ES-CJ:POS-GET",
setpv = f"{BEAMLINE}-ES-CS:POS-SET",
getpv = f"{BEAMLINE}-ES-CS:POS-GET",
timeout = 10.0)
self.__cryojet_x = MyMotor(f"{BEAMLINE}-ES-CS:TRX")
# Transmission