remove instr classes from top level namespace

Author: wtbarnes

examples/arcade-rtv.py

@@ -14,7 +14,7 @@
 
 import synthesizAR
 
-from synthesizAR.instruments import InstrumentSDOAIA
+from synthesizAR.instruments.sdo import InstrumentSDOAIA
 from synthesizAR.interfaces import RTVInterface
 from synthesizAR.models import semi_circular_arcade
 

examples/ebtel-nanoflares.py

@@ -17,7 +17,7 @@
 
 import synthesizAR
 
-from synthesizAR.instruments import InstrumentSDOAIA
+from synthesizAR.instruments.sdo import InstrumentSDOAIA
 from synthesizAR.interfaces.ebtel import EbtelInterface
 from synthesizAR.interfaces.ebtel.heating_models import PowerLawNanoflareTrain
 from synthesizAR.models import semi_circular_arcade

examples/loop-bundle-rtv.py

@@ -16,7 +16,7 @@
 
 import synthesizAR
 
-from synthesizAR.instruments import InstrumentSDOAIA
+from synthesizAR.instruments.sdo import InstrumentSDOAIA
 from synthesizAR.interfaces import RTVInterface
 from synthesizAR.models import semi_circular_bundle
 

examples/multi-instrument.py

@@ -23,7 +23,8 @@
 
 import synthesizAR
 
-from synthesizAR.instruments import InstrumentHinodeXRT, InstrumentSDOAIA
+from synthesizAR.instruments.hinode import InstrumentHinodeXRT
+from synthesizAR.instruments.sdo import InstrumentSDOAIA
 from synthesizAR.interfaces import MartensInterface
 from synthesizAR.models import semi_circular_arcade
 

synthesizAR/instruments/__init__.py

@@ -3,5 +3,3 @@
 """
 from .base import *
 from .physical import *
-from .sdo import *
-from .hinode import *

synthesizAR/visualize/aia.py

@@ -1,14 +1,14 @@
 """
 Plotting functions for easily and quickily visualizing synthesized AIA results
 """
-import os
-
-import numpy as np
+import astropy.units as u
 import h5py
-import matplotlib.pyplot as plt
-import matplotlib.colors
 import matplotlib.animation
-import astropy.units as u
+import matplotlib.colors
+import matplotlib.pyplot as plt
+import numpy as np
+import os
+
 from astropy.coordinates import SkyCoord
 from sunpy.map import Map
 
@@ -22,7 +22,7 @@ def plot_aia_channels(aia, time: u.s, root_dir, corners=None, figsize=None, norm
 
     Parameters
     ----------
-    aia : `synthesizAR.instruments.InstrumentSDOAIA`
+    aia : `synthesizAR.instruments.sdo.InstrumentSDOAIA`
     time : `astropy.Quantity`
     root_dir : `str`
     figsize : `tuple`, optional
@@ -62,7 +62,7 @@ def plot_aia_channels(aia, time: u.s, root_dir, corners=None, figsize=None, norm
         ax.text(0.1*tmp.dimensions.x.value, 0.9*tmp.dimensions.y.value,
                 r'${}$ $\mathrm{{\mathring{{A}}}}$'.format(channel['name']),
                 color='w', fontsize=fontsize)
-    fig.suptitle(r'$t={:.0f}$ {}'.format(time.value, time.unit.to_string()), fontsize=fontsize)
+    fig.suptitle(rf'$t={time.value:.0f}$ {time.unit.to_string()}', fontsize=fontsize)
     if kwargs.get('use_with_animation', False):
         return fig, ims