focus 2024-12

llrfctrl6/templates/llrfctrl-DoocsVariableConfig.xml

@@ -365,8 +365,12 @@
       <property name="OUT_SATURATION.EARLY.I" source="/Controller/Status/feedForwardSaturationI"/>
       <property name="OUT_SATURATION.EARLY.Q" source="/Controller/Status/feedForwardSaturationQ"/>
 
-      <property name="OUT_SATURATION.GAIN.I" source="/Controller/Status/gainSaturationI"/>
-      <property name="OUT_SATURATION.GAIN.Q" source="/Controller/Status/gainSaturationQ"/>
+      % if ( not isSincav and FW_VER_CTRL < version.parse("1.8.0") ) or ( isSincav and FW_VER_CTRL < version.parse("1.7.0") ) :
+        <property name="OUT_SATURATION.GAIN.I" source="/Controller/Status/gainSaturationI"/>
+        <property name="OUT_SATURATION.GAIN.Q" source="/Controller/Status/gainSaturationQ"/>
+      % else :
+        <property name="OUT_SATURATION.OVC" source="/Controller/Status/ovcSaturation"/>
+      % endif
 
       <property name="OUT_SATURATION.LATE.I" source="/Controller/Status/offsetCompensationSaturationI"/>
       <property name="OUT_SATURATION.LATE.Q" source="/Controller/Status/offsetCompensationSaturationQ"/>
@@ -1180,41 +1184,14 @@
         <property name="OUT_SATURATION.EARLY.I" source="/Controller/Status/feedForwardSaturationI"/>
         <property name="OUT_SATURATION.EARLY.Q" source="/Controller/Status/feedForwardSaturationQ"/>
 
-        <property name="OUT_SATURATION.GAIN.I" source="/Controller/Status/gainSaturationI"/>
-        <property name="OUT_SATURATION.GAIN.Q" source="/Controller/Status/gainSaturationQ"/>
+        % if ( not isSincav and FW_VER_CTRL < version.parse("1.8.0") ) or ( isSincav and FW_VER_CTRL < version.parse("1.7.0") ) :
+          <property name="OUT_SATURATION.GAIN.I" source="/Controller/Status/gainSaturationI"/>
+          <property name="OUT_SATURATION.GAIN.Q" source="/Controller/Status/gainSaturationQ"/>
+        % endif
 
         <property name="OUT_SATURATION.LATE.I" source="/Controller/Status/offsetCompensationSaturationI"/>
         <property name="OUT_SATURATION.LATE.Q" source="/Controller/Status/offsetCompensationSaturationQ"/>
 
-        % if INSTANCE_TYPE != InstanceType.sincav :
-          <property name="CTRL_STATUS.masterFeedbackLinkNotOK" source="/Controller/Status/masterFeedbackLinkNotOK"/>
-          <property name="CTRL_STATUS.synchronisationNotOK" source="/Controller/Status/synchronisationNotOK"/>
-          <property name="CTRL_STATUS.limitersModule1Probe" source="/Controller/Status/limitersModule1Probe"/>
-          <property name="CTRL_STATUS.limitersModule2Probe" source="/Controller/Status/limitersModule2Probe"/>
-          <property name="CTRL_STATUS.limitersModule1Forward" source="/Controller/Status/limitersModule1Forward"/>
-          <property name="CTRL_STATUS.limitersModule2Forward" source="/Controller/Status/limitersModule2Forward"/>
-          <property name="CTRL_STATUS.triggerLimitersModule1Probe" source="/Controller/Status/triggerLimitersModule1Probe"/>
-          <property name="CTRL_STATUS.triggerLimitersModule2Probe" source="/Controller/Status/triggerLimitersModule2Probe"/>
-          <property name="CTRL_STATUS.triggerLimitersModule1Forward" source="/Controller/Status/triggerLimitersModule1Forward"/>
-          <property name="CTRL_STATUS.triggerLimitersModule2Forward" source="/Controller/Status/triggerLimitersModule2Forward"/>
-          <property name="CTRL_STATUS.slaveFeedbackLinkNotOK" source="/Controller/Status/slaveFeedbackLinkNotOK"/>
-          <property name="CTRL_STATUS.limitersModule3Probe" source="/Controller/Status/limitersModule3Probe"/>
-          <property name="CTRL_STATUS.limitersModule4Probe" source="/Controller/Status/limitersModule4Probe"/>
-          <property name="CTRL_STATUS.limitersModule3Forward" source="/Controller/Status/limitersModule3Forward"/>
-          <property name="CTRL_STATUS.limitersModule4Forward" source="/Controller/Status/limitersModule4Forward"/>
-          <property name="CTRL_STATUS.triggerLimitersModule3Probe" source="/Controller/Status/triggerLimitersModule3Probe"/>
-          <property name="CTRL_STATUS.triggerLimitersModule4Probe" source="/Controller/Status/triggerLimitersModule4Probe"/>
-          <property name="CTRL_STATUS.triggerLimitersModule3Forward" source="/Controller/Status/triggerLimitersModule3Forward"/>
-          <property name="CTRL_STATUS.triggerLimitersModule4Forward" source="/Controller/Status/triggerLimitersModule4Forward"/>
-          <property name="CTRL_STATUS.backplaneInterlockActive" source="/Controller/Status/backplaneInterlockActive"/>
-        % else : # INSTANCE_TYPE == InstanceType.sincav  ==>
-          <property name="CTRL_STATUS.limiters" source="/Controller/Status/limiters"/>
-          <property name="CTRL_STATUS.prelimiters" source="/Controller/Status/prelimiters"/>
-          <property name="CTRL_STATUS.fastProtectionActive" source="/Controller/Status/fastProtectionActive"/>
-          <property name="CTRL_STATUS.interlockLatcher" source="/Controller/Status/interlockLatcher"/>
-          <property name="CTRL_STATUS.externalInterlock" source="/Controller/Status/externalInterlock"/>
-        % endif
-
         <property name="CTRL_STATUS" source="/Controller/Status/overall"/>
 
         <property name="ACTUAL_PULSE_LENGTH.SAMPLES" source="/Controller/Status/ActualPulseLength/samples">
@@ -2359,24 +2336,20 @@
           <property name="VREFL.TRIGGER_LIMITS.ACTIVE" source="/AdcBoard${IDX_REFL_CM[M]}/Status/WORD_AMP_LIMIT_TRG_ACTIVE"/>
         </location>
 
-        <location name="ANOMALY_DETECTION.M${M}.${STATION_LOCATION_SUFFIX}">
-          % for c in range(0,8) :
-            <D_spectrum name="C${c+1}.GLR" source="/Controller/AnomalyDetection/CryoModule${(M-1)%2}/DAQ/Cavity${c}/GLR">
-              <incrementSource>/Configuration/samplingTime</incrementSource>
-              <publish_ZMQ>true</publish_ZMQ>
-              <data_matching>exact</data_matching>
-              <numberOfBuffers>16</numberOfBuffers>
-            </D_spectrum>
-            <D_spectrum name="C${c+1}.RESIDUAL" source="/Controller/AnomalyDetection/CryoModule${(M-1)%2}/DAQ/Cavity${c}/Residual">
-              <incrementSource>/Configuration/samplingTime</incrementSource>
-              <publish_ZMQ>true</publish_ZMQ>
-              <data_matching>exact</data_matching>
-              <numberOfBuffers>16</numberOfBuffers>
-            </D_spectrum>
-          % endfor
-
-          <import>/Controller/AnomalyDetection/CryoModule${(M-1)%2}</import>
-        </location>
+        % if not isSincav and FW_VER_CTRL >= version.parse("1.8.0") :
+          <location name="ANOMALY_DETECTION.M${M}.${STATION_LOCATION_SUFFIX}">
+            % for c in range(0,8) :
+              <D_spectrum name="C${c+1}.GLR" source="/Controller/AnomalyDetection/CryoModule${(M-1)%2}/Cavity${c}/DAQ/GLR">
+                <incrementSource>/Configuration/samplingTime</incrementSource>
+                <publish_ZMQ>true</publish_ZMQ>
+                <data_matching>exact</data_matching>
+                <numberOfBuffers>16</numberOfBuffers>
+              </D_spectrum>
+            % endfor
+
+            <import>/Controller/AnomalyDetection/CryoModule${(M-1)%2}</import>
+          </location>
+        % endif
 
       % endfor