Skip to content
This repository has been archived by the owner on Apr 19, 2024. It is now read-only.

new layout - easier to manage #333

Merged
merged 57 commits into from
Feb 26, 2020
Merged

new layout - easier to manage #333

merged 57 commits into from
Feb 26, 2020

Conversation

prjemian
Copy link
Contributor

There is a new recommendation to layout the ~/.ipython directory (see 3-ID and 8-ID-I XPCS). this should be easier to understand and maintain.

fixes #332

@prjemian prjemian added the enhancement New feature or request label Feb 21, 2020
@prjemian prjemian self-assigned this Feb 21, 2020
@lgtm-com
Copy link

lgtm-com bot commented Feb 21, 2020

This pull request introduces 3 alerts and fixes 1 when merging ff87b4d into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 21, 2020

This pull request introduces 3 alerts and fixes 1 when merging 997fbac into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 21, 2020

This pull request introduces 3 alerts and fixes 1 when merging 294bcfb into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 22, 2020

This pull request introduces 3 alerts and fixes 1 when merging 05719d6 into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 22, 2020

This pull request introduces 3 alerts and fixes 1 when merging 13847dd into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 22, 2020

This pull request introduces 3 alerts and fixes 1 when merging 1ee426f into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@prjemian prjemian mentioned this pull request Feb 22, 2020
@lgtm-com
Copy link

lgtm-com bot commented Feb 22, 2020

This pull request introduces 3 alerts and fixes 1 when merging 8c83513 into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 22, 2020

This pull request introduces 3 alerts and fixes 1 when merging 95d37a4 into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2020

This pull request introduces 7 alerts and fixes 1 when merging 37c9146 into 3e76b56 - view on LGTM.com

new alerts:

  • 4 for 'import *' may pollute namespace
  • 2 for Explicit export is not defined
  • 1 for Module is imported more than once

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2020

This pull request introduces 4 alerts and fixes 1 when merging 9765944 into 3e76b56 - view on LGTM.com

new alerts:

  • 4 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@prjemian
Copy link
Contributor Author

Finally. Passes the startup test at the beam line.

usaxs@usaxscontrol ~/.ipython $ blueskyUSAXS
Python 3.7.6 | packaged by conda-forge | (default, Jan  7 2020, 22:33:48)
Type 'copyright', 'credits' or 'license' for more information
IPython 7.11.1 -- An enhanced Interactive Python. Type '?' for help.

IPython profile: bluesky
Activating auto-logging. Current session state plus future input saved.
Filename       : /home/beams11/USAXS/.ipython/.logs/ipython_console.log
Mode           : rotate
Output logging : True
Raw input log  : False
Timestamping   : True
State          : active
I Tue-13:45:22 - ############################################################ startup
I Tue-13:45:22 - logging started
I Tue-13:45:22 - logging level = 10
I Tue-13:45:22 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/collection.py
I Tue-13:45:22 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/mpl/console.py
I Tue-13:45:22 - bluesky framework
I Tue-13:45:22 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/framework/check_python.py
I Tue-13:45:22 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/framework/initialize.py
Loading metadata history from /home/beams/USAXS/.config/bluesky/bluesky_history.db
I Tue-13:45:24 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/framework/user_dir.py
I Tue-13:45:24 - User code directory: /home/beams11/USAXS/.ipython/bluesky_plans
I Tue-13:45:24 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/framework/metadata.py
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/framework/callbacks.py
I Tue-13:45:25 - writing to SPEC file: /home/beams11/USAXS/.ipython/20200225-134525.dat
I Tue-13:45:25 -    >>>>   Using default SPEC file name   <<<<
I Tue-13:45:25 -    file will be created when bluesky ends its next scan
I Tue-13:45:25 -    to change SPEC file, use command:   newSpecFile('title')
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/aps_source.py
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/permit.py
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/diagnostics.py
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/constants.py
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/general_terms.py
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/amplifiers.py
I Tue-13:45:25 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/scalers.py
I Tue-13:45:28 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/sample_data.py
I Tue-13:45:28 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/user_data.py
I Tue-13:45:28 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/autosave.py
I Tue-13:45:28 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/axis_tuning.py
I Tue-13:45:28 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/miscellaneous.py
I Tue-13:45:28 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/usaxs_motor_devices.py
I Tue-13:45:30 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/shutters.py
W Tue-13:45:30 - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
W Tue-13:45:30 - Session started when 9ID-C is not operating.
W Tue-13:45:30 - Using simulators for all shutters.
W Tue-13:45:30 - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
I Tue-13:45:30 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/stages.py
I Tue-13:45:32 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/emails.py
I Tue-13:45:32 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/filters.py
I Tue-13:45:32 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/linkam.py
I Tue-13:45:32 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/monochromator.py
I Tue-13:45:32 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/protection_plc.py
I Tue-13:45:32 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/slits.py
I Tue-13:45:32 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/motors.py
I Tue-13:45:33 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/struck3820.py
I Tue-13:45:33 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/suspenders.py
I Tue-13:45:33 - Installing suspender for low APS current.
I Tue-13:45:33 - mono shutter connected = True
I Tue-13:45:33 - Defining suspend_BeamInHutch.  Install/remove in scan plans as desired.
I Tue-13:45:33 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/trajectories.py
I Tue-13:45:33 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/usaxs_fly_scan.py
I Tue-13:45:33 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/alta.py
I Tue-13:45:33 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/area_detector_common.py
W Tue-13:45:35 - Timeout connecting with Alta (9idalta:)
I Tue-13:45:35 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/blackfly.py
I Tue-13:45:35 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/devices/pilatus.py
W Tue-13:45:36 - Timeout connecting with Pilatus 100k (usaxs_pilatus1:)
W Tue-13:45:37 - Timeout connecting with Pilatus 200kw (usaxs_pilatus2:)
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/area_detector.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/reporter.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/axis_tuning.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/mode_changes.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/filters.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/mono_feedback.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/move_instrument.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/a2q_q2a.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/plot_prune.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/requested_stop.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/command_list.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/quoted_line.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/resets.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/sample_transmission.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/scans.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/cleanup_text.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/tune_guard_slits.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/derivative.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/utils/peak_centers.py
I Tue-13:45:37 - /home/beams11/USAXS/.ipython/profile_bluesky/startup/instrument/plans/uascan.py

In [1]:

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2020

This pull request introduces 4 alerts and fixes 1 when merging ad6072d into 3e76b56 - view on LGTM.com

new alerts:

  • 4 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@jilavsky
Copy link
Contributor

That looks refreshing. We now have logical structure of our packages. How do you control order of loading of these packages? Is there some include file which has this order?
Approved, but expect I need explanation ;-)

@jilavsky jilavsky closed this Feb 25, 2020
@prjemian prjemian reopened this Feb 25, 2020
@prjemian
Copy link
Contributor Author

I'll walk you through this. Look in startup/00-instrument.py, it calls instrument.collection.py which controls the process.

@prjemian
Copy link
Contributor Author

If you close without merge, that means you don't want these changes. Let's review first, then merge.

@prjemian prjemian marked this pull request as ready for review February 25, 2020 21:09
@prjemian
Copy link
Contributor Author

00-instrument.py loads collection.py which loads ...

you get the picture

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2020

This pull request introduces 3 alerts and fixes 1 when merging 2d14416 into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 26, 2020

This pull request introduces 4 alerts and fixes 1 when merging 199c749 into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace
  • 1 for Unused local variable

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 26, 2020

This pull request introduces 4 alerts and fixes 1 when merging b7c59ab into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace
  • 1 for Unused local variable

fixed alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 26, 2020

This pull request introduces 4 alerts and fixes 1 when merging 355bdd0 into 3e76b56 - view on LGTM.com

new alerts:

  • 3 for 'import *' may pollute namespace
  • 1 for Unused local variable

fixed alerts:

  • 1 for 'import *' may pollute namespace

@prjemian
Copy link
Contributor Author

Went over this today with @jilavsky and we agree it is a step in the right direction.

@prjemian prjemian merged commit a92e08c into master Feb 26, 2020
@prjemian prjemian deleted the 332-new-layout branch February 26, 2020 23:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

use ipython layout similar to XPCS and others
2 participants