Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,760 changes: 3,941 additions & 2,819 deletions pixi.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ platforms = ["linux-64"]
python = ">=3.11,<3.14"
algotom = ">=1.7.0,<2"
ipython = ">=9.16.1,<10"
bluesky-base = ">=1.15.1,<2"
tiled-client = ">=0.2.14,<0.3"
bluesky-tiled-plugins = ">=2.0.9,<3"
rich = ">=15.0.0,<16"
Expand All @@ -20,12 +19,13 @@ scikit-image = ">=0.26.0,<0.27"
[pypi-dependencies]
hextools = { path = ".", editable = true }
nslsii = { git = "https://github.com/NSLS2/nslsii", rev = "main" }
bluesky = { git = "https://github.com/bluesky/bluesky", rev = "main" }
ophyd-async = { git = "https://github.com/jwlodek/ophyd-async", rev = "add-codec-and-process-plugin-allow-for-filtering" }

[feature.profile.dependencies]
redis-json-dict = ">=0.2.2,<0.3"

[feature.qs.dependencies]
[feature.qs.pypi-dependencies]
bluesky-queueserver = ">=0.0.25,<0.0.26"
bluesky-queueserver-api = ">=0.0.13,<0.0.14"
bluesky-httpserver = ">=0.0.12,<0.0.13"
Expand All @@ -43,6 +43,7 @@ qs-server = "uvicorn --host localhost --port 60610 bluesky_httpserver.server:app
matplotlib = ">=3.10.9,<4"
qtpy = ">=2.4.3,<3"
pyside6 = ">=6.9.0,<7"
nexpy = ">=2.0.3,<3"

[feature.terminal.tasks.start]
cmd = "unset SESSION_MANAGER PYTHONPATH PYTHONUSERBASE && MPLBACKEND=qtagg ipython -i src/hextools/profiles/{{ profile }}.py"
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@ dependencies = [
"algotom",
"ipython",
"numpy",
"bluesky",
"nslsii",
"ophyd-async[ca, pva]",
"rich>=15.0.0",
"scikit-image>=0.26.0",
"scipy>=1.17.1",
]

[project.optional-dependencies]
iocs = [
"caproto",
]
gui = [
# "ntnda-qt-viewer",
]
Expand Down
7 changes: 7 additions & 0 deletions src/hextools/detectors/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
"""Ophyd async support for detectors at HEX."""

# Readout headroom (s) added to exposure_time when frame_period is unset;
# same margin the beamline's deployed PandA plan kept between step and exposure.
FRAME_PERIOD_MARGIN = 0.0125 #Kinetix
# 0.000005 #TODO for phantom
# GeRM N/A
# 0.05 # PE

from .phantom import (
PhantomAuxPinMode,
PhantomDetector,
Expand Down
Loading
Loading