diff --git a/config/devices.properties b/config/devices.properties index db2e727..f82286c 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1 +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|||false diff --git a/script/crlogic.py b/script/crlogic.py index 25e9042..61c0e1e 100644 --- a/script/crlogic.py +++ b/script/crlogic.py @@ -5,13 +5,6 @@ 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())) diff --git a/script/local.py b/script/local.py index 392cbd7..7458a60 100644 --- a/script/local.py +++ b/script/local.py @@ -9,8 +9,8 @@ crlogic_config = {} crlogic_config["class"] = "ch.psi.pshell.crlogic.CrlogicScan" crlogic_config["prefix"] = "X10DA-ES1-CRL" crlogic_config["ioc"] = "X10DA-VME-ES1" -crlogic_config["integrationTime"] = 0.01 -crlogic_config["additionalBacklash"] = 0.0 +crlogic_config["integrationTime"] = 0.2 +crlogic_config["additionalBacklash"] = 0.01 crystal.setTrustedMonitor(True) \ No newline at end of file