From 19beb110659c83184a548cb3f8a19e4943d21fe5 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Fri, 9 Feb 2018 14:14:07 +0100
Subject: [PATCH] Closedown

---
 script/XAS.py   | 11 ++++++-----
 script/local.py |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/script/XAS.py b/script/XAS.py
index 2727121a..c8a9491f 100644
--- a/script/XAS.py
+++ b/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()    
diff --git a/script/local.py b/script/local.py
index 7c075773..9690e141 100644
--- a/script/local.py
+++ b/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: