From c0831210c801c7238d5417ecdaa3e2da35523a73 Mon Sep 17 00:00:00 2001 From: gac-x02da Date: Mon, 16 Jun 2025 21:21:40 +0200 Subject: [PATCH] wip --- .../devices/std_daq/std_daq_live_processing.py | 3 ++- tomcat_bec/scans/simple_scans.py | 12 ++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tomcat_bec/devices/std_daq/std_daq_live_processing.py b/tomcat_bec/devices/std_daq/std_daq_live_processing.py index 9f3f491..714c5ea 100644 --- a/tomcat_bec/devices/std_daq/std_daq_live_processing.py +++ b/tomcat_bec/devices/std_daq/std_daq_live_processing.py @@ -122,8 +122,9 @@ class StdDaqLiveProcessing: return corrected_data # Ensure that the division does not lead to division by zero + flat_corr = np.abs(flat-dark) corrected_data = np.divide( - data - dark, flat - dark, out=np.zeros_like(data), where=(flat - dark) != 0 + data - dark, flat_corr, out=np.zeros_like(data, dtype=np.float32), where=flat_corr != 0 ) return corrected_data diff --git a/tomcat_bec/scans/simple_scans.py b/tomcat_bec/scans/simple_scans.py index 243aa05..06a9358 100644 --- a/tomcat_bec/scans/simple_scans.py +++ b/tomcat_bec/scans/simple_scans.py @@ -102,12 +102,10 @@ class TomoComponents: self.connector.send_client_info(f"Acquiring {num_images} dark images.") yield from self.restart_cameras( - name=name, prefix=name, num_images=num_images, frames_per_trigger=1 + name=name, prefix=name, num_images=num_images, frames_per_trigger=num_images ) # yield from self.close_shutter() - for i in range(num_images): - logger.debug(f"Acquiring dark image {i+1}/{num_images}.") - yield from self.stubs.trigger(min_wait=exposure_time) + yield from self.stubs.trigger(min_wait=exposure_time) yield from self.complete() yield from self.update_live_processing_references(ref_type="dark") yield from self.restore_configs(name=name) @@ -130,12 +128,10 @@ class TomoComponents: self.connector.send_client_info(f"Acquiring {num_images} flat images.") yield from self.restart_cameras( - name=name, prefix=name, num_images=num_images, frames_per_trigger=1 + name=name, prefix=name, num_images=num_images, frames_per_trigger=num_images ) # yield from self.open_shutter() - for i in range(num_images): - logger.debug(f"Acquiring flat image {i+1}/{num_images}.") - yield from self.stubs.trigger(min_wait=exposure_time) + yield from self.stubs.trigger(min_wait=exposure_time) yield from self.complete() yield from self.update_live_processing_references(ref_type="flat") yield from self.restore_configs(name=name)