Closedown

2018-02-09 14:14:07 +01:00
parent 347efee971
commit 19beb11065
2 changed files with 11 additions and 5 deletions
@@ -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()