From 4f1f61ee622e405ba34dfa7bff044f6b959aed6f Mon Sep 17 00:00:00 2001 From: x10daop Date: Tue, 7 Feb 2017 12:11:01 +0100 Subject: [PATCH] Script execution --- script/crlogic.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/script/crlogic.py b/script/crlogic.py index 84dfc10..9387171 100644 --- a/script/crlogic.py +++ b/script/crlogic.py @@ -1,20 +1,20 @@ -caput("X10DA-ES-SCALER.CNT", 0) -caput("X10DA-ES-SCALER.G1", 0) -caput("X10DA-ES-SCALER.CONT", 0) -""" +#caput("X10DA-ES-SCALER.CNT", 0) +#caput("X10DA-ES-SCALER.G1", 0) +#caput("X10DA-ES-SCALER.CONT", 0) + scaler.stop() scaler.channels[0].setPreset(False) #scaler.channels[0].setPresetValue(0) scaler.setOneShot() -""" + caput("X10DA-ES1:START-CSMPL", 1) caput("X10DA-ES1:TOTAL-CYCLES", 5) caput("X10DA-ES1:SMPL-BTN", 1) -bragg = CrlogicPositioner("bragg", "X10DA-OP-MO3:ROX", None) +bragg = CrlogicPositioner("bragg", "X10DA-OP-MO3:ROX", "X10DA-ES1-DCM:EC") i0 = CrlogicSensor("I0", "SCALER12", True) i1 = CrlogicSensor("I1", "SCALER13", True) i2 = CrlogicSensor("I2", "SCALER14", True) @@ -32,6 +32,8 @@ e_calc = ECalc() sensors = [RegisterCache(crystal), i0, i1, i2, ref, abs_calc, e_calc] +sensors = [i0, i1, i2] + bragg.initialize() bragg.move(12.3)