Added Quench Condition 1 to booster

lnls-sirius · Nov 11, 2024 · f9bed20 · f9bed20
1 parent f25f271
commit f9bed20
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/pyqt-apps/siriushla/as_rf_control/advanced_details/adv_interlock.py b/pyqt-apps/siriushla/as_rf_control/advanced_details/adv_interlock.py
@@ -156,36 +156,34 @@ def _diagnosticsLayout(self, chs_dict):
         gbox_gen.setLayout(self._genDiagLayout(chs_dict['General']))
 
         # Quench Cond. 1
-        if self.section == 'SI':
-            gbox_quench = QGroupBox('Quench Cond. 1', self)
-            lay_quench = QGridLayout(gbox_quench)
-            lay_quench.setAlignment(Qt.AlignTop)
-            lay_quench.setSpacing(9)
-
-            rv_ch = self.prefix+chs_dict['Quench1']['Rv']
-            dly_ch = self.prefix+chs_dict['Quench1']['Dly']
-            lb_dly = SiriusLabel(self, dly_ch+'-RB')
-            lb_dly.showUnits = True
-
-            lay_quench.addWidget(QLabel(
-                'Rv Ratio'), 0, 0, alignment=Qt.AlignRight | Qt.AlignVCenter)
-            lay_quench.addWidget(SiriusSpinbox(
-                self, rv_ch+'-SP'), 0, 1, alignment=Qt.AlignCenter)
-            lay_quench.addWidget(SiriusLabel(
-                self, self.prefix+rv_ch+'-RB'), 0, 2, alignment=Qt.AlignCenter)
-            lay_quench.addWidget(QLabel(
-                'Delay'), 1, 0, alignment=Qt.AlignRight | Qt.AlignVCenter)
-            lay_quench.addWidget(SiriusSpinbox(
-                self, dly_ch+'-SP'), 1, 1, alignment=Qt.AlignCenter)
-            lay_quench.addWidget(lb_dly, 1, 2, alignment=Qt.AlignCenter)
+        gbox_quench = QGroupBox('Quench Cond. 1', self)
+        lay_quench = QGridLayout(gbox_quench)
+        lay_quench.setAlignment(Qt.AlignTop)
+        lay_quench.setSpacing(9)
+
+        rv_ch = self.prefix+chs_dict['Quench1']['Rv']
+        dly_ch = self.prefix+chs_dict['Quench1']['Dly']
+        lb_dly = SiriusLabel(self, dly_ch+'-RB')
+        lb_dly.showUnits = True
+
+        lay_quench.addWidget(QLabel(
+            'Rv Ratio'), 0, 0, alignment=Qt.AlignRight | Qt.AlignVCenter)
+        lay_quench.addWidget(SiriusSpinbox(
+            self, rv_ch+'-SP'), 0, 1, alignment=Qt.AlignCenter)
+        lay_quench.addWidget(SiriusLabel(
+            self, self.prefix+rv_ch+'-RB'), 0, 2, alignment=Qt.AlignCenter)
+        lay_quench.addWidget(QLabel(
+            'Delay'), 1, 0, alignment=Qt.AlignRight | Qt.AlignVCenter)
+        lay_quench.addWidget(SiriusSpinbox(
+            self, dly_ch+'-SP'), 1, 1, alignment=Qt.AlignCenter)
+        lay_quench.addWidget(lb_dly, 1, 2, alignment=Qt.AlignCenter)
 
         lay.addWidget(gbox_lvls, 0, 0)
         lay.addWidget(gbox_inp, 0, 1)
         lay.addWidget(gbox_intlk, 0, 2)
         lay.addWidget(gbox_out, 0, 3)
         lay.addWidget(gbox_gen, 1, 0, 1, 2)
-        if self.section == 'SI':
-            lay.addWidget(gbox_quench, 1, 2, 1, 2)
+        lay.addWidget(gbox_quench, 1, 2, 1, 2)
 
         return lay
 

diff --git a/pyqt-apps/siriushla/as_rf_control/util.py b/pyqt-apps/siriushla/as_rf_control/util.py
@@ -87,6 +87,7 @@
                         'Circulator Out Fwd (RF In 14)',
                         'Circulator Out Rev (RF In 15)',
                         'LLRF Beam Trip',
+                        'Quench Condition 1'
                     ),
                 }
             },
@@ -1250,6 +1251,10 @@
                     'Inp': 'RA-RaBO01:RF-LLRF:GPIOInp-Mon',
                     'Intlk': 'RA-RaBO01:RF-LLRF:GPIOIntlk-Mon',
                     'Out': 'RA-RaBO01:RF-LLRF:GPIOOut-Mon'
+                },
+                'Quench1': {
+                    'Rv': 'RA-RaBO01:RF-LLRF:QuenchCond1RvRatio',
+                    'Dly': 'RA-RaBO01:RF-LLRF:QuenchCond1Dly'
                 }
             },
             'Bypass': {
@@ -1267,6 +1272,7 @@
                 '817 1': ['End Switch Down 1', 'RA-RaBO01:RF-LLRF:FIMPLG1Down'],
                 '816 2': ['End Switch Up 2', 'RA-RaBO01:RF-LLRF:FIMPLG2Up'],
                 '817 2': ['End Switch Down 2', 'RA-RaBO01:RF-LLRF:FIMPLG2Down'],
+                '853': ['Quench Condition 1', 'RA-RaBO01:RF-LLRF:FIMQuenchCond1'],
                 '835': ['ILK VCav', 'RA-RaBO01:RF-LLRF:FIMCav'],
                 '836': ['ILK Fwd Cav', 'RA-RaBO01:RF-LLRF:FIMFwdCav'],
                 '837': ['ILK Fw SSA 1', 'RA-RaBO01:RF-LLRF:FIMFwdSSA1'],