Script execution

This commit is contained in:
x07maop
2016-03-01 12:22:05 +01:00
parent db9ead1baa
commit 754e59e7d3
+4 -4
View File
@@ -288,14 +288,14 @@ def wait_inj (value, delay=0.5):
def set_file(file_name):
FILENAME = file_name
class pol_mode_index(Readable):
class pol_mod(Readable):
def read(self):
mode = pol_mode.read()
if mode == "LINEAR": return 0.0
if mode == "CIRC +": return 1.0
if mode == "CIRC -": return 2.0
return -1.0
pmi = pol_mode_index()
polmod = pol_mod()
def otf(start, end, time, delay=0.0):
@@ -317,12 +317,12 @@ def scan_e(start, end, step, settling_time = 0, accumulation_time = None):
#wait_beam()
acc = Accumulator([signal_tey, signal_i0, signal_trans], accumulation_time)
detectors = acc.getSensors() + [pmi, pol_angle, temperature, current]
detectors = acc.getSensors() + [polmod, pol_angle, temperature, current]
lscan(energy, detectors, float(start), float(end), float(step), latency = settling_time)
def scan_e_mult(ranges, settling_time = 0, accumulation_time = None):
acc = Accumulator([signal_tey, signal_i0, signal_trans], accumulation_time)
detectors = acc.getSensors() + [pmi, pol_angle, temperature, current]
detectors = acc.getSensors() + [polmod, pol_angle, temperature, current]
rscan(energy, detectors, ranges, latency = settling_time)
#not connected