From 129e658e7f199f1f2c090c37b5f8d56cd5166aec Mon Sep 17 00:00:00 2001
From: x07maop <x07maop@x07ma-cons-1.psi.ch>
Date: Tue, 1 Mar 2016 09:28:57 +0100
Subject: [PATCH] Script execution

---
 script/local.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/script/local.py b/script/local.py
index 0d4e904..72b9ffa 100644
--- a/script/local.py
+++ b/script/local.py
@@ -154,27 +154,27 @@ keithleys = {
 def set_hx(field, timeout = -1):
     field_x.write(float(field))
     field_x_done.waitValue(1,timeout)
-
+#Only test x today
 def setHz(field, timeout = -1):
     field_z.write(float(field))
     field_z_done.waitValue(1,timeout)
 
 def set_pol_cplus(offset = None, timeout = -1):
     pol_mode.write("CIRC +")
-    if off is not None:
+    if offset is not None:
         pol_offset.write(float(offset))
     pol_done.waitValue("DONE",timeout)    
 
 def set_pol_cminus(offset = None, timeout = -1):
     pol_mode.write("CIRC -")
-    if off is not None:
+    if offset is not None:
         pol_offset.write(float(offset))
     pol_done.waitValue("DONE",timeout)    
 
 def set_pol_lin(angle, offset = None, timeout = -1):
     pol_mode.write("LINEAR")
     pol_angle.write(float(angle))
-    if off is not None:
+    if offset is not None:
         pol_offset.write(float(offset))
     pol_done.waitValue("DONE",timeout)    
 
@@ -203,22 +203,22 @@ def set_cff (value):
 def set_slit(value):
     exit_slit.write(float(value))
     
-
+#1 or 3
 def set_har(value):
     harmonic.write(float(value))
 
-
+#Not connected
 def set_volt(keithley, value, delay=0.1):
     #keithley.write(float(value))
-    if not keithley in keithleys.keys(): raise Exception("Invalid keithley: " + keithley)
+    if not keithltey in keithleys.keys(): raise Exception("Invalid keithley: " + keithley)
     caput(keithleys[keithley][0], float(value))
-    time.sleep(float(delay))
-
+    time.sharmonicleep(float(delay))
+#test k1,k2,k3
 def set_range(keithley, value):
     if not keithley in keithleys.keys(): raise Exception("Invalid keithley: " + keithley)
     caput(keithleys[keithley][1], int(value))
 
-
+#only test .5 to .25
 def set_fe(opening):
     opening = float(opening*100)
     if opening==0:
@@ -246,7 +246,7 @@ def wait_temp():
         t=ct=temperature_readback.read()
         #hl=caget("X07MA-PC-HE:LEVELB", 'd') # TODO: not used	 
         if (t > 3.7):
-            refill_1k
+            refill_1k()
 
 def rampdown():
     field_x.write(0)
@@ -291,15 +291,21 @@ def hyst_step(forward, field,  init_field, final_field, step, energies):
 def hyst_step_mult(forward, ranges, ramp_speed, energies):
     run("HistScanMult",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "FIELD_CHANGE_SLEEP":22.0, "MODE":None, "OFFSET":None})
 
-def scan_e(start, end, step):
+def scan_e(start, end, step, settling_time = 0, accumulation_time = None):
     setpoint = Channel (energy.channelName, 'd') #Not using energy device to have a blocking write
     wait_beam()
     lscan(setpoint, energy_readback, float(start), float(end), float(step))
 
-def scan_e(ranges):
-    setpoint = Channel (energy.channelName, 'd')
-    rscan(setpoint, energy_readback, ranges)
-
+def scan_e(ranges, settling_time = 0, accumulation_time = None):
+    #setpoint = Channel (energy.channelName, 'd')    
+    
+    detectors = [signal_tey, signal_i0, signal_trans,  pol_mode, pol_angle, temperature, current]
+    energy.setBlockingWrite(True)
+    try:
+        rscan(energy, detectors, ranges, latency = settling_time)
+    finally:
+        energy.setBlockingWrite(False)
+#not connected
 def scan_v(keithley,start, end, step):
     setpoint = Channel (keithleys[keithley][0], 'd')
     readback = Channel (keithleys[keithley][2], 'd')