From b63ce6892f70e8e74c389c03e32c4d1ce395ef62 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Thu, 15 Jan 2026 15:36:45 +0100 Subject: [PATCH] Remove fluorescence code --- src/aare/daq/daq.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index a5c76498..462abcb7 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1261,27 +1261,11 @@ class AareDAQ: if fm.transmission is not None: self.__devs.transmission = fm.transmission - self.__devs.fluorimeter.start_acquisition(erase=fm.erase) - self.__devs.shutter = True - time.sleep(fm.acq_time_s) - self.__devs.shutter = False - self.__devs.fluorimeter.stop_acquisition() - time.sleep(0.2) - spectrum = self.__devs.fluorimeter.get_current_data() - - offset = self.__devs.fluorimeter.offset - slope = self.__devs.fluorimeter.slope # slope is in keV! - energy = [slope * 1000.0 * i + offset for i in range(len(spectrum))] - fluo_output = FluorescenceSpectrumOutputModel(spectrum=spectrum, - bkg=self.__devs.fluorimeter.get_current_background(), - energy_eV=energy, - average_dead_time=self.__devs.fluorimeter.average_dead_time() / 100.0) - if self.sample is not None: - self.__cfg.xrf = fluo_output + # TODO: Fill self.__set_state(BeamlineStateEnum.SampleAlignment) self.__cfg.state_busy = False - return fluo_output + return None except Exception as e: self.__set_state(BeamlineStateEnum.SampleAlignment) self.__cfg.state_busy = False