MNT: BITS structure cleanup

README.md

@@ -23,31 +23,25 @@ conda activate $ENV_NAME
 pip install -e ."[all]"
 ```
 
-## IPython console
+## IPython console & Jupyter notebook
 
 To start the bluesky instrument session in a ipython execute the next command in a terminal:
 
 ```bash
 ipython
 ```
 
-Inside the ipython console execute:
-
-```py
-from instrument.startup import *
-```
-
-## Jupyter notebook
-
+## Jupyter Notebook
 Start JupyterLab, a Jupyter notebook server, or a notebook, VSCode.
 
-Start the data acquisition:
+## Starting the BITS Package
 
 ```py
 from instrument.startup import *
+RE(make_devices())  # create all the ophyd-style control devices
 ```
 
-## Sim Plan Demo
+## Running Sim Plan Demo
 
 To run some simulated plans that ensure the installation worked as expected
 please run the next commands inside an ipython session or a jupyter notebook

src/instrument/configs/devices.yml

@@ -1,6 +1,6 @@
 # Guarneri-style device YAML configuration
 
-instrument.devices.factories.predefined_device:
+instrument.utils.sim_creator.predefined_device:
 - {creator: ophyd.sim.motor, name: sim_motor}
 - {creator: ophyd.sim.noisy_det, name: sim_det}
 

src/instrument/configs/iconfig.yml

@@ -27,26 +27,27 @@ RUN_ENGINE:
 
     ### The progress bar is nice to see,
     ### except when it clutters the output in Jupyter notebooks.
-    ### Default: True
+    ### Default: False
     USE_PROGRESS_BAR: false
 
 # Command-line tools, such as %wa, %ct, ...
-USE_BLUESKY_MAGICS: True
+USE_BLUESKY_MAGICS: true
 
 ### Best Effort Callback Configurations
 ### Defaults: all true (except no plots in queueserver)
-# BEC:
-#     BASELINE: false
-#     HEADING: false
-#     PLOTS: false
-#     TABLE: false
+BEC:
+    BASELINE: true
+    HEADING: true
+    PLOTS: true
+    TABLE: true
 
 ### Support for known output file formats.
 ### Uncomment to use.  If undefined, will not write that type of file.
 ### Each callback should apply its configuration from here.
 # NEXUS_DATA_FILES:
 #     FILE_EXTENSION: hdf
 #     WARN_MISSING_CONTENT: true
+
 SPEC_DATA_FILES:
     FILE_EXTENSION: dat
 

src/instrument/startup.py

@@ -16,7 +16,6 @@
 from .core.catalog_init import cat  # noqa: F401
 from .core.run_engine_init import RE  # noqa: F401
 from .core.run_engine_init import sd  # noqa: F401
-from .devices import *  # noqa: F403
 from .plans import *  # noqa: F403
 
 # Bluesky data acquisition setup

src/instrument/tests/test_device_factories.py

@@ -2,8 +2,8 @@
 
 import pytest
 
-from ..devices.factories import motors
-from ..devices.factories import predefined_device
+from ..utils.sim_creator import motors
+from ..utils.sim_creator import predefined_device
 
 
 @pytest.mark.parametrize(