diff --git a/sashimi/hardware/cameras/hamamatsu/interface.py b/sashimi/hardware/cameras/hamamatsu/interface.py index edcab219..0ddeff84 100644 --- a/sashimi/hardware/cameras/hamamatsu/interface.py +++ b/sashimi/hardware/cameras/hamamatsu/interface.py @@ -242,7 +242,6 @@ def get_property_value(self, property_name): def set_property_value(self, property_name, property_value, *args, **kwargs): # Check if the property exists. if not (property_name in self.properties): - raise CameraException(f"Unknown property name {property_name}") # If the value is text, figure out what the diff --git a/sashimi/hardware/cameras/hamamatsu/sdk.py b/sashimi/hardware/cameras/hamamatsu/sdk.py index ff973b10..699716eb 100644 --- a/sashimi/hardware/cameras/hamamatsu/sdk.py +++ b/sashimi/hardware/cameras/hamamatsu/sdk.py @@ -44,6 +44,7 @@ # Hamamatsu structures. + ## DCAMAPI_INIT # # The dcam initialization structure diff --git a/sashimi/hardware/scanning/scanloops.py b/sashimi/hardware/scanning/scanloops.py index 3b4c4bc0..e7f01c8e 100644 --- a/sashimi/hardware/scanning/scanloops.py +++ b/sashimi/hardware/scanning/scanloops.py @@ -111,7 +111,6 @@ def __init__( logger: ConcurrenceLogger, trigger_exp_from_scanner, ): - self.sample_rate = sample_rate self.n_samples = n_samples @@ -286,7 +285,8 @@ def initialize(self): def loop_condition(self): return ( - super().loop_condition() and self.parameters.state == ScanningState.TRIGGERED_PLANAR + super().loop_condition() + and self.parameters.state == ScanningState.TRIGGERED_PLANAR ) def n_samples_period(self): @@ -342,7 +342,9 @@ def fill_arrays(self): self.logger.log_message("Camera was off") # calculate how many samples are remaining until we are in a new period if self.i_sample == 0: - camera_pulses = self.camera_pulses.read(self.i_sample, self.n_samples) + camera_pulses = self.camera_pulses.read( + self.i_sample, self.n_samples + ) self.camera_was_off = False self.wait_signal.clear() else: diff --git a/sashimi/processes/camera.py b/sashimi/processes/camera.py index 809888a4..186fea29 100644 --- a/sashimi/processes/camera.py +++ b/sashimi/processes/camera.py @@ -178,7 +178,6 @@ def camera_loop(self): # if no frames are received (either this loop is in between frames # or we are in the waining period) if frames: - for frame in frames: self.logger.log_message( "received frame of shape " + str(frame.shape) diff --git a/sashimi/state.py b/sashimi/state.py index 363c8a0f..8f645037 100644 --- a/sashimi/state.py +++ b/sashimi/state.py @@ -228,7 +228,6 @@ def get_voxel_size( scanning_settings: Union[ZRecordingSettings, SinglePlaneSettings], camera_settings: CameraSettings, ): - binning = int(camera_settings.binning) if isinstance(scanning_settings, SinglePlaneSettings): @@ -668,7 +667,6 @@ def obtain_noise_average(self, n_images=50): self.dispatcher.calibration_ref_queue.put(self.calibration_ref) def reset_noise_subtraction(self): - self.calibration_ref = None self.noise_subtraction_active.clear()