Script execution

script/local.py

@@ -73,6 +73,8 @@ sim_energy_readback = SimulatedEnergyReadback()
 # Utilities
 ###################################################################################################
 
+run ("Accumulator")
+
 def get_next_fid(folder, prefix):
     try:
         import glob   
@@ -274,7 +276,6 @@ def has_beam():
 def wait_beam():
     print "Waiting for beam..."
     while not has_beam():
-        print 'X'
         sleep(0.1)
     print "Beam OK"
 
@@ -304,13 +305,11 @@ 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, 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, settling_time = 0, accumulation_time = None):
-    #setpoint = Channel (energy.channelName, 'd')    
-    
+    #setpoint = Channel (energy.channelName, 'd')        
     detectors = [signal_tey, signal_i0, signal_trans,  pol_mode, pol_angle, temperature, current]
     rscan(energy, detectors, ranges, latency = settling_time)
 #not connected