Merge branch 'master' into 'master'

add LLRF OSFA Physiklabor test system in machine network - only short TTL - I will inform when the IOC is booted and ready

See merge request sf_config/sf_daq_sources!78
This commit is contained in:
maerki_f
2018-06-15 08:36:31 +02:00
2 changed files with 60 additions and 2 deletions

View File

@@ -295,8 +295,58 @@ Examples for ttl settings:
]
}
}
,
{
"pattern":"^SINEG01.*-RIQM-STA:DAC",
"data_reduction":{
"waveform":[
{
"ttl":"P2W", <==== typically you only should modify this setting, the 100 Hz duration time
"modulo":1
}
,
{
"ttl":"P6M",
"modulo":100
}
,
{
"ttl":"P10Y",
"modulo":60000
}
,
{
"ttl":"P100Y",
"modulo":3600000
}
]
}
}
/*lab system OSFA Physiklabor in machine network*/
,
{
"pattern":"^SINEGTS-.*",
"data_reduction":{
"waveform":[
{
"ttl":"P6H",
"modulo":1
}
]
}
}
,
{
"pattern":"^SINEGTS-.*",
"data_reduction":{
"scalar":[
{
"ttl":"P4D",
"modulo":1
}
]
}
}
]
}

View File

@@ -77,5 +77,13 @@
,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB14-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S30-CVME-LLRF:20000"}*/
/*lab system OSFA Physiklabor in machine network*/
,{"stream": "tcp://SINEGTS-CVME-LLRF1:20000"}
,{"stream": "tcp://SINEGTS-CVME-LLRF2:20000"}
/*,{"stream": "tcp://SINSBTS-CVME-LLRF1:20000"}
,{"stream": "tcp://SINSBTS-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CBTS-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CBTS-CVME-LLRF2:20000"}*/
]
}