diff --git a/tomcat_bec/devices/pco_edge/pcoedgecamera.py b/tomcat_bec/devices/pco_edge/pcoedgecamera.py index b80faaa..aad85f7 100644 --- a/tomcat_bec/devices/pco_edge/pcoedgecamera.py +++ b/tomcat_bec/devices/pco_edge/pcoedgecamera.py @@ -70,12 +70,13 @@ class PcoEdge5M(PSIDeviceBase, PcoEdgeBase): analysis_signal = Cpt(Signal, name="analysis_signal", kind=Kind.hinted, doc="Analysis Signal") analysis_signal2 = Cpt(Signal, name="analysis_signal2", kind=Kind.hinted, doc="Analysis Signal") - preview = Cpt(PreviewSignal, ndim=2, name="preview", doc="Camera raw data preview signal") + preview = Cpt(PreviewSignal, ndim=2, name="preview", doc="Camera raw data preview signal", num_rotation_90=1, transpose=False) preview_corrected = Cpt( PreviewSignal, ndim=2, name="preview_corrected", doc="Camera preview signal with flat and dark correction", + num_rotation_90=1, transpose=False ) progress = Cpt( ProgressSignal, 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 714c5ea..5368d24 100644 --- a/tomcat_bec/devices/std_daq/std_daq_live_processing.py +++ b/tomcat_bec/devices/std_daq/std_daq_live_processing.py @@ -126,7 +126,7 @@ class StdDaqLiveProcessing: corrected_data = np.divide( data - dark, flat_corr, out=np.zeros_like(data, dtype=np.float32), where=flat_corr != 0 ) - return corrected_data + return np.clip(corrected_data, a_min=0, a_max=None) @typechecked def _load_and_update_reference( diff --git a/tomcat_bec/scans/simple_scans.py b/tomcat_bec/scans/simple_scans.py index 432278f..8419ee6 100644 --- a/tomcat_bec/scans/simple_scans.py +++ b/tomcat_bec/scans/simple_scans.py @@ -262,11 +262,11 @@ class AcquireReferences(ScanBase): yield from self.components.scan_report_instructions() def pre_scan(self): - yield from self.components.acquire_references(self.num_darks, self.num_flats, self.exp_time, restart=True, restore=False) + yield from self.components.acquire_references(self.num_darks, self.num_flats, self.exp_time) def scan_core(self): - pass - + yield None + class TomoScan(LineScan): scan_name = "tomo_line_scan"