pshell_config/x12sa
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
sala
2017-09-15 12:01:58 +02:00
parent 487b1e9dbc
commit 82d3c0c490
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/devices.properties
View File

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

2
script/test/CompareTimestampIocAndPc.py
View File

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