MNT #148 rename

aps-8id-dys · Feb 11, 2020 · f6d330e · f6d330e
1 parent 8c959a6
commit f6d330e
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 4 deletions.
diff --git a/profile_bluesky/startup/instrument/console_session.py b/profile_bluesky/startup/instrument/console_session.py
@@ -14,7 +14,7 @@
 
 logger.info("bluesky framework")
 
-from .startup import *
+from .framework import *
 from .devices import *
 # TODO:
 # from .plans import *

diff --git a/profile_bluesky/startup/instrument/devices/aps_source.py b/profile_bluesky/startup/instrument/devices/aps_source.py
@@ -13,7 +13,7 @@
 
 import apstools.devices
 
-from ..startup.framework import sd
+from ..framework.initialize import sd
 
 
 aps = apstools.devices.ApsMachineParametersDevice(name="aps")

diff --git a/profile_bluesky/startup/instrument/devices/pss.py b/profile_bluesky/startup/instrument/devices/pss.py
@@ -12,7 +12,7 @@
 logger.info(__file__)
 
 import apstools.suspenders 
-from instrument.startup import RE
+from instrument.framework import RE
 from ophyd import Component, Device, EpicsSignalRO
 
 

diff --git a/profile_bluesky/startup/instrument/devices/shutter.py b/profile_bluesky/startup/instrument/devices/shutter.py
@@ -18,7 +18,7 @@
 from bluesky.suspenders import SuspendFloor
 from instrument.devices import aps
 from instrument.devices import operations_in_8idi
-from instrument.startup import RE, sd
+from instrument.framework import RE, sd
 from ophyd import EpicsSignal
 
 

diff --git a/...ky/startup/instrument/startup/__init__.py → .../startup/instrument/framework/__init__.py b/...ky/startup/instrument/startup/__init__.py → .../startup/instrument/framework/__init__.py
diff --git a/...y/startup/instrument/startup/callbacks.py → ...startup/instrument/framework/callbacks.py b/...y/startup/instrument/startup/callbacks.py → ...startup/instrument/framework/callbacks.py
diff --git a/...artup/instrument/startup/check_bluesky.py → ...tup/instrument/framework/check_bluesky.py b/...artup/instrument/startup/check_bluesky.py → ...tup/instrument/framework/check_bluesky.py
diff --git a/...tartup/instrument/startup/check_python.py → ...rtup/instrument/framework/check_python.py b/...tartup/instrument/startup/check_python.py → ...rtup/instrument/framework/check_python.py
diff --git a/.../startup/instrument/startup/initialize.py → ...tartup/instrument/framework/initialize.py b/.../startup/instrument/startup/initialize.py → ...tartup/instrument/framework/initialize.py
diff --git a/...ky/startup/instrument/startup/metadata.py → .../startup/instrument/framework/metadata.py b/...ky/startup/instrument/startup/metadata.py → .../startup/instrument/framework/metadata.py
diff --git a/...ky/startup/instrument/startup/user_dir.py → .../startup/instrument/framework/user_dir.py b/...ky/startup/instrument/startup/user_dir.py → .../startup/instrument/framework/user_dir.py