diff --git a/config/devices.properties b/config/devices.properties index 67ca6679..9dca92a5 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -105,6 +105,8 @@ ManipulatorCoolFlow=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-BRONKHORST:GET-ME ManipulatorCoolFlowSet=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-BRONKHORST:GET-SETPOINT|Read||true ps1=ch.psi.pshell.epics.AreaDetector|X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1|||true op-ps1=ch.psi.pshell.epics.AreaDetector|X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1|||true +OpticsCameraCentroidX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats2:CentroidX_RBV|Read||true +OpticsCameraSigmaX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats2:SigmaX_RBV|Read||true $dummy=ch.psi.pshell.epics.Motor|XXX|||true img=ch.psi.pshell.imaging.CameraSource|Scienta|||true cam1=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-1/axis-cgi/mjpg/video.cgi||-200| diff --git a/script/ExitSlitScan.py b/script/ExitSlitScan.py index c5a8e1a8..9b79c83a 100644 --- a/script/ExitSlitScan.py +++ b/script/ExitSlitScan.py @@ -4,9 +4,9 @@ exit slit test scan POSITIONERS = (ExitSlit) SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent) -STARTPOS = (200.0) -ENDPOS = (0.0) -STEPS = -10.0 +STARTPOS = (0.0) +ENDPOS = (200.0) +STEPS = 10.0 LATENCY = 0.1 DWELL = 1.0 @@ -20,3 +20,9 @@ def trig(): caput("X03DA-OP-10ADC:TRG.PROC", 1) lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) + +STARTPOS = (200.0) +ENDPOS = (0.0) +STEPS = -10.0 + +lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) diff --git a/script/XAS.py b/script/XAS.py index 15574cd1..9646fe72 100644 --- a/script/XAS.py +++ b/script/XAS.py @@ -3,10 +3,11 @@ XAS scan """ POSITIONERS = (Eph) -SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent) +SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent, OpticsCameraCentroidX, OpticsCameraSigmaX) STARTPOS = (100.0) ENDPOS = (2000.0) -NUMPOINTS = 77 +#NUMPOINTS = 76 +STEPSIZE = 25.0 LATENCY = 1.0 DWELL = 1.0 ENDSCAN = True # close shutter at end @@ -21,7 +22,7 @@ def trig(): caput("X03DA-OP-10ADC:TRG.PROC", 1) try: - lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, NUMPOINTS, LATENCY, before_read=trig, after_read=after_readout) + lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPSIZE, LATENCY, before_read=trig, after_read=after_readout) finally: if ENDSCAN: after_scan()