diff --git a/deeptrack/optics.py b/deeptrack/optics.py index 5149bdae2..2b3f2b8ac 100644 --- a/deeptrack/optics.py +++ b/deeptrack/optics.py @@ -207,8 +207,11 @@ class Microscope(StructuralFeature): __distributed__ = False + _sample: Feature + _objective: Feature + def __init__( - self: Microscope, + self: Microscope, sample: Feature, objective: Feature, **kwargs: Any, @@ -237,8 +240,9 @@ def __init__( super().__init__(**kwargs) self._sample = self.add_feature(sample) + # self._sample.store_properties() #TODO ***??*** eliminated the need to store properties - check that this doesn't create problems down the line + self._objective = self.add_feature(objective) - self._sample.store_properties() def get( self: Microscope, @@ -289,7 +293,8 @@ def get( with u.context( create_context( - *additional_sample_kwargs["voxel_size"], *_upscale_given_by_optics + *additional_sample_kwargs["voxel_size"], + *_upscale_given_by_optics, ) ):