MNT #148 rename

profile_bluesky/startup/instrument/devices/__init__.py

@@ -2,7 +2,7 @@
 local, custom Device definitions
 """
 
-from .aps import *
+from .aps_source import *
 from .pss import *
 
 # upstream devices

profile_bluesky/startup/instrument/devices/shutter.py

@@ -16,8 +16,8 @@
 from apstools.devices import EpicsOnOffShutter
 from apstools.devices import SimulatedApsPssShutterWithStatus
 from bluesky.suspenders import SuspendFloor
-from instrument.devices.aps import aps
-from instrument.devices.pss import operations_in_8idi
+from instrument.devices import aps
+from instrument.devices import operations_in_8idi
 from instrument.startup import RE, sd
 from ophyd import EpicsSignal
 

profile_bluesky/startup/instrument/staff/QZ/align.py

@@ -11,9 +11,10 @@
 from instrument.session_logs import logger
 logger.info(__file__)
 
+from bluesky import plans as bp
+from bluesky import plan_stubs as bps
 from instrument.devices import pind4, lakeshore, samplestage
 from instrument.plans import sb, bb
-from instrument.startup import bp, bps
 
 logger.warning("Call pre_align() with shutter OPEN before you run RE(align_x())")
 

profile_bluesky/startup/instrument/startup/__init__.py

@@ -1,7 +1,7 @@
 from .check_python import *
 from .check_bluesky import *
 
-from .framework import *
+from .initialize import *
 from .user_dir import *
 from .metadata import *
 from .callbacks import *

profile_bluesky/startup/instrument/startup/callbacks.py

@@ -9,15 +9,15 @@
     'newSpecFile',
 ]
 
+from ..session_logs import logger
+logger.info(__file__)
+
 import apstools.filewriters
 import apstools.utils
 import datetime
 import os
 
-from ..startup.framework import RE, callback_db
-
-from ..session_logs import logger
-logger.info(__file__)
+from .initialize import RE, callback_db
 
 # write scans to SPEC data file
 specwriter = apstools.filewriters.SpecWriterCallback()

profile_bluesky/startup/instrument/startup/metadata.py

@@ -4,6 +4,9 @@
 
 __all__ = []
 
+from ..session_logs import logger
+logger.info(__file__)
+
 import apstools
 import bluesky
 import databroker
@@ -19,10 +22,7 @@
 import socket
 import spec2nexus
 
-from ..startup.framework import RE
-
-from ..session_logs import logger
-logger.info(__file__)
+from .initialize import RE
 
 # Set up default metadata
 

profile_bluesky/startup/instrument/startup/user_dir.py

@@ -5,13 +5,13 @@
 
 __all__ = []
 
+from ..session_logs import logger
+logger.info(__file__)
+
 import IPython.paths
 import os
 import sys
 
-from ..session_logs import logger
-logger.info(__file__)
-
 user_dir = os.path.join(
         IPython.paths.get_ipython_dir(), 
         "user"