pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
x03daop
2016-08-03 18:02:58 +02:00
parent 152d91ece7
commit 09a60d43f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/devices.properties
View File

@@ -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

6
script/FocusYRotScan.py
View File

@@ -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()