Closedown

This commit is contained in:
gac-x09lb
2022-11-23 09:12:02 +01:00
parent 64c6f80912
commit 7bbde86efb
2 changed files with 9 additions and 9 deletions

View File

@@ -5,5 +5,5 @@ sample_z=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRZ|||true
dummy_x=ch.psi.pshell.device.DummyMotor||||true
dummy_y=ch.psi.pshell.device.DummyMotor||||true
#sample_r=ch.psi.pshell.epics.Motor|X09LB-ES3-SAMPLE:ROT1|||true
$ccd=ch.psi.pshell.epics.AreaDetector|X09LB-ES2-CCD|||true
ccd=ch.psi.pshell.epics.AreaDetector|X09LB-ES2-CCD|||true
image=ch.psi.pshell.imaging.CameraSource|ccd|||true

View File

@@ -23,10 +23,10 @@ if (get_exec_pars().args is None) and (get_exec_pars().script=="Regine"):
STEPS_Y= 3
STEP_SIZE_X = 0.1
STEP_SIZE_Y = 0.2
NOISE=0.05
SETTLING_TIME = 1.0
ZIGZAG = True
COMPRESSION = False
NOISE=0.00
#Constants
SENSORS = [current, ccd.dataMatrix]
@@ -40,13 +40,7 @@ RANGE_Y=[CENTER_Y - STEP_SIZE_Y*STEPS_Y, CENTER_Y + STEP_SIZE_Y*STEPS_Y]
if EXPOSURES:
ENABLED_PLOTS = [ccd.dataMatrix] #Cannot plot current in 3d vscan
POSITIONERS = POSITIONERS + [exposure_index()]
SENSORS = SENSORS + [exposure()]
RANGE_E=[0, len(EXPOSURES)-1]
def gen():
x_index = y_index = e_index = 0
ENABLED_PLOTS = [ccd.dataMatrix] #Cannot plot current in 3d vscan x_index = y_index = e_index = 0
for x_step in range(-STEPS_X, STEPS_X+1):
range_y= range(STEPS_Y, -STEPS_Y-1, -1) if (ZIGZAG and(x_index%2 ==1)) else range(-STEPS_Y, STEPS_Y+1)
for y_step in range_y:
@@ -61,6 +55,12 @@ def gen():
yield([xpos,ypos])
y_index=y_index+1
x_index=x_index+1
POSITIONERS = POSITIONERS + [exposure_index()]
SENSORS = SENSORS + [exposure()]
RANGE_E=[0, len(EXPOSURES)-1]
def gen():