From eb4e885db66e2021339de0f443ee8d1bdd90da57 Mon Sep 17 00:00:00 2001 From: Binary-Vanguard-12138 <103393933+Binary-Vanguard-12138@users.noreply.github.com> Date: Thu, 11 Jul 2024 22:02:32 +0800 Subject: [PATCH] #86 Added setObjectiveLenseCoarse and setObjectiveLenseFine (#87) --- src/instamatic/TEMController/fei_simu_microscope.py | 6 ++++++ src/instamatic/TEMController/jeol_microscope.py | 6 ++++++ src/instamatic/TEMController/simu_microscope.py | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/src/instamatic/TEMController/fei_simu_microscope.py b/src/instamatic/TEMController/fei_simu_microscope.py index a4a9de02..41db8258 100644 --- a/src/instamatic/TEMController/fei_simu_microscope.py +++ b/src/instamatic/TEMController/fei_simu_microscope.py @@ -347,9 +347,15 @@ def getCondensorMiniLens(self): def getObjectiveLenseCoarse(self): return self.objectivelensecoarse_value + def setObjectiveLenseCoarse(self, value: int): + self.objectivelensecoarse_value = value + def getObjectiveLenseFine(self): return self.objectivelensefine_value + def setObjectiveLenseFine(self, value: int): + self.objectivelensefine_value = value + def getObjectiveMiniLens(self): return self.objectiveminilens_value diff --git a/src/instamatic/TEMController/jeol_microscope.py b/src/instamatic/TEMController/jeol_microscope.py index d7773bd5..49fbe4fc 100644 --- a/src/instamatic/TEMController/jeol_microscope.py +++ b/src/instamatic/TEMController/jeol_microscope.py @@ -522,11 +522,17 @@ def getObjectiveLenseCoarse(self) -> int: value, result = self.lens3.GetOLc() return value + def setObjectiveLenseCoarse(self, value: int): + self.lens3.SetOLc(value) + def getObjectiveLenseFine(self) -> int: # fine objective focus value, result = self.lens3.GetOLf() return value + def setObjectiveLenseFine(self, value: int): + self.lens3.SetOLf(value) + def getObjectiveMiniLens(self) -> int: # no setter value, result = self.lens3.GetOM() diff --git a/src/instamatic/TEMController/simu_microscope.py b/src/instamatic/TEMController/simu_microscope.py index e9cff040..6d7a4524 100644 --- a/src/instamatic/TEMController/simu_microscope.py +++ b/src/instamatic/TEMController/simu_microscope.py @@ -534,8 +534,14 @@ def getCondensorMiniLens(self) -> int: def getObjectiveLenseCoarse(self) -> int: return self.objectivelensecoarse_value + def setObjectiveLenseCoarse(self, value: int): + self.objectivelensecoarse_value = value + def getObjectiveLenseFine(self) -> int: return self.objectivelensefine_value + def setObjectiveLenseFine(self, value: int): + self.objectivelensefine_value = value + def getObjectiveMiniLens(self) -> int: return self.objectiveminilens_value