diff --git a/script/optics/ExitSlitYScan.py b/script/optics/ExitSlitYScan.py index 3bba63e8..977c12c3 100644 --- a/script/optics/ExitSlitYScan.py +++ b/script/optics/ExitSlitYScan.py @@ -8,16 +8,16 @@ set keithleys manually to "poll curr fast" and fixed range (2 uA for diode, 2 nA POSITIONERS = (ExitSlitY) SENSORS = (SampleCurrent,RefCurrent, MachineCurrent) -STARTPOS = (0.6) +STARTPOS = (1.0) ENDPOS = (0.0) #STEPS = -0.01 DWELL = 0.1 -#TOTAL_TIME = 150 +TOTAL_TIME = 120 #STEPS = int(TOTAL_TIME / DWELL) + 1 STEPS = 200 def trig(): - wait_beam() + #wait_beam() #caput(KEI_RMU + "DOINIT", 1) #time.sleep(0.1) #caput(KEI_RMU + "DOTRIGGER", 1) @@ -27,5 +27,5 @@ def trig(): #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, before_read=trig, after_read=after_readout, check_positions = False)