From 82d3c0c490bbb02fdd8b4e5c1191576d0715dfbf Mon Sep 17 00:00:00 2001 From: Leonardo Sala Date: Fri, 15 Sep 2017 12:01:58 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 1 + script/test/CompareTimestampIocAndPc.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/devices.properties b/config/devices.properties index 3a86bff..0e92d2d 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -13,6 +13,7 @@ m_bm2try=ch.psi.pshell.epics.Motor|X12SA-OP-BM2:TRY1|||true m_bm3trx=ch.psi.pshell.epics.Motor|X12SA-OP-BM3:TRX1|||true m_bm3try=ch.psi.pshell.epics.Motor|X12SA-OP-BM3:TRY1|||true bpm1a=ch.psi.pshell.epics.ChannelDouble|X12SA-OP-BPM1:Current1:MeanValue_RBV -1 true|Read||true +bpm1a_sig=ch.psi.pshell.epics.ChannelDouble|X12SA-OP-BPM1:Current1:Sigma_RBV -1 true|Read||true bpm1b=ch.psi.pshell.epics.ChannelDouble|X12SA-OP-BPM1:Current2:MeanValue_RBV -1 true|Read||true bmp1c=ch.psi.pshell.epics.ChannelDouble|X12SA-OP-BPM1:Current3:MeanValue_RBV -1 true|Read||true bpm1d=ch.psi.pshell.epics.ChannelDouble|X12SA-OP-BPM1:Current4:MeanValue_RBV -1 true|Read||true diff --git a/script/test/CompareTimestampIocAndPc.py b/script/test/CompareTimestampIocAndPc.py index 989b341..eaadd6b 100644 --- a/script/test/CompareTimestampIocAndPc.py +++ b/script/test/CompareTimestampIocAndPc.py @@ -8,7 +8,7 @@ def after(rec, scan): if rec.index==0: create_dataset(path, 's') create_dataset(pathpc, 's') - time_str = str(datetime.datetime.fromtimestamp(cache.nanos/1e9)) + time_str = str(datetime.datetime.fromtimestamp(cache.timestampNanos/1e9)) append_dataset(path, time_str , type = 's') time_str = str(datetime.datetime.fromtimestamp(time.time())) append_dataset(pathpc, time_str , type = 's')