Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Commit 73d28f5

Browse files
authored
Merge pull request #283 from aps-8id-dys/150-Lambda2M
add Lambda 2M support
2 parents 2728b4f + 6c53530 commit 73d28f5

27 files changed

Lines changed: 1782 additions & 213 deletions
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: bluesky_2022_2
2+
3+
# use:
4+
# date; conda env create --force -f ./environment_2022_2.yml; date
5+
6+
channels:
7+
- defaults
8+
- conda-forge
9+
- aps-anl-tag
10+
- nsls2forge
11+
12+
dependencies:
13+
14+
# --- Python core packages
15+
- python=3.9
16+
- ipython
17+
- jupyter
18+
- jupyterlab
19+
- notebook
20+
- pip
21+
- psutil
22+
23+
# --- testing and quality assurance
24+
- black
25+
- flake8
26+
- pylint
27+
- pytest
28+
29+
# --- Qt
30+
- pyqt=5
31+
- qt=5
32+
33+
# --- general support packages
34+
- bitshuffle
35+
- epics-base>=7.0.5
36+
- h5py
37+
- hdf5plugin
38+
- imagecodecs-lite
39+
- ipympl
40+
- lxml
41+
- pandas
42+
- pint
43+
- pyEpics>=3.5.0
44+
- pymongo
45+
- scikit-image
46+
- xlrd
47+
48+
# # --- Bluesky framework packages
49+
# all moved to pip install (conda takes additional 10m to solve)
50+
51+
# --- user-requested packages
52+
- aps-dm-api>=5
53+
- nexpy
54+
- punx
55+
- pvview
56+
- pymca
57+
- pyRestTable
58+
- spec2nexus
59+
- stdlogpj
60+
- xrayutilities
61+
62+
# # --- packaging and publishing
63+
# - conda-build
64+
# - coverage
65+
# - sphinx
66+
# - sphinxcontrib-napoleon
67+
# - twine
68+
# - versioneer
69+
70+
- pip:
71+
- apstools
72+
- area-detector-handlers
73+
- bluesky-queueserver
74+
- bluesky-queueserver-api
75+
- bluesky-widgets
76+
- bluesky>=1.8.1
77+
- databroker-pack
78+
- databroker>=1.2.4,<2
79+
- hklpy
80+
- ophyd>=1.6.3
81+
- pydm
82+
83+
- https://github.com/BCDA-APS/adl2pydm/archive/main.zip
84+
# --- optional Bluesky framework packages for evaluation
85+
# - bluesky-webclient is NOT Python software, don't install it this way
86+
# https://github.com/bluesky/bluesky-webclient

profile_bluesky/startup/instrument/devices/__init__.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,27 @@
2323
from .qnw_device import *
2424
from .sample_stage import *
2525
from .scaler import *
26-
from .shutters import *
26+
# from .shutters import *
2727
from .slits import *
2828
from .soft_glue_fpga import *
2929
from .tables import *
3030

3131
# area detectors
32-
from .rigaku500k import *
3332

34-
# from .lambda_750k import *
35-
# from .lambda_2m import *
33+
# Only do one of these at a time since they create an object with the same name
34+
from .rigaku_500k import *
3635
# from .rigaku_ufxc import *
3736
# from .ad_rigaku_detector import *
3837
# from .ad_rigaku500k import *
3938

39+
# from .lambda_750k import *
40+
41+
# Only do one of these at a time since they create an object with the same name
42+
# from .lambda_2m import *
43+
# from .lambda_2m_QZ import *
44+
# from .eiger500k import *
45+
from .ad_eiger import *
46+
from .ad_lambda2M import *
47+
4048
# non-hardware support
4149
from .data_management import *

0 commit comments

Comments
 (0)