fix Gun1 and beam tilt calls

Author: azazellochg

pytemscript/modules/gun.py

@@ -15,29 +15,28 @@ class GunObj(SpecialObj):
     """ Wrapper around Gun COM object specifically for the Gun1 interface. """
     def __init__(self, com_object):
         super().__init__(com_object)
-        self.gun1 = None
-
-    def is_available(self) -> bool:
-        """ Gun1 inherits from the Gun interface of the std scripting. """
         import comtypes.gen.TEMScripting as Ts
         if hasattr(Ts, "Gun1"):
             self.gun1 = self.com_object.QueryInterface(Ts.Gun1)
-            return True
         else:
-            return False
+            self.gun1 = None
+
+    def is_available(self) -> bool:
+        """ Gun1 inherits from the Gun interface of the std scripting. """
+        return self.gun1 is not None
 
     def get_hv_offset(self) -> float:
-        if self.gun1 is None:
+        if not self.is_available():
             raise NotImplementedError(ERR_MSG_GUN1)
         return self.gun1.HighVoltageOffset
 
     def set_hv_offset(self, value: float) -> None:
-        if self.gun1 is None:
+        if not self.is_available():
             raise NotImplementedError(ERR_MSG_GUN1)
         self.gun1.HighVoltageOffset = value
 
     def get_hv_offset_range(self) -> Tuple:
-        if self.gun1 is None:
+        if not self.is_available():
             raise NotImplementedError(ERR_MSG_GUN1)
         result = self.gun1.GetHighVoltageOffsetRange()
         return result[0], result[1]

pytemscript/modules/illumination.py

@@ -263,17 +263,20 @@ def beam_tilt(self) -> Union[Vector, float]:
         depends on a calibration of the tilt angles. (read/write)
         """
         dfmode = RequestBody(attr=self.__id + ".DFMode", validator=int)
-        dftilt = RequestBody(attr=self.__id + ".Tilt")
+        dftiltx = RequestBody(attr=self.__id + ".Tilt.X", validator=float)
+        dftilty = RequestBody(attr=self.__id + ".Tilt.Y", validator=float)
 
         mode = self.__client.call(method="get", body=dfmode)
-        tilt = self.__client.call(method="get", body=dftilt)
+        tiltx = self.__client.call(method="get", body=dftiltx) # rad
+        tilty = self.__client.call(method="get", body=dftilty) # rad
 
         if mode == DarkFieldMode.CONICAL:
-            tilt *= 1e3
-            return Vector(tilt.x * math.cos(tilt.y), tilt.x * math.sin(tilt.y))
+            tilt = tiltx
+            rot = tilty
+            return Vector(tilt * math.cos(rot), tilt * math.sin(rot)) * 1e3
         elif mode == DarkFieldMode.CARTESIAN:
-            return tilt * 1e3
-        else:
+            return Vector(tiltx, tilty) * 1e3
+        else:  # DF is off
             return Vector(0.0, 0.0)  # Microscope might return nonsense if DFMode is OFF
 
     @beam_tilt.setter
@@ -284,7 +287,7 @@ def beam_tilt(self, tilt: Union[Vector, float]) -> None:
         if isinstance(tilt, float):
             tilt = Vector(tilt, tilt)
 
-        tilt *= 1e-3
+        tilt *= 1e-3 # mrad to rad
 
         if tilt == (0.0, 0.0):
             body = RequestBody(attr=self.__id + ".Tilt", value=tilt)
@@ -299,13 +302,9 @@ def beam_tilt(self, tilt: Union[Vector, float]) -> None:
             body = RequestBody(attr=self.__id + ".Tilt", value=value)
             self.__client.call(method="set", body=body)
 
-        elif mode == DarkFieldMode.OFF:
-            body = RequestBody(attr=self.__id + ".DFMode", value=DarkFieldMode.CARTESIAN)
-            self.__client.call(method="set", body=body)
-
-            body = RequestBody(attr=self.__id + ".Tilt", value=tilt.x)
+        elif mode == DarkFieldMode.CARTESIAN:
+            body = RequestBody(attr=self.__id + ".Tilt", value=tilt)
             self.__client.call(method="set", body=body)
 
         else:
-            body = RequestBody(attr=self.__id + ".Tilt", value=tilt.x)
-            self.__client.call(method="set", body=body)
+            raise ValueError("Dark field mode is OFF. You cannot set beam tilt.")

tests/test_acquisition.py

@@ -139,7 +139,7 @@ def main(argv: Optional[List] = None) -> None:
         "BM-Falcon": {"exp_time": 3.0, "binning": 1, "align_image": True,
                       "electron_counting": True, "save_frames": True, "group_frames": 2},
         "EF-Falcon": {"exp_time": 1.0, "binning": 1,
-                      "electron_counting": True, "save_frames": True},
+                      "electron_counting": True, "save_frames": True, "group_frames": 2},
     }
 
     for cam, cam_dict in cameras.items():

tests/test_calgetter.py

@@ -20,9 +20,10 @@ def main():
 
     cameras = [
         "BM-Orius",
-        "BM-Falcon"
+        "BM-Falcon",
+        "EF-Falcon"
     ]
-    kv = 200
+    kv = 300
 
     #camera = cg.get_reference_camera()
     for camera in cameras:

tests/test_speed.py

@@ -19,7 +19,7 @@ def main() -> None:
     print("Starting acquisition speed test")
     cameras = microscope.acquisition.cameras
 
-    for camera in ["BM-Ceta", "BM-Falcon", "EF-CCD"]:
+    for camera in ["BM-Ceta", "BM-Falcon", "EF-Falcon", "EF-CCD"]:
         if camera in cameras:
 
             print("\tUsing SafeArray")