Merge pull request #304 from JoQCcoz/adding_tags

change serialeminterface
NIEHS · Aug 8, 2024 · 1ecabae · 1ecabae
2 parents 805a137 + 9cc2695
commit 1ecabae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Smartscope/core/interfaces/jeolserialem_interface.py b/Smartscope/core/interfaces/jeolserialem_interface.py
@@ -60,14 +60,13 @@ def setup(self, *args, **kwargs):
         super().setup(*args, **kwargs)
         self.apertures = self._apertures_setter()
         sem.SetLowDoseMode(1)
-        # sem.GoToLowDoseArea('R')
-        # self.record_mag = int(sem.ReportMag()[0])
         self.logger.info(f'LD highmag parameters found. Record mag: {self.record_mag}')
 
     def _apertures_setter(self):
         if not self.microscope.apertureControl:
             return None
         extra_apertures_property = int(self.get_property('JeolHasExtraApertures'))
+        self.debug(f'Extra apertures property: {extra_apertures_property}, {type(extra_apertures_property)}')
         if extra_apertures_property == 1:
             logging.info('Extra apertures detected')
             return JEOLExtraApertures

diff --git a/Smartscope/core/interfaces/serialem_interface.py b/Smartscope/core/interfaces/serialem_interface.py
@@ -403,7 +403,7 @@ def set_apertures_for_lowmag(self):
             return
         self.remove_aperture(self.apertures.OBJECTIVE)
         if self.atlas_settings.atlas_c2_aperture == 0:
-            self.remove_aperture(self.atlas_settings.atlas_c2_aperture)
+            self.remove_aperture(self.apertures.CONDENSER)
             return
         self.insert_aperture(self.apertures.CONDENSER, self.atlas_settings.atlas_c2_aperture)