diff --git a/src/SlDecimators.py b/src/SlDecimators.py index 5464984a083fc6eae6710c26e6dc1802c284c863..9e366f7eef4632ec9e042a6469bc4a851a4875ef 100644 --- a/src/SlDecimators.py +++ b/src/SlDecimators.py @@ -355,6 +355,10 @@ class MainWindow(QTabWidget): self.paginadeci3_partipari.clicked.connect(self.accendi3_even) self.paginadeci3_partidispari = QPushButton('START odd') self.paginadeci3_partidispari.clicked.connect(self.accendi3_odd) + self.paginadeci3_partibn = QPushButton('START at bunchnumber') + self.paginadeci3_partibn.clicked.connect(self.accendi3_bn) + self.paginadeci3_updatebn_plus5s = QPushButton('Update bn + 5sec') + self.paginadeci3_updatebn_plus5s.clicked.connect(self.aggiorna3bn) self.paginadeci3_campo_Sequence_L = QLabel('Sequence: ') self.paginadeci3_campo_Sequence_R = LineEditRO() self.paginadeci3_campo_Sequence_W = QLineEdit() @@ -423,6 +427,8 @@ class MainWindow(QTabWidget): self.LOpaginadeci3.addWidget(self.paginadeci3_campo_BunchNumberStart_R, 21, 1, 1, 1) self.LOpaginadeci3.addWidget(self.paginadeci3_campo_BunchNumberStart_W, 21, 2, 1, 1) self.LOpaginadeci3.addWidget(self.paginadeci3_campo_BunchNumberStart_A, 21, 3, 1, 1) + self.LOpaginadeci3.addWidget(self.paginadeci3_updatebn_plus5s, 22, 0, 1, 2) + self.LOpaginadeci3.addWidget(self.paginadeci3_partibn, 22, 2, 1, 2) self.LOpaginadeci3.addWidget(self.paginadeci3_campo_InfiniteCycle_L, 32, 0, 1, 1) self.LOpaginadeci3.addWidget(self.paginadeci3_campo_InfiniteCycle_R, 32, 1, 1, 1) self.LOpaginadeci3.addWidget(self.paginadeci3_campo_InfiniteCycle_true, 32, 2, 1, 1) @@ -1045,6 +1051,16 @@ class MainWindow(QTabWidget): def accendi2_nobn(self): devicelist['2'].command_inout('Start', 0) + def aggiorna3bn(self): + if devicelist['frequenza'].BunchNumberFrequency > 49.0: + BunchNumberStart_new = devicelist['frequenza'].BunchNumber + 250 + else: + BunchNumberStart_new = devicelist['frequenza'].BunchNumber + 50 + devicelist['3'].write_attribute('BunchNumberStart', BunchNumberStart_new) + + def accendi3_bn(self): + devicelist['3'].command_inout('Start', 1) + def accendi3_odd(self): BunchNumberStart_new = devicelist['frequenza'].BunchNumber if BunchNumberStart_new % 2 > 0: