clean up

Author: annie-xd-wang

src/navigate/model/devices/daq/daq_ni.py

@@ -232,6 +232,7 @@ def create_camera_task(self, channel_key):
             initial_delay=camera_delay,
         )
 
+        # apply waveform templates
         camera_waveform_repeat_num = self.waveform_repeat_num * self.waveform_expand_num
         self.camera_trigger_task.timing.cfg_implicit_timing(
             sample_mode=nidaqmx.constants.AcquisitionType.FINITE,

src/navigate/model/devices/galvo/galvo_base.py

@@ -183,7 +183,7 @@ def adjust(self, exposure_times, sweep_times):
                 elif self.galvo_waveform == "halfsaw":
                     new_wave = sawtooth(
                         sample_rate=self.sample_rate,
-                        sweep_time= self.sweep_time,
+                        sweep_time=self.sweep_time,
                         frequency=galvo_frequency,
                         amplitude=galvo_amplitude,
                         offset=galvo_offset,

src/navigate/model/devices/remote_focus/remote_focus_base.py

@@ -205,22 +205,11 @@ def adjust(self, exposure_times, sweep_times, offset=None):
                         sweep_time=self.sweep_time,
                         remote_focus_delay=remote_focus_delay,
                         camera_delay=self.camera_delay,
-                        fall=remote_focus_ramp_falling,
                         amplitude=remote_focus_amplitude,
                         offset=remote_focus_offset,
                     )
                     samples *= 2
 
-                    # print("Remote focus ramp triangular")
-                    # print('sample_rate=', self.sample_rate)
-                    # print('exposure_time=' , exposure_time)
-                    # print('sweep_time=', self.sweep_time)
-                    # print('remote_focus_delay=', self.remote_focus_delay)
-                    # print('camera_delay_percent=',  self.camera_delay_percent)
-                    # print('fall=', self.remote_focus_ramp_falling)
-                    # print('amplitude=', remote_focus_amplitude)
-                    # print('offset=', remote_focus_offset)
-
                 else:
                     self.waveform_dict[channel_key] = remote_focus_ramp(
                         sample_rate=self.sample_rate,

src/navigate/model/features/feature_container.py

@@ -1020,7 +1020,6 @@ def build_feature_tree(feature_list, continue_list, break_list):
     for node in break_list:
         if node[0] == "child":
             node[1].child, node[2].child = create_node({"name": DummyFeature})
-
     return SignalContainer(signal_root, signal_cleanup_list), DataContainer(
         data_root, data_cleanup_list
     )

src/navigate/model/microscope.py

@@ -406,9 +406,6 @@ def prepare_acquisition(self):
             "sensor_mode"
         ]
 
-        print('sensor_mode', sensor_mode)
-
-
         self.camera.set_sensor_mode(sensor_mode)
         if sensor_mode == "Light-Sheet":
             self.camera.set_readout_direction(
@@ -633,7 +630,6 @@ def prepare_next_channel(self, update_daq_task_flag=True):
             self.configuration["experiment"]["CameraParameters"]["sensor_mode"]
             == "Light-Sheet"
         ):
-
             (
                 self.current_exposure_time,
                 camera_line_interval,
@@ -663,8 +659,6 @@ def prepare_next_channel(self, update_daq_task_flag=True):
         # choose to not update the waveform is very useful when running ZStack
         # if there is a NI Galvo stage in the system.
         if update_daq_task_flag:
-
-
             self.daq.stop_acquisition()
             self.daq.prepare_acquisition(channel_key)