Closedown

This commit is contained in:
gac-x03da
2018-02-08 17:54:35 +01:00
parent 204d4e03a4
commit d8ea33cc85
2 changed files with 6 additions and 1 deletions

View File

@@ -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):

View File

@@ -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