Skip to content

Commit d8e6bb4

Browse files
committed
fix merge conflict
1 parent 2d3f97e commit d8e6bb4

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

src/navigate/model/features/common_features.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,16 +1157,6 @@ def pre_signal_func(self) -> None:
11571157

11581158
self.axes_index = [self.position_headers.index(axis.upper()) for axis in self.stage_axes]
11591159

1160-
# Convert all elements to floats
1161-
self.positions = [
1162-
[float(val) for val in position] for position in self.positions
1163-
]
1164-
1165-
self.axes_index = [
1166-
self.position_headers.index(axis.upper())
1167-
for axis in ["x", "y", "z", "theta", "f"]
1168-
]
1169-
11701160
# Set up the next channel down here to ensure defocus isn't merged into
11711161
# restore f_pos, positions
11721162
self.model.active_microscope.central_focus = None

0 commit comments

Comments
 (0)