From 947d1c9e43aaf4f472d9ac8b0c7f697c88037d5c Mon Sep 17 00:00:00 2001 From: x10daop Date: Thu, 19 Jan 2017 11:20:47 +0100 Subject: [PATCH] Closedown --- config/devices.properties | 2 +- script/crlogic.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/devices.properties b/config/devices.properties index 5b83eaf..faf1d3f 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,2 +1,2 @@ crystal=ch.psi.pshell.epics.ChannelDouble|X10DA-OP-MO3:Bragg2dSpacAO|||true -bragg=ch.psi.pshell.crlogic.CrlogicPositioner|X10DA-OP-MO3:ROX X10DA-ES1-DCM:EC|||true +#bragg=ch.psi.pshell.crlogic.CrlogicPositioner|X10DA-OP-MO3:ROX X10DA-ES1-DCM:EC|||false diff --git a/script/crlogic.py b/script/crlogic.py index 61c0e1e..47f31f0 100644 --- a/script/crlogic.py +++ b/script/crlogic.py @@ -5,6 +5,12 @@ 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) +i0 = CrlogicSensor("I0", "SCALER12", True) +i1 = CrlogicSensor("I1", "SCALER13", True) +i2 = CrlogicSensor("I2", "SCALER14", True) +ref = CrlogicSensor("ScalerRef", "SCALER15", True) + class AbsCalc(Readable): def read(self): return math.log(math.fabs(i0.take()) /math.fabs(i1.take())) @@ -17,6 +23,7 @@ e_calc = ECalc() sensors = [crystal, i0, i1, i2, ref, abs_calc, e_calc] + bragg.initialize() bragg.move(12.3)