ticket #21779 BL 2.2 update

FRTND_E/active_frntd_e.py

@@ -33,10 +33,18 @@ class Worker(QtCore.QThread):
         self.nanoescastopper = 0
         self.nanoescashutterindex = 0
         self.nanoesca_stopper_value = -1  # 0: closed , 1:open, -1 : unknown
-        
+
         self.nanoescashutter = 0
         self.nanoescashutterindex = 0
         self.nanoesca_stopper_value = -1  # 0: closed , 1:open, -1 : unknown
+
+        self.superescastopper = 0
+        self.superescashutterindex = 0
+        self.superesca_stopper_value = -1  # 0: closed , 1:open, -1 : unknown
+
+        self.superescashutter = 0
+        self.superescashutterindex = 0
+        self.superesca_stopper_value = -1  # 0: closed , 1:open, -1 : unknown
         
         try:
             self.syrmepstopper = tango.DeviceProxy(
@@ -61,6 +69,23 @@ class Worker(QtCore.QThread):
         self.nanoescashutterindex = 0
         self.nanoesca_shutter_value = -1  # 0: closed , 1:open, -1 : unknown
         self.nanoescashutter=self.nanoescastopper # the tango device is the same of the stopper
+
+    # ---------------------------------------------------------------------------------------------------
+        # tango device for nanoesca - geco device
+        self.superescastopper = 0
+        self.superescastopperindex = 0
+        self.superesca_stopper_value = -1  # 0: closed , 1:open, -1 : unknown
+        try:
+            self.superescastopper = tango.DeviceProxy(
+                "bl024-control-01:20000/controls/interlock/geco")
+        except tango.DevFailed as e:
+            self.superescastopper = 0
+
+        self.superescashutter = 0
+        self.superescashutterindex = 0
+        self.superesca_shutter_value = -1  # 0: closed , 1:open, -1 : unknown
+        self.superscashutter = self.superescastopper  # the tango device is the same of the stopper
+    # ---------------------------------------------------------------------------------------------------
         
         # tango device for vuvphotemission - geco device
         self.vuvphotoemissionstopper = 0
@@ -103,6 +128,14 @@ class Worker(QtCore.QThread):
         except tango.DevFailed as e:
             self.nanoesca_stopper_value = -1
             self.nanoesca_shutter_value = -1
+
+        try:
+            self.superesca_stopper_value = self.nanoescastopper.read_attribute("STP_S02-04-F.01").value
+            self.superesca_shutter_value = self.nanoescashutter.read_attribute("SHT_S02-04-F.01").value
+        except tango.DevFailed as e:
+            self.superesca_stopper_value = -1
+            self.superesca_shutter_value = -1
+
         try:
             self.vuvphotemission_stopper_value = self.vuvphotoemissionstopper.read_attribute("STPFE_S03-04.01").value
             self.vuvphotemission_shutter_value = self.vuvphotemissionshutter.read_attribute("SHTFE_S03-04.01").value
@@ -132,7 +165,7 @@ class Worker(QtCore.QThread):
                 errtable,
             )
             
-        #close esca/superesca stopper
+        #close nanoesca stopper
         try:
             self.nanoescastopper.write_attribute("STFE_S01-04.01",0)
         except tango.DevFailed as e:
@@ -149,7 +182,7 @@ class Worker(QtCore.QThread):
                 self.BL,
                 errtable,
             )
-        #close esca/superesca stopper
+        #close nanoesca shutter
         try:
             self.nanoescashutter.write_attribute("SHFE_S01-04.01",0)
         except tango.DevFailed as e:
@@ -158,7 +191,38 @@ class Worker(QtCore.QThread):
                 self.BL,
                 "geco/SHFE_S01-04.01",
             )
-            
+
+
+    # ---------------------------------------------------------------
+        #close superesca stopper
+        try:
+            self.superescastopper.write_attribute("STP_S02-04-F.01",0)
+        except tango.DevFailed as e:
+            self.emit(
+                QtCore.SIGNAL("ExecuteError(PyQt_PyObject,PyQt_PyObject)"),
+                self.BL,
+                "geco/STP_S02-04.01",
+            )
+        if errtable is None:
+            self.emit(QtCore.SIGNAL("ExecuteThread(PyQt_PyObject)"), self.BL)
+        else:
+            self.emit(
+                QtCore.SIGNAL("ExecuteError(PyQt_PyObject,PyQt_PyObject)"),
+                self.BL,
+                errtable,
+            )
+        #close superesca shutter
+        try:
+            self.superescashutter.write_attribute("SHT_S02-04-F.01",0)
+        except tango.DevFailed as e:
+            self.emit(
+                QtCore.SIGNAL("ExecuteError(PyQt_PyObject,PyQt_PyObject)"),
+                self.BL,
+                "geco/SHFE_S02-04.01",
+            )
+
+    # ---------------------------------------------------------------
+
         #close vuvphotoemission/spectromicro stopper
         try:
             self.vuvphotoemissionstopper.write_attribute("STPFE_S03-04.01",0)
@@ -168,7 +232,7 @@ class Worker(QtCore.QThread):
                 self.BL,
                 "geco/STPFE_S03-04.01",
             )
-            
+
         #close vuvphotoemission/spectromicro shutter
         try:
             self.vuvphotoemissionshutter.write_attribute("SHTFE_S03-04.01",0)
@@ -178,7 +242,7 @@ class Worker(QtCore.QThread):
                 self.BL,
                 "geco/SHTFE_S03-04.01",
             )   
-        
+
         if errtable is None:
             self.emit(QtCore.SIGNAL("ExecuteThread(PyQt_PyObject)"), self.BL)
         else:
@@ -335,8 +399,39 @@ class active_frntd_e(Ui_frntd_e, QtCore.QObject):
         self.nanoescashutterindex = row
         
         row = row + 1
-        
-        
+        # ==========================================================
+
+
+        bname = "2.2 SuperESCA/ESCAmicro"
+        objname = "geco/STP_S02-04-F.01"
+        stname = "UNKNOWN"
+        col0 = QtGui.QTableWidgetItem(bname, 0)
+        col1 = QtGui.QTableWidgetItem(objname, 1)
+        col2 = QtGui.QTableWidgetItem(stname, 2)
+        col2.setBackground(self.graybrush)
+        self.tableWidget.setItem(row, 0, col0)
+        self.tableWidget.setItem(row, 1, col1)
+        self.tableWidget.setItem(row, 2, col2)
+        self.tableWidget.setRowHeight(row, 22)
+        self.thread.superescastopperindex = row
+        self.nsuperescastopperindex  = row
+
+        row = row + 1
+
+        bname = "2.2 SuperESCA/ESCAmicro"
+        objname = "geco/SHT_S02-04-F.01"
+        stname = "UNKNOWN"
+        col0 = QtGui.QTableWidgetItem(bname, 0)
+        col1 = QtGui.QTableWidgetItem(objname, 1)
+        col2 = QtGui.QTableWidgetItem(stname, 2)
+        col2.setBackground(self.graybrush)
+        self.tableWidget.setItem(row, 0, col0)
+        self.tableWidget.setItem(row, 1, col1)
+        self.tableWidget.setItem(row, 2, col2)
+        self.tableWidget.setRowHeight(row, 22)
+        self.thread.superescashutterindex = row
+        self.superescashutterindex = row
+        row = row + 1
         
         #----------------------------------------------------------
         palette = self.label.palette()