diff --git a/script/crlogic.py b/script/crlogic.py index 9387171..0cd1d45 100644 --- a/script/crlogic.py +++ b/script/crlogic.py @@ -14,7 +14,7 @@ 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", "X10DA-ES1-DCM:EC") +bragg_pos = CrlogicPositioner("bragg_pos", "X10DA-OP-MO3:ROX", "X10DA-ES1-DCM:EC") i0 = CrlogicSensor("I0", "SCALER12", True) i1 = CrlogicSensor("I1", "SCALER13", True) i2 = CrlogicSensor("I2", "SCALER14", True) @@ -27,19 +27,18 @@ abs_calc = AbsCalc() class ECalc(Readable): def read(self): - return 12.39842 / ( crystal.take() * math.sin( math.radians(bragg.take())) ) + return 12.39842 / ( crystal.take() * math.sin( math.radians(bragg_pos.take())) ) e_calc = ECalc() sensors = [RegisterCache(crystal), i0, i1, i2, ref, abs_calc, e_calc] -sensors = [i0, i1, i2] - - -bragg.initialize() -bragg.move(12.3) +bragg_pos.initialize() +bragg_pos.move(12.3) +time.sleep(1.0) try: - r1 = hscan(crlogic_config, bragg, sensors, 12.3, 12.6, 0.002, 1, False) + r1 = hscan(crlogic_config, bragg_pos, sensors, 12.3, 12.6, 0.002, 1, False) finally: - bragg.close() + bragg_pos.close() + pass \ No newline at end of file