Merge pull request #8 from NSLS-II-HXN/change-xspress3-imports

Fix import of xspress3 to be from `nslsii`
NSLS-II-HXN · Nov 4, 2021 · 8fae87c · 8fae87c
2 parents 4b976c4 + 10dd6a8
commit 8fae87c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hxnfly/fly.py b/hxnfly/fly.py
@@ -19,7 +19,7 @@
 from ophyd.device import Staged
 from ophyd.areadetector import FilePlugin
 
-from hxntools.detectors import Xspress3Detector
+from nslsii.detectors.xspress3 import Xspress3Detector
 from hxntools.shutter import (shutter_open, shutter_close)
 
 from . import SCRIPT_PATH

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
 bluesky
 databroker
-ophyd
 IPython
 nslsii
 numpy
+ophyd
 pandas
 pyepics
 scipy