Closedown

script/XAS.py

@@ -7,12 +7,12 @@ SENSORS = (Keithley1, Keithley2, MachineCurrent)
 
 #SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, AuxVoltage, MachineCurrent)
 #SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent, OpticsCameraCentroidX, OpticsCameraSigmaX)
-STARTPOS = (910)
-ENDPOS = (950)
+STARTPOS = (810)
+ENDPOS = (850)
 #NUMPOINTS = 76
 STEPSIZE = 0.1
-LATENCY = 0.1
-DWELL = 0.1
+LATENCY = 5.0
+DWELL = 0.5
 
 ENDSCAN = False # close shutter at end
 
@@ -22,7 +22,8 @@ def trig():
     #caput("X03DA-OP-10ADC:TRG.PROC", 1)
 
 try:
-    lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPSIZE, LATENCY, before_read=trig, after_read=after_readout)
+    prepare_keithleys(DWELL)
+    lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPSIZE, LATENCY, before_read=before_readout, after_read=after_readout)
 finally:
     if ENDSCAN:
         after_scan()    

script/local.py

@@ -284,13 +284,18 @@ def before_readout():
             sample_scienta = True        
             break
 
+    print time.time(), " before_readout: beam"
     wait_beam()
+    print time.time(), " before_readout: trig"
     trig_keithleys()        
+    print time.time(), " before_readout: wait"
     if sample_scienta:
         trig_scienta()
     else:
         wait_keithleys()
+    print time.time(), " before_readout: fetch"
     fetch_keithleys()
+    print time.time(), " before_readout: return"
 
 def after_readout(rec):
     if get_exec_pars().persist: