Revert update to new import. Will show warnings

viljarjf · viljarjf · commit 3f68f1eb7b92 · 2024-11-07T13:02:50.000+01:00
diff --git a/src/instamatic/calibrate/calibrate_beamshift.py b/src/instamatic/calibrate/calibrate_beamshift.py
@@ -342,9 +342,9 @@ def main_entry():
     args = options.args
 
     if not args:
-        from instamatic import controller
+        from instamatic import TEMController
 
-        ctrl = controller.initialize()
+        ctrl = TEMController.initialize()
         calibrate_beamshift(ctrl=ctrl, save_images=True)
     else:
         center_fn = args[0]
diff --git a/src/instamatic/calibrate/calibrate_brightness.py b/src/instamatic/calibrate/calibrate_brightness.py
@@ -206,9 +206,9 @@ def main_entry():
     args = options.args
 
     if not args:
-        from instamatic import controller
+        from instamatic import TEMController
 
-        ctrl = controller.initialize()
+        ctrl = TEMController.initialize()
         calibrate_brightness(ctrl, save_images=True)
     else:
         calibrate_brightness(args)
diff --git a/src/instamatic/calibrate/calibrate_directbeam.py b/src/instamatic/calibrate/calibrate_directbeam.py
@@ -393,9 +393,9 @@ def main_entry():
     if args:
         calibrate_directbeam(patterns=args)
     else:
-        from instamatic import controller
+        from instamatic import TEMController
 
-        ctrl = controller.initialize()
+        ctrl = TEMController.initialize()
         calibrate_directbeam(ctrl=ctrl)
 
 
diff --git a/src/instamatic/calibrate/calibrate_stage_lowmag.py b/src/instamatic/calibrate/calibrate_stage_lowmag.py
@@ -430,9 +430,9 @@ def main_entry():
     args = options.args
 
     if not args:
-        from instamatic import controller
+        from instamatic import TEMController
 
-        ctrl = TEMtroller.initialize()
+        ctrl = TEMController.initialize()
         calibrate_stage_lowmag(ctrl=ctrl, save_images=True)
     else:
         center_fn = args[0]
diff --git a/src/instamatic/calibrate/calibrate_stage_mag1.py b/src/instamatic/calibrate/calibrate_stage_mag1.py
@@ -289,9 +289,9 @@ def main_entry():
     args = options.args
 
     if not args:
-        from instamatic import controller
+        from instamatic import TEMController
 
-        ctrl = controller.initialize()
+        ctrl = TEMController.initialize()
         calibrate_mag1(ctrl=ctrl, save_images=True)
     else:
         center_fn = args[0]
diff --git a/src/instamatic/calibrate/calibrate_stagematrix.py b/src/instamatic/calibrate/calibrate_stagematrix.py
@@ -528,9 +528,9 @@ def main_entry():
     mode = options.mode
     mags = options.mags
 
-    from instamatic import controller
+    from instamatic import TEMController
 
-    ctrl = controller.initialize()
+    ctrl = TEMController.initialize()
 
     if not mode:
         mode = ctrl.mode.get()
diff --git a/src/instamatic/camera/camera.py b/src/instamatic/camera/camera.py
@@ -157,9 +157,9 @@ def main_entry():
 
     take_series = options.take_series
 
-    from instamatic import controller
+    from instamatic import TEMController
 
-    ctrl = controller.initialize()
+    ctrl = TEMController.initialize()
 
     if take_series:
         i = 1
diff --git a/src/instamatic/experiments/cred_gatan/experiment.py b/src/instamatic/experiments/cred_gatan/experiment.py
@@ -462,14 +462,14 @@ def log_stage_positions(self):
 
 
 if __name__ == '__main__':
-    from instamatic import controller
+    from instamatic import TEMController
     from instamatic.io import get_new_work_subdirectory
 
     print('Usage:')
     print(' 1. Start `insteadmatic_module.s` in DM')
     print(' 2. Run this script.')
 
-    ctrl = controller.initialize()
+    ctrl = TEMController.initialize()
 
     time.sleep(1)
 
diff --git a/src/instamatic/experiments/cred_tvips/experiment.py b/src/instamatic/experiments/cred_tvips/experiment.py
@@ -620,10 +620,10 @@ def log_stage_positions(self):
 
 
 if __name__ == '__main__':
-    from instamatic import controller
+    from instamatic import TEMController
     from instamatic.io import get_new_work_subdirectory
 
-    ctrl = controller.initialize()
+    ctrl = TEMController.initialize()
 
     expdir = get_new_work_subdirectory()
     expdir.mkdir(exist_ok=True, parents=True)
diff --git a/src/instamatic/experiments/red/experiment.py b/src/instamatic/experiments/red/experiment.py
@@ -202,9 +202,9 @@ def teardown(self):
 
 
 def main():
-    from instamatic import controller
+    from instamatic import TEMController
 
-    ctrl = controller.initialize()
+    ctrl = TEMController.initialize()
 
     import logging
 
diff --git a/src/instamatic/experiments/serialed/experiment.py b/src/instamatic/experiments/serialed/experiment.py
@@ -613,7 +613,7 @@ def main():
 
     options = parser.parse_args()
 
-    from instamatic import microscope
+    from instamatic import TEMController
 
     try:
         params = json.load(open('params.json'))
diff --git a/src/instamatic/gridmontage.py b/src/instamatic/gridmontage.py
@@ -207,9 +207,9 @@ def plot(self):
 
 
 if __name__ == '__main__':
-    from instamatic import TEMtroller
+    from instamatic import TEMController
 
-    ctrl = TEMtroller.initialize()
+    ctrl = TEMController.initialize()
     ctrl.mode.set('lowmag')
     ctrl.magnification.value = 100
 
diff --git a/src/instamatic/gui/cred_tvips_frame.py b/src/instamatic/gui/cred_tvips_frame.py
@@ -193,9 +193,9 @@ def __init__(self, parent):
 
         frame.pack(side='bottom', fill='x', padx=10, pady=10)
 
-        from instamatic import controller
+        from instamatic import TEMController
 
-        self.ctrl = controller.get_instance()
+        self.ctrl = TEMController.get_instance()
 
     def init_vars(self):
         self.var_target_angle = DoubleVar(value=40.0)
diff --git a/src/instamatic/gui/ctrl_frame.py b/src/instamatic/gui/ctrl_frame.py
@@ -187,9 +187,9 @@ def __init__(self, parent):
 
         frame.pack(side='top', fill='x', padx=10, pady=10)
 
-        from instamatic import controller
+        from instamatic import TEMController
 
-        self.ctrl = controller.get_instance()
+        self.ctrl = TEMController.get_instance()
 
     def init_vars(self):
         self.var_negative_angle = DoubleVar(value=-40)
diff --git a/src/instamatic/gui/defocus_button.py b/src/instamatic/gui/defocus_button.py
@@ -3,7 +3,7 @@
 from tkinter import *
 from tkinter.ttk import *
 
-from instamatic import controller
+from instamatic import TEMController
 
 
 class DefocusButton(LabelFrame):
@@ -84,7 +84,7 @@ def main():
 
     options = parser.parse_args()
 
-    ctrl = controller.initialize()
+    ctrl = TEMController.initialize()
 
     root = Tk()
     DefocusButton(root).pack(side='top', fill='both', expand=True, padx=10, pady=10)
diff --git a/src/instamatic/gui/gui.py b/src/instamatic/gui/gui.py
@@ -180,7 +180,7 @@ def start_gui(ctrl, log=None):
 
 
 if __name__ == '__main__':
-    from instamatic import controller
+    from instamatic import TEMController
 
-    ctrl = controller.initialize()
+    ctrl = TEMController.initialize()
     start_gui(ctrl)
diff --git a/src/instamatic/main.py b/src/instamatic/main.py
@@ -165,9 +165,9 @@ def main():
     log = logging.getLogger(__name__)
     log.info(f'Instamatic started: {repr(options.__dict__)}')
 
-    from instamatic import controller
+    from instamatic import TEMController
 
-    ctrl = controller.initialize(stream=True)
+    ctrl = TEMController.initialize(stream=True)
 
     if options.nav_file:
         from pyserialem import read_nav_file
diff --git a/src/instamatic/microscope/client.py b/src/instamatic/microscope/client.py
@@ -114,7 +114,7 @@ def _eval_dct(self, dct):
             raise ConnectionError(f'Unknown status code: {status}')
 
     def _init_dict(self):
-        from instamatic.microscope.microscope import get_microscope_class
+        from instamatic.microscope import get_microscope_class
 
         tem = get_microscope_class(interface=self.interface)
 
diff --git a/src/instamatic/processing/flatfield.py b/src/instamatic/processing/flatfield.py
@@ -9,7 +9,7 @@
 import numpy as np
 from tqdm.auto import tqdm
 
-from instamatic import config, controller
+from instamatic import TEMController, config
 from instamatic.formats import *
 
 
@@ -234,7 +234,7 @@ def main_entry():
     args = options.args
 
     if options.collect:
-        ctrl = controller.initialize()
+        ctrl = TEMController.initialize()
         collect_flatfield(ctrl=ctrl, save_images=False)
         ctrl.close()
         exit()
diff --git a/src/instamatic/server/TEMServer_FEI.py b/src/instamatic/server/TEMServer_FEI.py
@@ -10,7 +10,7 @@
 import threading
 from socket import *
 
-from instamatic import TEMtroller, config
+from instamatic import TEMController, config
 
 HOST = config.settings.fei_server_host
 PORT = config.settings.fei_server_port
@@ -68,7 +68,7 @@ def main():
     logging.captureWarnings(True)
     log = logging.getLogger(__name__)
 
-    ctrl = TEMtroller.initialize()
+    ctrl = TEMController.initialize()
 
     s = socket(AF_INET, SOCK_STREAM)
     s.bind((HOST, PORT))
diff --git a/src/instamatic/server/tem_server.py b/src/instamatic/server/tem_server.py
@@ -10,7 +10,7 @@
 import traceback
 
 from instamatic import config
-from instamatic.microscope import get_microscope
+from instamatic.TEMController import Microscope
 
 from .serializer import dumper, loader
 
@@ -45,7 +45,7 @@ def __init__(self, log=None, q=None, name=None):
 
     def run(self):
         """Start the server thread."""
-        self.tem = get_microscope(name=self._name, use_server=False)
+        self.tem = Microscope(name=self._name, use_server=False)
         print(f'Initialized connection to microscope: {self.tem.name}')
 
         while True:
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -21,9 +21,9 @@ def pytest_configure():
 
 @pytest.fixture(scope='module')
 def ctrl() -> 'TEMController':
-    from instamatic.controller import initialize
+    from instamatic import controller
 
-    ctrl = initialize()
+    ctrl = controller.initialize()
 
     # set instant stage movement for testing
     ctrl.tem._set_instant_stage_movement()
