Skip to content
Snippets Groups Projects

focus 2024-12

Merged focus 2024-12
mhier/focus-2024-12 into master
Merged Martin Christoph Hierholzer requested to merge mhier/focus-2024-12 into master
Viewing commit ef166f01
Prev Next
Show latest version
1 file
+ 21
− 7
Compare changes
  • Side-by-side
  • Inline
llrfctrl6/templates/llrfctrl-DoocsVariableConfig.xml
+ 21
− 7
@@ -1557,7 +1557,9 @@
</location>
<location name="MAIN.${MAIN_LOCATION_SUFFIX}">
<property name="QL" source="/Configuration/QLoaded"/>
<property name="QL" source="/Configuration/QLoaded">
<publish_ZMQ>true</publish_ZMQ>
</property>
<property name="QL_SP_FUDGE" source="/Configuration/QLoadedFudge"/>
<property name="PHASEMODULATION.SEL" source="/Controller/PhaseModulation/FeedForward/functionSelect"/>
@@ -1971,8 +1973,12 @@
</property>
<property name="PROBE.PHASE.SAMPLE" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/Samples/phase" type="float"/>
<property name="PROBE.CAL_SCA" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/Calibration/scale" type="float"/>
<property name="PROBE.CAL_ROT" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/Calibration/angle" type="float"/>
<property name="PROBE.CAL_SCA" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/Calibration/scale" type="float">
<publish_ZMQ>true</publish_ZMQ>
</property>
<property name="PROBE.CAL_ROT" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/Calibration/angle" type="float">
<publish_ZMQ>true</publish_ZMQ>
</property>
<property name="PROBE.AMPL.LIMITER" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/limiter"/>
<property name="PROBE.AMPL.PRE_LIMITER" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/prelimiter"/>
<property name="PROBE.LIMIT.ENA" source="/AdcBoard${IDX_PROB_CM[M]}/Channel${C}/limiterEnable"/>
@@ -2012,8 +2018,12 @@
<property name="PFORW.PEAK" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/peakPowerFlattop" type="float"/>
<property name="PFORW.PEAK.FILL" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/peakPowerFilling" type="float"/>
<property name="VFORW.CAL_SCA" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/Calibration/scale" type="float"/>
<property name="VFORW.CAL_ROT" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/Calibration/angle" type="float"/>
<property name="VFORW.CAL_SCA" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/Calibration/scale" type="float">
<publish_ZMQ>true</publish_ZMQ>
</property>
<property name="VFORW.CAL_ROT" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/Calibration/angle" type="float">
<publish_ZMQ>true</publish_ZMQ>
</property>
<property name="VFORW.AMPL.LIMITER" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/limiter"/>
<property name="VFORW.AMPL.PRE_LIMITER" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/prelimiter"/>
<property name="VFORW.LIMIT.ENA" source="/AdcBoard${IDX_FORW_CM[M]}/Channel${C}/limiterEnable"/>
@@ -2058,8 +2068,12 @@
<property name="PREFL.PEAK" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/peakPowerFlattop" type="float"/>
<property name="PREFL.PEAK.FILL" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/peakPowerFilling" type="float"/>
<property name="VREFL.CAL_SCA" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/Calibration/scale" type="float"/>
<property name="VREFL.CAL_ROT" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/Calibration/angle" type="float"/>
<property name="VREFL.CAL_SCA" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/Calibration/scale" type="float">
<publish_ZMQ>true</publish_ZMQ>
</property>
<property name="VREFL.CAL_ROT" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/Calibration/angle" type="float">
<publish_ZMQ>true</publish_ZMQ>
</property>
<property name="VREFL.AMPL.LIMITER" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/limiter"/>
<property name="VREFL.AMPL.PRE_LIMITER" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/prelimiter"/>
<property name="VREFL.LIMIT.ENA" source="/AdcBoard${IDX_REFL_CM[M]}/Channel${C}/limiterEnable"/>

imprint | privacy | Conditions of Use