From 079142af30d156864e71e4ad2f8764f1b37ba14f Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Thu, 4 Aug 2016 09:11:17 +0200 Subject: [PATCH] LLRF basic policy PT2H for waveforms, in llrf_measurement.policies now for SINEG01 + S10CB01 P2W --- policies/llrf.policies | 97 ++++++--- policies/llrf_measurements.policies | 325 ++++++++++++++++++++++++++++ 2 files changed, 392 insertions(+), 30 deletions(-) create mode 100644 policies/llrf_measurements.policies diff --git a/policies/llrf.policies b/policies/llrf.policies index 1d56c69..96a6705 100644 --- a/policies/llrf.policies +++ b/policies/llrf.policies @@ -1,5 +1,5 @@ -/* LLRF configuration for data policy */ -/* ================================== */ +/* LLRF basic configuration for data policy */ +/* ======================================== */ /* IMPORTANT Workflow notice */ /* After merge request was generated, make an ELOG entry to the LLRF logbook at */ @@ -7,7 +7,7 @@ /* Section = All */ /* System = LLRF */ /* Subsystem = General */ -/* Subject = New Data Buffer TTL policy */ +/* Subject = New Data Buffer basic TTL policy */ /* Text = Describe what you have changed and place this link: */ /* https://git.psi.ch/sf_config/sf_daq_sources/commits/master/policies/llrf.policies */ @@ -34,7 +34,20 @@ /* ------------------------------------------------------------ */ - +/* +Examples for modulo settings: + "modulo":1 1 point every 10 ms (100 Hz) + "modulo":100 1 point every 1 second + "modulo":60000 1 point every 10 minutes + "modulo":3600000 1 point every 1 hour + +Examples for ttl settings: + PT1M 1 minute + PT2H 2 hours + P1D 1 day + P2W 2 weeks + P1M 1 month +*/ @@ -68,6 +81,12 @@ "modulo":60000 /* 1 point every 10 minutes */ } + , + { + "ttl":"P100Y", + "modulo":3600000 + /* 1 point every 1 hour */ + } ] } } @@ -135,6 +154,12 @@ "modulo":60000 /* 1 point every 10 minutes */ } + , + { + "ttl":"P100Y", + "modulo":3600000 + /* 1 point every 1 hour */ + } ] } } @@ -144,7 +169,7 @@ /* ------------------------------------------------------------ */ -/* default setting for waveforms (AMPLT / PHASE / DACI/Q */ +/* default setting for waveforms (AMPLT / PHASE / DAC I/Q */ { "pattern":"-RIQM-STA:DAC", "data_reduction":{ @@ -157,11 +182,19 @@ { "ttl":"P6M", "modulo":100 + /* 1 point every 1 second */ } , { "ttl":"P10Y", "modulo":60000 + /* 1 point every 10 minutes */ + } + , + { + "ttl":"P100Y", + "modulo":3600000 + /* 1 point every 1 hour */ } ] } @@ -172,7 +205,7 @@ "data_reduction":{ "waveform":[ { - "ttl":"P2W", + "ttl":"PT2H", "modulo":1 } , @@ -187,6 +220,12 @@ "modulo":60000 /* 1 point every 10 minutes */ } + , + { + "ttl":"P100Y", + "modulo":3600000 + /* 1 point every 1 hour */ + } ] } } @@ -196,7 +235,7 @@ "data_reduction":{ "waveform":[ { - "ttl":"P2W", + "ttl":"PT2H", "modulo":1 } , @@ -211,6 +250,12 @@ "modulo":60000 /* 1 point every 10 minutes */ } + , + { + "ttl":"P100Y", + "modulo":3600000 + /* 1 point every 1 hour */ + } ] } } @@ -228,29 +273,6 @@ } } , -/* override for klystron output amplitude waveform 1 week with 100 Hz */ -/*{ - "pattern":"RKLY-DCP10:FOR-AMPLT$", - "data_reduction":{ - "waveform":[ - { - "ttl":"P1W", - "modulo":1 - } - , - { - "ttl":"P6M", - "modulo":100 - } - , - { - "ttl":"P10Y", - "modulo":60000 - } - ] - } -} -,*/ /* ------------------------------------------------------------ */ @@ -276,6 +298,12 @@ "modulo":60000 /* 1 point every 10 minutes */ } + , + { + "ttl":"P100Y", + "modulo":3600000 + /* 1 point every 1 hour */ + } ] } } @@ -300,9 +328,18 @@ "modulo":60000 /* 1 point every 10 minutes */ } + , + { + "ttl":"P100Y", + "modulo":3600000 + /* 1 point every 1 hour */ + } ] } } + + + ] } diff --git a/policies/llrf_measurements.policies b/policies/llrf_measurements.policies new file mode 100644 index 0000000..847802e --- /dev/null +++ b/policies/llrf_measurements.policies @@ -0,0 +1,325 @@ +/* LLRF measurement configuration for data policy */ +/* ============================================== */ + +/* IMPORTANT Workflow notice */ +/* After merge request was generated, make an ELOG entry to the LLRF logbook at */ +/* https://elog-gfa.psi.ch/LLRF with */ +/* Section = All */ +/* System = LLRF */ +/* Subsystem = General */ +/* Subject = New Data Buffer measurements TTL policy */ +/* Text = Describe what you have changed and place this link: */ +/* https://git.psi.ch/sf_config/sf_daq_sources/commits/master/policies/llrf_measurements.policies */ + + +/* Explanation of bsread data config for LLRF: */ +/* 1. TMEM map Excel document column with bsread will generate a */ +/* # bsread_info header comment in the template channels_uplink_data_ch...template. */ +/* 2. script cfg/AutoStart.sh -> calls cfg/bsread_cfg_extract.sh */ +/* 3. results written to /var/volatile/llrf_bsread.cfg on the IOC ramdisk. */ +/* 4. llrf_rtapp parses this config file llrf_bsread.cfg on startup */ +/* 5. In case GUI the STREAMING-RECONFIG checkbox pressed, this file is reloaded by */ +/* the rtapp. So the way of manually adding new PV's would be to login to the IOC, */ +/* and then edit this file (e.g. with nano or vi), store it and reload it. */ + + + + +/* ------------------------------------------------------------ */ +/* - override settings - */ +/* - - */ +/* - Each default setting will be overridden, when a better - */ +/* - match (exacter match) is made. It is independant of the - */ +/* - sequence in this configuration file. - */ +/* ------------------------------------------------------------ */ + + +/* +Examples for modulo settings: + "modulo":1 1 point every 10 ms (100 Hz) + "modulo":100 1 point every 1 second + "modulo":60000 1 point every 10 minutes + "modulo":3600000 1 point every 1 hour + +Examples for ttl settings: + PT1M 1 minute + PT2H 2 hours + P1D 1 day + P2W 2 weeks + P1M 1 month +*/ + + + + +{ + "policies": [ + +/* ------------------------------------------------------------ */ +/* - place below the settings for the RF stations - */ +/* ------------------------------------------------------------ */ +/* - IMPORTANT: Typically you should only modify the modulo 1 - */ +/* - 100 Hz duration, not the others! - */ +/* ------------------------------------------------------------ */ + + +/* ------------------------------------------------------------------------- */ +/* example setting for waveforms of station SINEG01 (AMPLT / PHASE / DAC I/Q */ +/* +{ + "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 + } + ] + } +} +, +{ + "pattern":"SINEG01.*-AMPLT$", + "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 + } + ] + } +} +, +{ + "pattern":"SINEG01.*-PHASE$", + "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 + } + ] + } +} +*/ +/* end example setting */ +/* ------------------------------------------------------------------------- */ + + +/* --- SINEG01 --- */ +{ + "pattern":"SINEG01.*-RIQM-STA:DAC", + "data_reduction":{ + "waveform":[ + { + "ttl":"P2W", + "modulo":1 + } + , + { + "ttl":"P6M", + "modulo":100 + } + , + { + "ttl":"P10Y", + "modulo":60000 + } + , + { + "ttl":"P100Y", + "modulo":3600000 + } + ] + } +} +, +{ + "pattern":"SINEG01.*-AMPLT$", + "data_reduction":{ + "waveform":[ + { + "ttl":"P2W", + "modulo":1 + } + , + { + "ttl":"P6M", + "modulo":100 + } + , + { + "ttl":"P10Y", + "modulo":60000 + } + , + { + "ttl":"P100Y", + "modulo":3600000 + } + ] + } +} +, +{ + "pattern":"SINEG01.*-PHASE$", + "data_reduction":{ + "waveform":[ + { + "ttl":"P2W", + "modulo":1 + } + , + { + "ttl":"P6M", + "modulo":100 + } + , + { + "ttl":"P10Y", + "modulo":60000 + } + , + { + "ttl":"P100Y", + "modulo":3600000 + } + ] + } +} +, + + +/* --- SINEG01 --- */ +{ + "pattern":"S10CB01.*-RIQM-STA:DAC", + "data_reduction":{ + "waveform":[ + { + "ttl":"P2W", + "modulo":1 + } + , + { + "ttl":"P6M", + "modulo":100 + } + , + { + "ttl":"P10Y", + "modulo":60000 + } + , + { + "ttl":"P100Y", + "modulo":3600000 + } + ] + } +} +, +{ + "pattern":"S10CB01.*-AMPLT$", + "data_reduction":{ + "waveform":[ + { + "ttl":"P2W", + "modulo":1 + } + , + { + "ttl":"P6M", + "modulo":100 + } + , + { + "ttl":"P10Y", + "modulo":60000 + } + , + { + "ttl":"P100Y", + "modulo":3600000 + } + ] + } +} +, +{ + "pattern":"S10CB01.*-PHASE$", + "data_reduction":{ + "waveform":[ + { + "ttl":"P2W", + "modulo":1 + } + , + { + "ttl":"P6M", + "modulo":100 + } + , + { + "ttl":"P10Y", + "modulo":60000 + } + , + { + "ttl":"P100Y", + "modulo":3600000 + } + ] + } +} + + +/* --- */ + ] +} + +