Public/fofbcontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to new Libera paths

Browse Source
This commit is contained in:
Grzegorz Kowalski 2022-09-26 19:56:54 +02:00
parent f46838ee77
commit 55d91d8551
5 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
config/solaris.json
View File

@ -1,25 +1,25 @@
{ {
"devices": { "devices": {
"01": "R1-01/DIA/R1-01-DIA-BPM1", "01": "R1-01/DIA/R1-01-DIA-GDX",
"02": "R1-02/DIA/R1-02-DIA-BPM1", "02": "R1-02/DIA/R1-02-DIA-GDX",
"03": "R1-03/DIA/R1-03-DIA-BPM1", "03": "R1-03/DIA/R1-03-DIA-GDX",
"04": "R1-04/DIA/R1-04-DIA-BPM1", "04": "R1-04/DIA/R1-04-DIA-GDX",
"05": "R1-05/DIA/R1-05-DIA-BPM1", "05": "R1-05/DIA/R1-05-DIA-GDX",
"06": "R1-06/DIA/R1-06-DIA-BPM1", "06": "R1-06/DIA/R1-06-DIA-GDX",
"07": "R1-07/DIA/R1-07-DIA-BPM1", "07": "R1-07/DIA/R1-07-DIA-GDX",
"08": "R1-08/DIA/R1-08-DIA-BPM1", "08": "R1-08/DIA/R1-08-DIA-GDX",
"09": "R1-09/DIA/R1-09-DIA-BPM1", "09": "R1-09/DIA/R1-09-DIA-GDX",
"10": "R1-10/DIA/R1-10-DIA-BPM1", "10": "R1-10/DIA/R1-10-DIA-GDX",
"11": "R1-11/DIA/R1-11-DIA-BPM1", "11": "R1-11/DIA/R1-11-DIA-GDX",
"12": "R1-12/DIA/R1-12-DIA-BPM1", "12": "R1-12/DIA/R1-12-DIA-GDX",
"TS": "testing/libera-brilliance/raf4",
"EVG": "R1-SGD/CTL/R1-SGDCAB10-CTL-EVG1" "EVG": "R1-SGD/CTL/R1-SGDCAB10-CTL-EVG1"
}, },
"units": { "units": {
}, },
"settings": { "settings": {
"x": "TS", "x": "01",
"y": "TS", "y": "07",
"global_orbit": "10", "global_orbit": "10",
"global_magnet": "10" "global_magnet": "10"
} }

44
grouping.py
View File

@ -29,7 +29,7 @@ class GroupingWindow(QtGui.QWidget):
self.connect(self, QtCore.SIGNAL("update"), libera.update) self.connect(self, QtCore.SIGNAL("update"), libera.update)
self.liberas[dev] = libera self.liberas[dev] = libera
self.list_layout.addWidget(libera) self.list_layout.addWidget(libera)
self.addAttribute(dev, "GdxGroupingTimeout") self.addAttribute(dev, "GroupingTimeout")
def addGlobal(self, orbit, magnet): def addGlobal(self, orbit, magnet):
print "[ INFO]: grouping: global: orbit %s; magnet %s" % (orbit, magnet) print "[ INFO]: grouping: global: orbit %s; magnet %s" % (orbit, magnet)
@ -42,7 +42,7 @@ class GroupingWindow(QtGui.QWidget):
self.timeouts = [] self.timeouts = []
for dev in self.liberas.keys(): for dev in self.liberas.keys():
self.timeouts.append(cache[dev]["GdxGroupingTimeout"]) self.timeouts.append(cache[dev]["GroupingTimeout"])
to_set = set(self.timeouts) to_set = set(self.timeouts)
common_to = max(to_set, key=self.timeouts.count) common_to = max(to_set, key=self.timeouts.count)
@ -62,7 +62,7 @@ class GroupingWindow(QtGui.QWidget):
def setTimeout(self): def setTimeout(self):
for dev in self.liberas.keys(): for dev in self.liberas.keys():
self.main_window.devices[dev].write_attribute("GdxGroupingTimeout", self.TimeoutSpinBox.value()) self.main_window.devices[dev].write_attribute("GroupingTimeout", self.TimeoutSpinBox.value())
class GroupingWidget(QtGui.QWidget): class GroupingWidget(QtGui.QWidget):
@ -77,22 +77,22 @@ class GroupingWidget(QtGui.QWidget):
self.device = device self.device = device
self.IDLabel.setText(device) self.IDLabel.setText(device)
self.SFP3StatusLabel.setModel(device, "GdxSFP3Status") self.SFP3StatusLabel.setModel(device, "SFP3Status")
self.SFP4StatusLabel.setModel(device, "GdxSFP4Status") self.SFP4StatusLabel.setModel(device, "SFP4Status")
self.SFP3LaneUpFlag.setModel(device, "GdxSFP3Status", 0) self.SFP3LaneUpFlag.setModel(device, "SFP3Status", 0)
self.SFP3ChannelUpFlag.setModel(device, "GdxSFP3Status", 1) self.SFP3ChannelUpFlag.setModel(device, "SFP3Status", 1)
self.SFP3IPLLFlag.setModel(device, "GdxSFP3Status", 2) self.SFP3IPLLFlag.setModel(device, "SFP3Status", 2)
self.SFP3EPLLFlag.setModel(device, "GdxSFP3Status", 3) self.SFP3EPLLFlag.setModel(device, "SFP3Status", 3)
self.SFP3SoftErrorFlag.setModel(device, "GdxSFP3Status", 4) self.SFP3SoftErrorFlag.setModel(device, "SFP3Status", 4)
self.SFP3HardErrorFlag.setModel(device, "GdxSFP3Status", 5) self.SFP3HardErrorFlag.setModel(device, "SFP3Status", 5)
self.SFP4LaneUpFlag.setModel(device, "GdxSFP4Status", 0) self.SFP4LaneUpFlag.setModel(device, "SFP4Status", 0)
self.SFP4ChannelUpFlag.setModel(device, "GdxSFP4Status", 1) self.SFP4ChannelUpFlag.setModel(device, "SFP4Status", 1)
self.SFP4IPLLFlag.setModel(device, "GdxSFP4Status", 2) self.SFP4IPLLFlag.setModel(device, "SFP4Status", 2)
self.SFP4EPLLFlag.setModel(device, "GdxSFP4Status", 3) self.SFP4EPLLFlag.setModel(device, "SFP4Status", 3)
self.SFP4SoftErrorFlag.setModel(device, "GdxSFP4Status", 4) self.SFP4SoftErrorFlag.setModel(device, "SFP4Status", 4)
self.SFP4HardErrorFlag.setModel(device, "GdxSFP4Status", 5) self.SFP4HardErrorFlag.setModel(device, "SFP4Status", 5)
self.SFP3SoftErrorFlag.setColorMap(cm.RED_BOOL) self.SFP3SoftErrorFlag.setColorMap(cm.RED_BOOL)
self.SFP3HardErrorFlag.setColorMap(cm.RED_BOOL) self.SFP3HardErrorFlag.setColorMap(cm.RED_BOOL)
@ -106,7 +106,7 @@ class GroupingWidget(QtGui.QWidget):
self.emit(QtCore.SIGNAL("update"), cache) self.emit(QtCore.SIGNAL("update"), cache)
def clearStatus(self, sfp): def clearStatus(self, sfp):
self.main_window.execute_ireg_command(self.device, "GdxSFP%dStatusClear" % sfp) self.main_window.execute_ireg_command(self.device, "SFP%dStatusClear" % sfp)
class GlobalWidget(QtGui.QWidget): class GlobalWidget(QtGui.QWidget):
@ -122,11 +122,11 @@ class GlobalWidget(QtGui.QWidget):
self.magnet = magnet self.magnet = magnet
self.GlobalOrbitIDLabel.setText(orbit) self.GlobalOrbitIDLabel.setText(orbit)
self.GlobalOrbitStateLabel.setModel(orbit, "GdxOrbitStatus") self.GlobalOrbitStateLabel.setModel(orbit, "OrbitStatus")
self.GlobalOrbitStateLabel.setColorMap(cm.GREEN_BOOL) self.GlobalOrbitStateLabel.setColorMap(cm.GREEN_BOOL)
self.GlobalMagnetIDLabel.setText(magnet) self.GlobalMagnetIDLabel.setText(magnet)
self.GlobalMagnetStateLabel.setModel(orbit, "GdxMagnetStatus") self.GlobalMagnetStateLabel.setModel(orbit, "MagnetStatus")
self.GlobalMagnetStateLabel.setColorMap(cm.GREEN_BOOL) self.GlobalMagnetStateLabel.setColorMap(cm.GREEN_BOOL)
self.connect(self.GlobalOrbitResetButton, QtCore.SIGNAL("clicked()"), self.resetGlobalOrbit) self.connect(self.GlobalOrbitResetButton, QtCore.SIGNAL("clicked()"), self.resetGlobalOrbit)
@ -136,7 +136,7 @@ class GlobalWidget(QtGui.QWidget):
self.emit(QtCore.SIGNAL("update"), cache) self.emit(QtCore.SIGNAL("update"), cache)
def resetGlobalOrbit(self): def resetGlobalOrbit(self):
self.main_window.execute_ireg_command(self.orbit, "GdxOrbitReconnect") self.main_window.execute_ireg_command(self.orbit, "OrbitReconnect")
def resetGlobalMagnet(self): def resetGlobalMagnet(self):
self.main_window.execute_ireg_command(self.magnet, "GdxMagnetReconnect") self.main_window.execute_ireg_command(self.magnet, "MagnetReconnect")

72
mainwindow.py
View File

@ -55,30 +55,30 @@ class MainWindow(QtGui.QWidget):
self.connect(self.SERButton, QtCore.SIGNAL("clicked()"), self.ser_output.show) self.connect(self.SERButton, QtCore.SIGNAL("clicked()"), self.ser_output.show)
self.connect(self.XInterlockResetButton, QtCore.SIGNAL("clicked()"), self.connect(self.XInterlockResetButton, QtCore.SIGNAL("clicked()"),
lambda: self.execute_ireg_command_on_axis("x", "GdxFOFBIlkReset") lambda: self.execute_ireg_command_on_axis("x", "FOFBIlkReset")
) )
self.connect(self.XReconnectButton, QtCore.SIGNAL("clicked()"), self.connect(self.XReconnectButton, QtCore.SIGNAL("clicked()"),
lambda: self.execute_ireg_command_on_axis("x", "GdxFOFBReconnect") lambda: self.execute_ireg_command_on_axis("x", "FOFBReconnect")
) )
self.connect(self.XResetPIButton, QtCore.SIGNAL("clicked()"), self.connect(self.XResetPIButton, QtCore.SIGNAL("clicked()"),
lambda: self.execute_ireg_command_on_axis("x", "GdxFOFBPIReset") lambda: self.execute_ireg_command_on_axis("x", "FOFBPIReset")
) )
self.connect(self.XSaturationResetButton, QtCore.SIGNAL("clicked()"), self.connect(self.XSaturationResetButton, QtCore.SIGNAL("clicked()"),
lambda: self.execute_ireg_command_on_axis("x", "GdxFOFBSaturationReset") lambda: self.execute_ireg_command_on_axis("x", "FOFBSaturationReset")
) )
# self.connect(self.YInterlockResetButton, QtCore.SIGNAL("clicked()"), self.connect(self.YInterlockResetButton, QtCore.SIGNAL("clicked()"),
# lambda: self.execute_ireg_command_on_axis("y", "GdxFOFBIlkReset") lambda: self.execute_ireg_command_on_axis("y", "FOFBIlkReset")
# ) )
# self.connect(self.YReconnectButton, QtCore.SIGNAL("clicked()"), self.connect(self.YReconnectButton, QtCore.SIGNAL("clicked()"),
# lambda: self.execute_ireg_command_on_axis("y", "GdxFOFBReconnect") lambda: self.execute_ireg_command_on_axis("y", "FOFBReconnect")
# ) )
# self.connect(self.YResetPIButton, QtCore.SIGNAL("clicked()"), self.connect(self.YResetPIButton, QtCore.SIGNAL("clicked()"),
# lambda: self.execute_ireg_command_on_axis("y", "GdxFOFBPIReset") lambda: self.execute_ireg_command_on_axis("y", "FOFBPIReset")
# ) )
# self.connect(self.YSaturationResetButton, QtCore.SIGNAL("clicked()"), self.connect(self.YSaturationResetButton, QtCore.SIGNAL("clicked()"),
# lambda: self.execute_ireg_command_on_axis("y", "GdxFOFBSaturationReset") lambda: self.execute_ireg_command_on_axis("y", "FOFBSaturationReset")
# ) )
self.update_timer = QtCore.QTimer() self.update_timer = QtCore.QTimer()
self.connect(self.update_timer, QtCore.SIGNAL("timeout()"), self.update) self.connect(self.update_timer, QtCore.SIGNAL("timeout()"), self.update)
@ -93,36 +93,36 @@ class MainWindow(QtGui.QWidget):
self.EVGStateLabel.setModel("EVG") self.EVGStateLabel.setModel("EVG")
self.XStateLabel.setModel(self.settings["x"]) self.XStateLabel.setModel(self.settings["x"])
self.XInterlockLabel.setModel(self.settings["x"], "GdxFOFBIlk") self.XInterlockLabel.setModel(self.settings["x"], "FOFBIlk")
self.XIDLabel.setText(self.settings["x"]) self.XIDLabel.setText(self.settings["x"])
self.XFOFBStateLabel.setModel(self.settings["x"], "GdxFOFBState") self.XFOFBStateLabel.setModel(self.settings["x"], "FOFBState")
self.XFOFBStateLabel.setColorMap(cm.FOFB_STATE) self.XFOFBStateLabel.setColorMap(cm.FOFB_STATE)
# self.XBuffersLabel.setModel() # self.XBuffersLabel.setModel()
self.XS1Label.setModel(self.settings["x"], "GdxFOFBSaturation", 0) self.XS1Label.setModel(self.settings["x"], "FOFBSaturation", 0)
self.XS1Label.setColorMap(cm.RED_BOOL) self.XS1Label.setColorMap(cm.RED_BOOL)
self.XS2Label.setModel(self.settings["x"], "GdxFOFBSaturation", 1) self.XS2Label.setModel(self.settings["x"], "FOFBSaturation", 1)
self.XS2Label.setColorMap(cm.RED_BOOL) self.XS2Label.setColorMap(cm.RED_BOOL)
self.XS3Label.setModel(self.settings["x"], "GdxFOFBSaturation", 2) self.XS3Label.setModel(self.settings["x"], "FOFBSaturation", 2)
self.XS3Label.setColorMap(cm.RED_BOOL) self.XS3Label.setColorMap(cm.RED_BOOL)
self.XS4Label.setModel(self.settings["x"], "GdxFOFBSaturation", 3) self.XS4Label.setModel(self.settings["x"], "FOFBSaturation", 3)
self.XS4Label.setColorMap(cm.RED_BOOL) self.XS4Label.setColorMap(cm.RED_BOOL)
# self.YStateLabel.setModel(self.settings["y"]) self.YStateLabel.setModel(self.settings["y"])
# self.YInterlockLabel.setModel(self.settings["y"], "GdxFOFBIlk") self.YInterlockLabel.setModel(self.settings["y"], "FOFBIlk")
# self.YIDLabel.setText(self.settings["y"]) self.YIDLabel.setText(self.settings["y"])
# self.YFOFBStateLabel.setModel(self.settings["y"], "GdxFOFBState") self.YFOFBStateLabel.setModel(self.settings["y"], "FOFBState")
# self.YFOFBStateLabel.setColorMap(cm.FOFB_STATE) self.YFOFBStateLabel.setColorMap(cm.FOFB_STATE)
# # self.XBuffersLabel.setModel() # self.YBuffersLabel.setModel()
# self.YS1Label.setModel(self.settings["y"], "GdxFOFBSaturation", 0) self.YS1Label.setModel(self.settings["y"], "FOFBSaturation", 0)
# self.YS1Label.setColorMap(cm.RED_BOOL) self.YS1Label.setColorMap(cm.RED_BOOL)
# self.YS2Label.setModel(self.settings["y"], "GdxFOFBSaturation", 1) self.YS2Label.setModel(self.settings["y"], "FOFBSaturation", 1)
# self.YS2Label.setColorMap(cm.RED_BOOL) self.YS2Label.setColorMap(cm.RED_BOOL)
# self.YS3Label.setModel(self.settings["y"], "GdxFOFBSaturation", 2) self.YS3Label.setModel(self.settings["y"], "FOFBSaturation", 2)
# self.YS3Label.setColorMap(cm.RED_BOOL) self.YS3Label.setColorMap(cm.RED_BOOL)
# self.YS4Label.setModel(self.settings["y"], "GdxFOFBSaturation", 3) self.YS4Label.setModel(self.settings["y"], "FOFBSaturation", 3)
# self.YS4Label.setColorMap(cm.RED_BOOL) self.YS4Label.setColorMap(cm.RED_BOOL)
def start(self, fn, config=None): def start(self, fn, config=None):
ThreadWrapper(self.load, args=(fn, config)).start() ThreadWrapper(self.load, args=(fn, config)).start()

42
seroutput.py
View File

@ -52,41 +52,41 @@ class SERWidget(QtGui.QWidget):
self.IDLabel.setText(device) self.IDLabel.setText(device)
self.M1IDLabel.setModel(device, "GdxSERM1Id") self.M1IDLabel.setModel(device, "SERM1Id")
self.M1OffLabel.setModel(device, "GdxSERM1Output") self.M1OffLabel.setModel(device, "SERM1Output")
self.M1OffLabel.setColorMap(cm.SER_OFF) self.M1OffLabel.setColorMap(cm.SER_OFF)
self.M1ManualLabel.setModel(device, "GdxSERM1Output") self.M1ManualLabel.setModel(device, "SERM1Output")
self.M1ManualLabel.setColorMap(cm.SER_MANUAL) self.M1ManualLabel.setColorMap(cm.SER_MANUAL)
self.M1FOFBLabel.setModel(device, "GdxSERM1Output") self.M1FOFBLabel.setModel(device, "SERM1Output")
self.M1FOFBLabel.setColorMap(cm.SER_FOFB) self.M1FOFBLabel.setColorMap(cm.SER_FOFB)
self.M1FOFBValueLabel.setModel(device, "GdxSERM1FOFB") self.M1FOFBValueLabel.setModel(device, "SERM1FOFB")
self.M2IDLabel.setModel(device, "GdxSERM2Id") self.M2IDLabel.setModel(device, "SERM2Id")
self.M2OffLabel.setModel(device, "GdxSERM2Output") self.M2OffLabel.setModel(device, "SERM2Output")
self.M2OffLabel.setColorMap(cm.SER_OFF) self.M2OffLabel.setColorMap(cm.SER_OFF)
self.M2ManualLabel.setModel(device, "GdxSERM2Output") self.M2ManualLabel.setModel(device, "SERM2Output")
self.M2ManualLabel.setColorMap(cm.SER_MANUAL) self.M2ManualLabel.setColorMap(cm.SER_MANUAL)
self.M2FOFBLabel.setModel(device, "GdxSERM2Output") self.M2FOFBLabel.setModel(device, "SERM2Output")
self.M2FOFBLabel.setColorMap(cm.SER_FOFB) self.M2FOFBLabel.setColorMap(cm.SER_FOFB)
self.M2FOFBValueLabel.setModel(device, "GdxSERM2FOFB") self.M2FOFBValueLabel.setModel(device, "SERM2FOFB")
self.M3IDLabel.setModel(device, "GdxSERM3Id") self.M3IDLabel.setModel(device, "SERM3Id")
self.M3OffLabel.setModel(device, "GdxSERM3Output") self.M3OffLabel.setModel(device, "SERM3Output")
self.M3OffLabel.setColorMap(cm.SER_OFF) self.M3OffLabel.setColorMap(cm.SER_OFF)
self.M3ManualLabel.setModel(device, "GdxSERM3Output") self.M3ManualLabel.setModel(device, "SERM3Output")
self.M3ManualLabel.setColorMap(cm.SER_MANUAL) self.M3ManualLabel.setColorMap(cm.SER_MANUAL)
self.M3FOFBLabel.setModel(device, "GdxSERM3Output") self.M3FOFBLabel.setModel(device, "SERM3Output")
self.M3FOFBLabel.setColorMap(cm.SER_FOFB) self.M3FOFBLabel.setColorMap(cm.SER_FOFB)
self.M3FOFBValueLabel.setModel(device, "GdxSERM3FOFB") self.M3FOFBValueLabel.setModel(device, "SERM3FOFB")
self.M4IDLabel.setModel(device, "GdxSERM4Id") self.M4IDLabel.setModel(device, "SERM4Id")
self.M4OffLabel.setModel(device, "GdxSERM4Output") self.M4OffLabel.setModel(device, "SERM4Output")
self.M4OffLabel.setColorMap(cm.SER_OFF) self.M4OffLabel.setColorMap(cm.SER_OFF)
self.M4ManualLabel.setModel(device, "GdxSERM4Output") self.M4ManualLabel.setModel(device, "SERM4Output")
self.M4ManualLabel.setColorMap(cm.SER_MANUAL) self.M4ManualLabel.setColorMap(cm.SER_MANUAL)
self.M4FOFBLabel.setModel(device, "GdxSERM4Output") self.M4FOFBLabel.setModel(device, "SERM4Output")
self.M4FOFBLabel.setColorMap(cm.SER_FOFB) self.M4FOFBLabel.setColorMap(cm.SER_FOFB)
self.M4FOFBValueLabel.setModel(device, "GdxSERM4FOFB") self.M4FOFBValueLabel.setModel(device, "SERM4FOFB")
self.connect(self.M1ManualSpinBox, QtCore.SIGNAL("editingFinished()"), self.setM1) self.connect(self.M1ManualSpinBox, QtCore.SIGNAL("editingFinished()"), self.setM1)
self.connect(self.M2ManualSpinBox, QtCore.SIGNAL("editingFinished()"), self.setM2) self.connect(self.M2ManualSpinBox, QtCore.SIGNAL("editingFinished()"), self.setM2)
@ -109,4 +109,4 @@ class SERWidget(QtGui.QWidget):
self.setMagnet(4, self.M4ManualSpinBox.value()) self.setMagnet(4, self.M4ManualSpinBox.value())
def setMagnet(self, mid, value): def setMagnet(self, mid, value):
self.main_window.devices[self.device].write_attribute("GdxSERM%dManual" % mid, value) self.main_window.devices[self.device].write_attribute("SERM%dManual" % mid, value)

2
ui/main.ui
View File

@ -1173,7 +1173,7 @@
<number>2</number> <number>2</number>
</property> </property>
<item row="3" column="2"> <item row="3" column="2">
<widget class="QPushButton" name="pushButton_14"> <widget class="QPushButton" name="YResetPIButton">
<property name="text"> <property name="text">
<string>Reset PI</string> <string>Reset PI</string>
</property> </property>