|
@@ -92,7 +92,7 @@ class TimingPart(kcgw.KCGWidgets):
|
|
|
#instead directly through update_delay
|
|
|
self.coarseInputTh = self.createSpinbox(0, self.board_config.get('delay_330_max'), connect=self.linkFMCCoarseDelay)
|
|
|
|
|
|
- Elements.addItem(["timing_{}".format(self.board_id), "no_board_{}".format(self.board_id), "acquire_{}".format(self.board_id), "continuous_read_{}".format(board_id)],
|
|
|
+ Elements.addItem(["timing_{}".format(self.board_id), "no_board_{}".format(self.board_id), "acquire_{}".format(self.board_id)],
|
|
|
[
|
|
|
#self.coarseInputFpga,
|
|
|
#self.coarseInputAdc,
|
|
@@ -107,7 +107,7 @@ class TimingPart(kcgw.KCGWidgets):
|
|
|
self.coarse2Label.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
|
|
|
self.coarse2InputTh = self.createSpinbox(0, self.board_config.get('delay_25_max'), connect=lambda: update_delay("delay_25_th", "coarse2InputTh"))
|
|
|
|
|
|
- Elements.addItem(["timing_{}".format(self.board_id), "no_board_{}".format(self.board_id), "acquire_{}".format(self.board_id), "continuous_read_{}".format(board_id)],
|
|
|
+ Elements.addItem(["timing_{}".format(self.board_id), "no_board_{}".format(self.board_id), "acquire_{}".format(self.board_id)],
|
|
|
[
|
|
|
#self.coarse2InputAdc,
|
|
|
#self.coarse2InputFpga,
|
|
@@ -122,14 +122,15 @@ class TimingPart(kcgw.KCGWidgets):
|
|
|
self.coarseInputTh_2 = self.createSpinbox(0, self.board_config.get('delay_330_max'), connect=lambda: update_delay("delay_330_th_2", "coarseInputTh_2"))
|
|
|
self.coarse2InputTh_2 = self.createSpinbox(0, self.board_config.get('delay_25_max'), connect=lambda: update_delay("delay_25_th_2", "coarse2InputTh_2"))
|
|
|
|
|
|
- Elements.addItem(["timing_{}".format(self.board_id), "no_board_{}".format(self.board_id), "acquire_{}".format(self.board_id), "continuous_read_{}".format(board_id)],
|
|
|
+ Elements.addItem(["timing_{}".format(self.board_id), "no_board_{}".format(self.board_id), "acquire_{}".format(self.board_id)],
|
|
|
[
|
|
|
#self.coarseInputFpga,
|
|
|
#self.coarseInputAdc,
|
|
|
- self.coarseInputTh_2,
|
|
|
+ #self.coarseInputTh_2,
|
|
|
#self.coarse2InputAdc,
|
|
|
#self.coarse2InputFpga,
|
|
|
- self.coarse2InputTh_2
|
|
|
+ self.coarse2InputTh_2,
|
|
|
+ self.linkTHSwitch
|
|
|
]
|
|
|
)
|
|
|
|
|
@@ -158,9 +159,8 @@ class TimingPart(kcgw.KCGWidgets):
|
|
|
|
|
|
Elements.addItem(["timing_{}".format(self.board_id),
|
|
|
"no_board_{}".format(self.board_id),
|
|
|
- "acquire_{}".format(self.board_id),
|
|
|
- "continuous_read_{}".format(board_id)],
|
|
|
- self.fineAdcInput
|
|
|
+ "acquire_{}".format(self.board_id)
|
|
|
+ ], self.fineAdcInput
|
|
|
)
|
|
|
|
|
|
self.bunchShiftLabel = self.createLabel(tr("Label", "Bunch Shift"))
|
|
@@ -171,9 +171,8 @@ class TimingPart(kcgw.KCGWidgets):
|
|
|
|
|
|
Elements.addItem(["timing_{}".format(self.board_id),
|
|
|
"no_board_{}".format(self.board_id),
|
|
|
- "acquire_{}".format(self.board_id),
|
|
|
- "continuous_read_{}".format(board_id)],
|
|
|
- self.bunchShiftInput
|
|
|
+ "acquire_{}".format(self.board_id)
|
|
|
+ ], self.bunchShiftInput
|
|
|
)
|
|
|
|
|
|
|
|
@@ -503,10 +502,10 @@ class TimingPart(kcgw.KCGWidgets):
|
|
|
)
|
|
|
if self.adc_number > 4:
|
|
|
Elements.removeItem(None, [
|
|
|
- self.coarseInputTh_2,
|
|
|
+ #self.coarseInputTh_2,
|
|
|
#self.coarseInputAdc_2,
|
|
|
#self.coarseInputFpga_2,
|
|
|
-
|
|
|
+ self.linkTHSwitch,
|
|
|
self.coarse2InputTh_2,
|
|
|
#self.coarse2InputAdc_2,
|
|
|
#self.coarse2InputFpga_2
|