diff --git a/config/devices.properties b/config/devices.properties index 3d13f726..94a0df3e 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.ChannelDouble|X03DA-OP-FMU:oRy|Read||true +FocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-FMU:tRy 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 559e5499..29d475cf 100644 --- a/script/FocusYRotScan.py +++ b/script/FocusYRotScan.py @@ -1,5 +1,5 @@ """ -Refocusing mirror Ry scan +Focusing mirror Ry scan set scan parameters below, move the mirror to the center position. set analyser parameters separately! @@ -8,12 +8,12 @@ set analyser parameters separately! import math # adjust the following parameters -DISTANCE = 0.2 -STEPS = 20 +DISTANCE = 0.08 +STEPS = 40 LATENCY = 0.5 ENDSCAN = False -MOTORS = [RefocusYRot] +MOTORS = [FocusYRot] SENSORS = [Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution] STARTPOS = (-DISTANCE / 2.0) ENDPOS = (DISTANCE / 2.0) @@ -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()