aggiornati contesti

src/SluSourceMonitor.py

@@ -34,6 +34,13 @@ try:
     sacco['trigger'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/ec-sl-slpsr-01/evr/ff100000')
     sacco['totem_delay'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/slu/motor/trls_slu.05')
     sacco['costanti'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/slu/misc/ranges')
+    sacco['emslr'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/energy_meter/ems_sl.03')
+    sacco['pump'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/laser/evops_sl.03')
+    sacco['slelitefbin'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/rtltf_osc.01')
+    sacco['slelitefbtime'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/fbdelay_sl.02')
+    sorgente = 2
+    sensoretemperatura = 'Pt100_CHLRREVO_01'
+    triggerdelays = 'Chan2Delay'
 except PyTango.DevFailed:
     print('error defining sacco DeviceProxys')
 
@@ -42,40 +49,6 @@ try:
 except PyTango.DevFailed:
     selettore = -1
 
-#parte seed
-if selettore == -1 or selettore == 0: #unknown, shutdown
-    sorgente = None
-    sacco['pump'] = None
-    sacco['emslr'] = None
-    sacco['slelitefbin'] = None
-    sacco['slelitefbout'] = None
-    sacco['slelitefbtime'] = None
-    linea = None
-elif selettore >= 7 and selettore <= 12: #ELITE1
-    sorgente = 1
-    sensoretemperatura = 'Pt100_CHLREVO30_01'
-    triggerdelays = 'Chan1Delay'
-    try:
-        sacco['emslr'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/energy_meter/ems_sl.01')
-        sacco['pump'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/laser/evops_sl.01')
-        sacco['slelitefbin'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/rtltf_osc.02')
-        sacco['slelitefbout'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/rtltf_elite.01')
-        sacco['slelitefbtime'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/fbdelay_sl.01')
-    except PyTango.DevFailed:
-        print('error defining sacco DeviceProxys, section selettore SOURCE')
-elif selettore >= 1 and selettore <= 6: #ELITE2
-    sorgente = 2
-    sensoretemperatura = 'Pt100_CHLRREVO_01'
-    triggerdelays = 'Chan2Delay'
-    try:
-        sacco['emslr'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/energy_meter/ems_sl.03')
-        sacco['pump'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/laser/evops_sl.03')
-        sacco['slelitefbin'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/rtltf_osc.01')
-        sacco['slelitefbout'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/rtltf_elite.02')
-        sacco['slelitefbtime'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/sl/feedback/fbdelay_sl.02')
-    except PyTango.DevFailed:
-        print('error defining sacco DeviceProxys, section selettore SOURCE')
-
 #parte bl
 try:
     sacco['totfeedback'] = PyTango.DeviceProxy('srv-tango-srf-01:20000/slu/feedback/mimofb_totem_slu.01')
@@ -97,19 +70,19 @@ try:
 except PyTango.DevFailed:
     print('error defining sacco DeviceProxys')
 
-if selettore == -1 or selettore == 0: #unknown, shutdown
+if selettore < 2: #unknown, shutdown
     linea = None
-elif selettore == 5 or selettore == 11: #TOTEM
+elif selettore == 2: #TOTEM
     linea = 'TOTEM'
-elif selettore == 1 or selettore == 7: #TIMER
+elif selettore == 3: #TIMER
     linea = 'TIMER'
-elif selettore == 2 or selettore == 8: #TIMEX
+elif selettore == 4: #TIMEX
     linea = 'TIMEX'
-elif selettore == 3 or selettore == 9: #DIPRI
+elif selettore == 5: #DIPRI
     linea = 'DIPROI'
-elif selettore == 4 or selettore == 10: #LDM
+elif selettore == 6: #LDM
     linea = 'LDM'
-elif selettore == 6 or selettore == 12: #MAGNEDYN
+elif selettore == 7: #MAGNEDYN
     linea = 'MAGNEDYN'
 
 
@@ -303,12 +276,12 @@ class MainWindow(QDialog):
         self.feedback0corrector.clicked.connect(self.apritiptilt0)
         self.feedback0monitor = QPushButton("CCD")
         self.feedback0monitor.clicked.connect(self.apriccd0)
-        if not(selettore >= 1 and selettore <= 6):
-            self.feedback0L.setDisabled(1)
-            self.feedback0x.setDisabled(1)
-            self.feedback0y.setDisabled(1)
-            self.feedback0corrector.setDisabled(1)
-            self.feedback0monitor.setDisabled(1)
+#        if not(selettore >= 1 and selettore <= 6):
+#            self.feedback0L.setDisabled(1)
+#            self.feedback0x.setDisabled(1)
+#            self.feedback0y.setDisabled(1)
+#            self.feedback0corrector.setDisabled(1)
+#            self.feedback0monitor.setDisabled(1)
         self.feedback1L = QLabel("SLR -> UH")
         self.feedback1L.setAlignment(Qt.AlignCenter)
         self.feedback1x = QProgressBar()