new layout - easier to manage #333

prjemian · 2020-02-21T22:43:49Z

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

lgtm-com · 2020-02-21T22:53:43Z

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 · 2020-02-21T23:30:30Z

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 · 2020-02-21T23:38:31Z

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 · 2020-02-22T00:04:11Z

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 · 2020-02-22T00:57:50Z

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 · 2020-02-22T01:10:27Z

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

lgtm-com · 2020-02-22T17:46:06Z

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 · 2020-02-22T20:29:06Z

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 · 2020-02-25T18:37:05Z

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 · 2020-02-25T19:14:54Z

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 · 2020-02-25T19:47:20Z

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 · 2020-02-25T19:51:54Z

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 · 2020-02-25T20:19:14Z

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 ;-)

prjemian · 2020-02-25T20:31:30Z

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

prjemian · 2020-02-25T20:32:33Z

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

prjemian · 2020-02-25T21:11:37Z

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

you get the picture

lgtm-com · 2020-02-25T21:18:33Z

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 · 2020-02-26T22:24:52Z

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 · 2020-02-26T22:37:57Z

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 · 2020-02-26T23:02:46Z

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 · 2020-02-26T23:24:50Z

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

prjemian added 2 commits February 21, 2020 16:21

MNT #322 archive the existing layout

1c97bb9

MNT #322 basic framework setup

ff87b4d

prjemian added the enhancement New feature or request label Feb 21, 2020

prjemian self-assigned this Feb 21, 2020

MNT #332 diagnostics

997fbac

MNT #332 s_stage

294bcfb

prjemian added 2 commits February 21, 2020 17:58

MNT #332 11-stages complete

05719d6

LGTM #332

2d98cf8

prjemian added 5 commits February 21, 2020 18:19

MNT #332 terms

302fa7f

MNT #332 various

e9e4086

MNT #332 20-detectors

3ca8e8a

MNT #332 22-amplifiers

76b6768

WIP #332 TODO devices

13847dd

prjemian added 4 commits February 21, 2020 18:58

MNT #332 symbols

dfd0fd7

MNT #332 fewer global symbols

e0d73b4

MNT #332 we need a verb!

106ca66

MNT #332 labels

1ee426f

prjemian mentioned this pull request Feb 22, 2020

USAXS Q Imaging plan #227

Closed

prjemian added 2 commits February 22, 2020 11:36

MNT #332 shutters & ops permit

4e989f4

MNT #332 filters - easy example

8c83513

MNT #332 21-signals complete

95d37a4

MNT #332 area detectors

181241f

prjemian added 2 commits February 25, 2020 10:20

fixes #334

a780722

MNT #334 op cit

37c9146

prjemian added 3 commits February 25, 2020 13:07

LGTM #332 remove extra import

dd13173

LGTM #332 exported name

068c07e

LGTM #332 exported name

9765944

MNT #332 imports

ad6072d

prjemian requested a review from jilavsky February 25, 2020 19:48

jilavsky closed this Feb 25, 2020

prjemian reopened this Feb 25, 2020

prjemian marked this pull request as ready for review February 25, 2020 21:09

MNT #332 commands --> utils

2d14416

Get updated value for terms.use_Flycan when needed.

199c749

user plan

b7c59ab

prjemian added 2 commits February 26, 2020 16:56

paths

c063e62

imports

355bdd0

prjemian merged commit a92e08c into master Feb 26, 2020

prjemian deleted the 332-new-layout branch February 26, 2020 23:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

new layout - easier to manage #333

new layout - easier to manage #333

prjemian commented Feb 21, 2020

lgtm-com bot commented Feb 21, 2020

lgtm-com bot commented Feb 21, 2020

lgtm-com bot commented Feb 21, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 25, 2020

lgtm-com bot commented Feb 25, 2020

prjemian commented Feb 25, 2020

lgtm-com bot commented Feb 25, 2020

jilavsky commented Feb 25, 2020

prjemian commented Feb 25, 2020

prjemian commented Feb 25, 2020

prjemian commented Feb 25, 2020

lgtm-com bot commented Feb 25, 2020

lgtm-com bot commented Feb 26, 2020

lgtm-com bot commented Feb 26, 2020

lgtm-com bot commented Feb 26, 2020

prjemian commented Feb 26, 2020

new layout - easier to manage #333

new layout - easier to manage #333

Conversation

prjemian commented Feb 21, 2020

lgtm-com bot commented Feb 21, 2020

lgtm-com bot commented Feb 21, 2020

lgtm-com bot commented Feb 21, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 22, 2020

lgtm-com bot commented Feb 25, 2020

lgtm-com bot commented Feb 25, 2020

prjemian commented Feb 25, 2020

lgtm-com bot commented Feb 25, 2020

jilavsky commented Feb 25, 2020

prjemian commented Feb 25, 2020

prjemian commented Feb 25, 2020

prjemian commented Feb 25, 2020

lgtm-com bot commented Feb 25, 2020

lgtm-com bot commented Feb 26, 2020

lgtm-com bot commented Feb 26, 2020

lgtm-com bot commented Feb 26, 2020

prjemian commented Feb 26, 2020