diff --git a/config/devices.properties b/config/devices.properties index 94a0df3e..20743a92 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -63,7 +63,7 @@ MonoGrating=ch.psi.pshell.epics.ChannelString|X03DA-PGM:grating|Read||true FocusYTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oy|Read||true FocusZTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oz|Read||true FocusXRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oRx|Read||true -FocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-FMU:tRy X03DA-OP-FMU:oRy|||true +FocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-FMU:tRy.A X03DA-OP-FMU:oRy|||true FocusZRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oRz|Read||true RefocusVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SV:ctr|||true RefocusVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SV:size|||true diff --git a/script/FocusYRotScan.py b/script/FocusYRotScan.py index 3c813bff..f5997b26 100644 --- a/script/FocusYRotScan.py +++ b/script/FocusYRotScan.py @@ -13,8 +13,8 @@ STEPS = 40 LATENCY = 0.5 ENDSCAN = False -MOTORS = (FocusYRot) -SENSORS = (Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution, OpticsCameraCentroidX, OpticsCameraSigmaX) +MOTORS = [FocusYRot] +SENSORS = [Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution, OpticsCameraCentroidX, OpticsCameraSigmaX] STARTPOS = (-DISTANCE / 2.0) ENDPOS = (DISTANCE / 2.0) RELATIVE = True @@ -28,7 +28,7 @@ def trig_sensors(): caput("X03DA-OP-10ADC:TRG.PROC", 1) try: - lscan(MOTORS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=trig_sensors, after_read = after_readout) + lscan(MOTORS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=before_readout, after_read = after_readout) finally: if ENDSCAN: after_scan()