DAQ: detector cover logic adapted
This commit is contained in:
@@ -140,9 +140,6 @@ def dc2rse(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
|
||||
|
||||
def se2sa(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
print(time.ctime(), " moving detector cover to open position")
|
||||
devs.detector_cover.put(2) # Open detector cover
|
||||
print(time.ctime(), " mchanging settings")
|
||||
hub = cfg.settings
|
||||
cfg.zoom_mode = ZoomModeEnum.User
|
||||
devs.samcam_settings = cfg.zoom_settings.get_camera_settings(devs.zoom)
|
||||
@@ -202,6 +199,7 @@ def sa2dc(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
|
||||
def dc2sa(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
hub = cfg.settings
|
||||
devs.detector_cover.put(1) # Close detector cover
|
||||
devs.collimator = StagePositionEnum.PARK
|
||||
devs.reflector_up = True
|
||||
|
||||
@@ -284,6 +282,7 @@ def sa2bl(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
val=1000
|
||||
devs.zoom = val
|
||||
cfg.zoom_mode = ZoomModeEnum.BeamLocation
|
||||
devs.detector_cover.put(1) # Close detector cover
|
||||
devs.samcam_settings = cfg.zoom_settings.get_camera_settings(val)
|
||||
devs.lamp_light = 2.5
|
||||
|
||||
|
||||
Reference in New Issue
Block a user