From d8ea33cc85c9d56b8b217678213f5ff9a5c290f6 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 8 Feb 2018 17:54:35 +0100 Subject: [PATCH] Closedown --- script/local.py | 5 +++++ script/test/ManipulatorScanKei.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/script/local.py b/script/local.py index f22b69fa..57c466fa 100644 --- a/script/local.py +++ b/script/local.py @@ -114,6 +114,9 @@ def trig_keithleys(): KeiSample.trig() KeiReference.trig() +def wait_keithleys(): + time.sleep(KeiSample.get_dwell()) + def fetch_keithleys(): """ read the keithleys into EPICS. @@ -344,6 +347,8 @@ def before_readout(): trig_keithleys() if sample_scienta: trig_scienta() + else: + wait_keithleys() fetch_keithleys() def after_readout(rec): diff --git a/script/test/ManipulatorScanKei.py b/script/test/ManipulatorScanKei.py index b5679e8a..63e6f3f9 100644 --- a/script/test/ManipulatorScanKei.py +++ b/script/test/ManipulatorScanKei.py @@ -10,7 +10,7 @@ RELATIVE (BOOLEAN) """ MOTOR = (ManipulatorY) -SENSORS = (SampleCurrent, RefCurrent) +SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent) RANGE = (-0.5, 0.5) STEPS = 10 LATENCY = 0.5