AUTOMATION PARAMETERS: full_flux added to daq

daq/src/aaredaq/daq.py

@@ -1350,7 +1350,7 @@ class AareDAQ:
             light=self.light,
             cryojet_K=self.__devs.cryojet_temp,
             shutter_open=self.__devs.shutter,
-            flux_ph_s=self.__devs.flux,
+            flux_ph_s=self.__devs.full_flux,
             sample_camera=self.__devs.samcam_settings,
             name=self.__bl,
             transmission=self.__devs.transmission.get(),

daq/src/aaredaq/devices.py

@@ -327,7 +327,13 @@ class BeamlineDevices:
         # 2 nA -> 4e11 ph/s
         if self.transmission.get() is None:
             return 0.0
-        return self.transmission.get() * self.__bpm.value / 2.0 * 4e11
+        return self.transmission.get() * self.full_flux
+
+    @property
+    def full_flux(self) -> float:
+        # Very approximate value - to be changed
+        # 2 nA -> 4e11 ph/s
+        return self.__bpm.value / 2.0 * 4e11
 
     @property
     def dtz_low(self) -> float: