devices: added ring current, removed iold epics variables, added notes to self
This commit is contained in:
+3
-15
@@ -72,21 +72,7 @@ class BeamlineDevices:
|
||||
getpv = f"{BEAMLINE}-ES-BL:POS-GET",
|
||||
timeout = 10.0)
|
||||
|
||||
self.__collimator_pos = MyMotor(f"{BEAMLINE}-ES-COL:TRY")
|
||||
self.__collimator_X = MyMotor(f"{BEAMLINE}-ES-COL:TRX") # 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.__ringcurrent = self.bec_worker.ring_current
|
||||
|
||||
self.__zoom = SetGetPV(name = f"zoom",
|
||||
setpv = f"{BEAMLINE}-ES-MS:ZOOM.VAL",
|
||||
@@ -204,6 +190,7 @@ class BeamlineDevices:
|
||||
|
||||
@property
|
||||
def flux(self) -> float:
|
||||
#TODO FLUX
|
||||
return 0
|
||||
|
||||
@property
|
||||
@@ -362,6 +349,7 @@ class BeamlineDevices:
|
||||
)
|
||||
|
||||
def aerotech_stop(self):
|
||||
#TODO link cancel in GUI to cancel in aerotech if not already done
|
||||
pass
|
||||
|
||||
# Smargon goniometer
|
||||
|
||||
Reference in New Issue
Block a user