diff --git a/src/SluDelayCalculator.py b/src/SluDelayCalculator.py
index a8571f30b3521e2511cf4c758fbf325a1d5eeeaa..00014cff6a9dafdc4fef442ad4dbdabf548a1805 100644
--- a/src/SluDelayCalculator.py
+++ b/src/SluDelayCalculator.py
@@ -28,8 +28,8 @@ devprodic['fastdelayscanlaunch'] = PyTango.DeviceProxy('seq/opt/delay_fel') ##
devprodic['fastdelayscan_fel2'] = PyTango.DeviceProxy('opt/fel02/fine_delay_sl.01') ##
devprodic['fastdelayscan_fel1'] = PyTango.DeviceProxy('opt/fel01/fine_delay_sl.01') ##
# imposto subito velocita` 100 per salvare tempo procedura
-devprodic["trls8"].write_attribute("Speed", [-100])
-devprodic["trls4"].write_attribute("Speed", [100])
+devprodic["trls8"].write_attribute("Speed", -100)
+devprodic["trls4"].write_attribute("Speed", 100)
zero_Slu = 0
zero_Fel1 = 0
@@ -376,7 +376,7 @@ class MainWindow(QDialog):
self.contaloop = 0
self.abilitazioscope6 = 0
try:
- self.zero_trls4 = devprodic["trls4"].Position[0]
+ self.zero_trls4 = devprodic["trls4"].Position
self.trls4_iniziale.setText(str(round(self.zero_trls4, 3)))
except:
self.funzionamento.setText('!! FAULT !!')
@@ -384,7 +384,7 @@ class MainWindow(QDialog):
voce = time.ctime()[11:19] + ' Error reading ' + str(devprodic["trls4"]) + ' Position. check with atomic panel and launch this program again'
self.logbox.insertItem(0, voce)
try:
- self.zero_trls8 = devprodic["trls8"].Position[0]
+ self.zero_trls8 = devprodic["trls8"].Position
self.trls8_iniziale.setText(str(round(self.zero_trls8, 3)))
except:
self.funzionamento.setText('!! FAULT !!')
@@ -496,7 +496,7 @@ class MainWindow(QDialog):
try:
tmp = devprodic["trls4"].read_attributes(['State', 'Position'])
self.read_values_trls4_state = str(tmp[0].value)
- self.read_values_trls4_position = tmp[1].value[0]
+ self.read_values_trls4_position = tmp[1].value
except:
self.funzionamento.setText('!! FAULT !!')
self.funzionamento.setStyleSheet("background-color: rgb(255, 0, 0)")
@@ -505,7 +505,7 @@ class MainWindow(QDialog):
try:
tmp = devprodic["trls8"].read_attributes(['State', 'Position'])
self.read_values_trls8_state = str(tmp[0].value)
- self.read_values_trls8_position = tmp[1].value[0]
+ self.read_values_trls8_position = tmp[1].value
except:
self.funzionamento.setText('!! FAULT !!')
self.funzionamento.setStyleSheet("background-color: rgb(255, 0, 0)")
@@ -742,8 +742,8 @@ class MainWindow(QDialog):
def closeEvent(self, event):
- devprodic["trls8"].write_attribute("Speed", [-1])
- devprodic["trls4"].write_attribute("Speed", [1])
+ devprodic["trls8"].write_attribute("Speed", -1)
+ devprodic["trls4"].write_attribute("Speed", 1)
self.timer.stop()
ret = QMessageBox.warning(None, 'Trigger reference file', 'Do not forget to save the new trigger reference file!')
@@ -1054,7 +1054,7 @@ class MainWindow(QDialog):
def disastro_solotrls4(self):
try:
- self.trls4_old = devprodic["trls4"].Position[0]
+ self.trls4_old = devprodic["trls4"].Position
procedi = True
except:
self.funzionamento.setText('!! FAULT !!')
@@ -1065,9 +1065,9 @@ class MainWindow(QDialog):
if procedi:
self.comandifalliti = 0
try:
- devprodic["trls4"].write_attribute("Position", [float(self.trls4calc*1000)])
+ devprodic["trls4"].write_attribute("Position", float(self.trls4calc*1000))
except:
- voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls4"]) + ' while write_attribute("Position", [' + str(self.trls4calc*1000) + '])'
+ voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls4"]) + ' while write_attribute("Position", ' + str(self.trls4calc*1000) + ')'
self.logbox.insertItem(0, voce)
self.comandifalliti = 1
if self.comandifalliti < 1:
@@ -1075,13 +1075,13 @@ class MainWindow(QDialog):
self.trls4_storna.show()
def doppiodisastro_solotrls4(self):
- devprodic["trls4"].write_attribute("Position", [self.trls4_old])
+ devprodic["trls4"].write_attribute("Position", self.trls4_old)
self.trls4_applica.show()
self.trls4_storna.hide()
def disastro_solotrls8(self):
try:
- self.trls8_old = devprodic["trls8"].Position[0]
+ self.trls8_old = devprodic["trls8"].Position
procedi = True
except:
self.funzionamento.setText('!! FAULT !!')
@@ -1092,9 +1092,9 @@ class MainWindow(QDialog):
if procedi:
self.comandifalliti = 0
try:
- devprodic["trls8"].write_attribute("Position", [float(self.trls8calc*1000)])
+ devprodic["trls8"].write_attribute("Position", float(self.trls8calc*1000))
except:
- voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls8"]) + ' while write_attribute("Position", [' + str(self.trls8calc*1000) + '])'
+ voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls8"]) + ' while write_attribute("Position", ' + str(self.trls8calc*1000) + ')'
self.logbox.insertItem(0, voce)
self.comandifalliti = 1
if self.comandifalliti < 1:
@@ -1102,7 +1102,7 @@ class MainWindow(QDialog):
self.trls8_storna.show()
def doppiodisastro_solotrls8(self):
- devprodic["trls8"].write_attribute("Position", [self.trls8_old])
+ devprodic["trls8"].write_attribute("Position", self.trls8_old)
self.trls8_applica.show()
self.trls8_storna.hide()
@@ -1316,7 +1316,7 @@ class MainWindow(QDialog):
self.comandifalliti = 0
###salvo vecchi valori###
try:
- self.trls4_old = devprodic["trls4"].Position[0]
+ self.trls4_old = devprodic["trls4"].Position
except:
self.funzionamento.setText('!! FAULT !!')
self.funzionamento.setStyleSheet("background-color: rgb(255, 0, 0)")
@@ -1324,7 +1324,7 @@ class MainWindow(QDialog):
self.logbox.insertItem(0, voce)
procedi = False
try:
- self.trls8_old = devprodic["trls8"].Position[0]
+ self.trls8_old = devprodic["trls8"].Position
except:
self.funzionamento.setText('!! FAULT !!')
self.funzionamento.setStyleSheet("background-color: rgb(255, 0, 0)")
@@ -1470,30 +1470,30 @@ class MainWindow(QDialog):
time.sleep(0.2)
print("trls4" + ' ' + "Position" + ' ' + str(self.trls4calc*1000))
esciciclo = 0
- while devprodic["trls4"].Speed[0] < 99 or esciciclo < 10:
+ while devprodic["trls4"].Speed < 99 or esciciclo < 10:
esciciclo += 1
time.sleep(2)
voce = time.ctime()[11:19] + ' waiting trls4... '
self.logbox.insertItem(0, voce)
try:
- devprodic["trls4"].write_attribute("Position", [float(self.trls4calc*1000)])
+ devprodic["trls4"].write_attribute("Position", float(self.trls4calc*1000))
print("trls4 " + str(float(self.trls4calc*1000)))
except:
- voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls4"]) + ' while write_attribute("Position", [' + str(self.trls4calc*1000) + '])'
+ voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls4"]) + ' while write_attribute("Position", ' + str(self.trls4calc*1000) + ')'
self.logbox.insertItem(0, voce)
self.comandifalliti = 1
print("trls8" + ' ' + "Position" + ' ' + str(self.trls8calc*1000))
esciciclo = 0
- while devprodic["trls8"].Speed[0] > -99 or esciciclo < 10:
+ while devprodic["trls8"].Speed > -99 or esciciclo < 10:
esciciclo += 1
time.sleep(2)
voce = time.ctime()[11:19] + ' waiting trls8... '
self.logbox.insertItem(0, voce)
try:
- devprodic["trls8"].write_attribute("Position", [float(self.trls8calc*1000)])
+ devprodic["trls8"].write_attribute("Position", float(self.trls8calc*1000))
print("trls8 " + str(self.trls8calc*1000))
except:
- voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls8"]) + ' while write_attribute("Position", [' + str(self.trls8calc*1000) + '])'
+ voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls8"]) + ' while write_attribute("Position", ' + str(self.trls8calc*1000) + ')'
self.logbox.insertItem(0, voce)
self.comandifalliti = 1
print("done")
@@ -1587,14 +1587,14 @@ class MainWindow(QDialog):
self.comandifalliti = 1
time.sleep(0.1)
try:
- devprodic["trls4"].write_attribute("Position", [self.trls4_old])
+ devprodic["trls4"].write_attribute("Position", self.trls4_old)
print("trls4 " + str(self.trls4_old))
except:
voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls4"]) + ' while write_attribute("Position", ' + str([self.trls4_old]) + ')'
self.logbox.insertItem(0, voce)
self.comandifalliti = 1
try:
- devprodic["trls8"].write_attribute("Position", [self.trls8_old])
+ devprodic["trls8"].write_attribute("Position", self.trls8_old)
print("trls8 " + str(self.trls8_old))
except:
voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls8"]) + ' while write_attribute("Position", ' + str([self.trls8_old]) + ')'
@@ -1693,17 +1693,17 @@ class MainWindow(QDialog):
self.comandifalliti = 1
time.sleep(0.1)
try:
- devprodic["trls4"].write_attribute("Position", [self.zero_trls4])
+ devprodic["trls4"].write_attribute("Position", self.zero_trls4)
print("trls4 " + str(self.zero_trls4))
except:
- voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls4"]) + ' while write_attribute("Position", ' + str([self.zero_trls4]) + ')'
+ voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls4"]) + ' while write_attribute("Position", ' + str(self.zero_trls4) + ')'
self.logbox.insertItem(0, voce)
self.comandifalliti = 1
try:
- devprodic["trls8"].write_attribute("Position", [self.zero_trls8])
+ devprodic["trls8"].write_attribute("Position", self.zero_trls8)
print("trls8 " + str(self.zero_trls8))
except:
- voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls8"]) + ' while write_attribute("Position", ' + str([self.zero_trls8]) + ')'
+ voce = time.ctime()[11:19] + ' Error with ' + str(devprodic["trls8"]) + ' while write_attribute("Position", ' + str(self.zero_trls8) + ')'
self.logbox.insertItem(0, voce)
self.comandifalliti = 1
print("done")