diff --git a/daq/src/aaredaq/devices.py b/daq/src/aaredaq/devices.py index a2c31331..a2672273 100644 --- a/daq/src/aaredaq/devices.py +++ b/daq/src/aaredaq/devices.py @@ -270,4 +270,4 @@ class BeamlineDevices: def flux(self) -> float: # Very approximate value - to be changed # 2 nA -> 4e11 ph/s - return self.__bpm.value / 2.0 * 4e11 \ No newline at end of file + return self.transmission.get() * self.__bpm.value / 2.0 * 4e11 \ No newline at end of file diff --git a/gui/src/aaregui/widgets/status_bar.py b/gui/src/aaregui/widgets/status_bar.py index a2155751..8776b9b6 100644 --- a/gui/src/aaregui/widgets/status_bar.py +++ b/gui/src/aaregui/widgets/status_bar.py @@ -21,6 +21,7 @@ class StatusBar(QStatusBar): super().__init__(parent) self.__decoded_token = token + self.flux = ValueLabel("Flux", "x 109 ph/s", self) self.transmission = ValueLabel("Transmission", "", self) self.ring_current = ValueLabel("Ring current", "mA", self) self.wvl = ValueLabel("Wavelength", "Å", self) @@ -40,6 +41,7 @@ class StatusBar(QStatusBar): self.shutter_label = ClickableLabel(parent=self) self.shutter_label.clicked.connect(self.show_shutter_menu) + self.addPermanentWidget(self.flux) self.addPermanentWidget(self.transmission) self.addPermanentWidget(self.ring_current) self.addPermanentWidget(self.wvl) @@ -53,6 +55,11 @@ class StatusBar(QStatusBar): @Slot(DAQStatusModel) def update_daq_status(self, status: DAQStatusModel): + if status.bl.flux_ph_s is None: + self.flux.set_value(f"0") + else: + self.flux.set_value(f"{(status.bl.flux_ph_s / 1e9):.0f}") + if status.bl.transmission is None: self.transmission.set_value(f"(moving)") else: