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

Closedown

Browse Source
This commit is contained in:
gac-x09lb
2022-11-28 15:22:31 +01:00
parent 3b9b2a45ed
commit 846a6d33cd
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+1 -1
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
config/variables.properties
+3 -3
View File
@@ -1,4 +1,4 @@
#Wed Nov 23 13:20:10 CET 2022
#Wed Nov 23 13:30:40 CET 2022
LastRunDate=221123
DaySequentialNumber=17
FileSequentialNumber=145
DaySequentialNumber=20
FileSequentialNumber=148
script/templates/Regine.py
+24 -8
View File
@@ -12,6 +12,7 @@ NOISE (FLOAT)
"""
import random
position_plot = None if "POSITION_PLOT" not in globals() else POSITION_PLOT
#Debugging
if (get_exec_pars().args is None) and (get_exec_pars().script=="Regine"):
@@ -27,32 +28,48 @@ if (get_exec_pars().args is None) and (get_exec_pars().script=="Regine"):
SETTLING_TIME = 1.0
ZIGZAG = True
COMPRESSION = False
position_plot=None
if not position_plot: position_plot=plot(None, title="Motor Positions")[0]
#Constants
SENSORS = [current, ccd.dataMatrix]
POSITIONERS = [dummy_x, dummy_y] if DRY_RUN else [sample_x, sample_y]
ENABLED_PLOTS = [current, ccd.dataMatrix]
ENABLED_PLOTS = [ccd.dataMatrix]
CUSTOM_PLOT_TYPES = {ccd.dataMatrix:"ch.psi.pshell.plot.MatrixPlotRenderer"}
RANGE_X=[CENTER_X - STEP_SIZE_X*STEPS_X, CENTER_X + STEP_SIZE_X*STEPS_X]
RANGE_Y=[CENTER_Y - STEP_SIZE_Y*STEPS_Y, CENTER_Y + STEP_SIZE_Y*STEPS_Y]
position_plot.clear()
position_plot.addSeries(LinePlotSeries("positions"))
position_plot.getAxis(AxisId.X).label = POSITIONERS[0].name
position_plot.getAxis(AxisId.X).setRange(RANGE_X[0]-STEP_SIZE_X, RANGE_X[1]+STEP_SIZE_X)
position_plot.getAxis(AxisId.Y).label = POSITIONERS[1].name
position_plot.getAxis(AxisId.Y).setRange(RANGE_Y[0]-STEP_SIZE_Y, RANGE_Y[1]+STEP_SIZE_Y)
def after_read(record, scan):
after_readout()
position_plot.getSeries(0).appendData(record[POSITIONERS[0]], record[POSITIONERS[1]])
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
for x_step in range(-STEPS_X, STEPS_X+1):
xpos = CENTER_X + x_step*STEP_SIZE_X + (random.random()-0.5)*NOISE*2*STEP_SIZE_X
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:
ypos = CENTER_Y + y_step*STEP_SIZE_Y + (random.random()-0.5)*NOISE*2*STEP_SIZE_Y
xpos = CENTER_X + x_step*STEP_SIZE_X + (random.random()-0.5)*NOISE*2*STEP_SIZE_X
ypos = CENTER_Y + y_step*STEP_SIZE_Y + (random.random()-0.5)*NOISE*2*STEP_SIZE_Y
if EXPOSURES:
range_e= range(len(EXPOSURES)-1,-1, -1) if (ZIGZAG and(y_index%2 ==1)) else range(len(EXPOSURES))
for e in range_e:
@@ -62,12 +79,11 @@ def gen():
y_index=y_index+1
x_index=x_index+1
try:
r = vscan(POSITIONERS, SENSORS , gen(), False,\
SETTLING_TIME, relative=False, zigzag = ZIGZAG, initial_move=False, \
before_read=before_readout, after_read = after_readout, \
before_read=before_readout, after_read = after_read, \
manual_range=RANGE_X, manual_range_y=RANGE_Y, \
compression = COMPRESSION, enabled_plots=ENABLED_PLOTS, \
keep=False, check_positions=False, plot_types=CUSTOM_PLOT_TYPES)