Skip to content

Commit 8baeeee

Browse files
committed
remove printouts and fix tests
1 parent 57408da commit 8baeeee

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/navigate/model/features/common_features.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,9 +1062,10 @@ def pre_signal_func(self):
10621062
# restore f_pos, positions
10631063
self.model.active_microscope.central_focus = None
10641064
self.model.active_microscope.current_channel = 0
1065+
for microscope_name in self.model.virtual_microscopes:
1066+
self.model.virtual_microscopes[microscope_name].current_channel = 0
10651067
# prepare next channel
10661068
self.prepare_next_channel.signal_func()
1067-
# self.model.active_microscope.prepare_next_channel()
10681069

10691070
self.model.logger.debug(
10701071
f"*** ZStack pre_signal_func: {self.positions}, {self.start_focus}, "
@@ -1281,7 +1282,6 @@ def update_channel(self):
12811282
) % self.channels
12821283
# not update DAQ tasks if there is a NI Galvo stage
12831284
self.prepare_next_channel.signal_func()
1284-
self.model.active_microscope.prepare_next_channel()
12851285
if self.defocus is not None:
12861286
self.current_focus_position += self.defocus[self.current_channel_in_list]
12871287

src/navigate/model/model.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,6 @@ def launch_virtual_microscope(self, microscope_name, microscope_config):
12911291
microscope_name
12921292
]["img_x_pixels"]
12931293

1294-
print("*** microscope:", microscope_name, " data buffer size:", img_height, img_width)
12951294

12961295
# create databuffer
12971296
data_buffer = [

test/model/features/test_common_features.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class TestZStack:
4040
@pytest.fixture(autouse=True)
4141
def _prepare_test(self, dummy_model_to_test_features):
4242
self.model = dummy_model_to_test_features
43+
self.model.virtual_microscopes = {}
4344
self.config = self.model.configuration["experiment"]["MicroscopeState"]
4445
self.record_num = 0
4546
self.feature_list = [[{"name": ZStackAcquisition}]]

0 commit comments

Comments
 (0)