ddevice + yaml: updated yaml and cfg_get in devices.py

src/aare/daq/devices.py

@@ -42,8 +42,8 @@ class BeamlineDevices:
 
         #only used at the moment to get hlm and llm from BEC
         self.__dtz = self.bec_worker.dev.det_z
-        self.dtz_mod = cfg_get('daq.detector_limit_modifier', 1.0)
-
+        self.dtz_mod = cfg_get('daq.detector_distance_limit_modifier', 1.0)
+        #TODO convert epics pvs to BEC
         self.__sample_cam = epicsAD(f"{BEAMLINE}-ES-MS:")
 
         self.__front_light = PredefinedPV(name='front_light',
@@ -180,9 +180,7 @@ class BeamlineDevices:
 # Optics
     @property
     def energy_kev(self) -> float:
-        if self._beamline == MXBeamline.X06DA:
-            return 13.0
-        return 12.4
+        return self.bec_worker.check_current_energy()
 
     @property
     def ring_current(self) -> float:
@@ -191,11 +189,15 @@ class BeamlineDevices:
     @property
     def flux(self) -> float:
         #TODO FLUX
-        return 0
+        return self.transmission * self.full_flux
 
     @property
     def full_flux(self) -> float:
-        return 0
+        #TODO wire real flux - i0 needed
+        max_flux = cfg_get('daq.maximum_flux')
+        if max_flux is None:
+            return 0.0
+        return max_flux
 
 # Cryojet
     @property