diff --git a/script/optics/ExitSlitYScan.py b/script/optics/ExitSlitYScan.py index 2fb41461..b4c6b7bb 100644 --- a/script/optics/ExitSlitYScan.py +++ b/script/optics/ExitSlitYScan.py @@ -9,22 +9,23 @@ set keithleys manually to "poll curr slow" and fixed range (20 nA for diode, 200 POSITIONERS = (ExitSlitY) SENSORS = (SampleCurrent,RefCurrent, MachineCurrent) STARTPOS = (0.5) -ENDPOS = (-0.25) +ENDPOS = (-0.3) #STEPS = -0.01 DWELL = 0.1 -TOTAL_TIME = 150 -STEPS = int(TOTAL_TIME / DWELL) + 1 +#TOTAL_TIME = 150 +#STEPS = int(TOTAL_TIME / DWELL) + 1 +STEPS = 200 def trig(): wait_beam() #caput(KEI_RMU + "DOINIT", 1) #time.sleep(0.1) #caput(KEI_RMU + "DOTRIGGER", 1) - time.sleep(DWELL * 1.1) + time.sleep(DWELL) #caput(KEI_RMU + "DOFETCH", 1) #set_adc_averaging(dwelltime=DWELL) #set_exec_pars(compression=True, shuffle=True) set_exec_pars(compression=True) -#lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) -cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=TOTAL_TIME, after_read=after_readout, check_positions = False) +lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) +#cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=TOTAL_TIME, after_read=after_readout, check_positions = False)