Skip to content

Measurement MWP #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
damskii9992 wants to merge 23 commits into
base: develop
Choose a base branch
from
Open

Measurement MWP #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ab9ca22
Create Measurement from Scipp DataArray
damskii9992 Nov 13, 2025
dd022c0
Create Measurement from scitiff
damskii9992 Dec 10, 2025
0ad0876
Create Measurement from a regular TIFF stack
damskii9992 Dec 15, 2025
9496cfd
Merge branch 'develop' into Measurement_MWP
damskii9992 Dec 16, 2025
06c4ab1
Test all Measurement constructors
damskii9992 Dec 19, 2025
3c60b65
add rebinning part 1
damskii9992 Jan 2, 2026
67524e6
Ensure x and y coordinates are always bin-edges.
damskii9992 Jan 5, 2026
ed4401e
allow rebinning in 'x' or 'y'
damskii9992 Jan 8, 2026
83e59d5
First rebin unit tests
damskii9992 Jan 9, 2026
bb30f41
Final tests of rebin
damskii9992 Jan 19, 2026
3693d5b
Add plotting function to Measurement
damskii9992 Jan 20, 2026
540e95b
Add the interactive slicer plot from plopp to Measurement
damskii9992 Jan 21, 2026
27d9139
Add interactive inspector plot to Measurement class
damskii9992 Jan 21, 2026
dd33e66
Add Rectangular Region of Interest class
damskii9992 Jan 23, 2026
8b477cf
Add RectROI
damskii9992 Jan 27, 2026
4cb2400
Commit to possibly WFH
damskii9992 Jan 29, 2026
2648730
Require both x and y coordinates simultaniously.
damskii9992 Feb 3, 2026
85e0df7
add x_positions and y_positions setters and getters
damskii9992 Feb 3, 2026
b929e03
commit to WFH
damskii9992 Feb 4, 2026
c089eeb
commit to continue from office
damskii9992 Feb 9, 2026
59e2664
finish spectrum method and tests. Changed RectROI slice method to acc…
damskii9992 Feb 9, 2026
feef236
Add spectrum plotter
damskii9992 Feb 9, 2026
8142d72
Remove temporary plotting notebook
damskii9992 Feb 9, 2026
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
4,780 changes: 2,810 additions & 1,970 deletions pixi.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels = ["conda-forge"]
platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]

[dependencies]
python = ">=3.11,<3.13"
python = ">=3.14.3,<3.15"

Copy link
Member

@rozyczko rozyczko Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inconsistent python version between pixi.toml and pyproject.toml!

[feature.dev.pypi-dependencies]
# Development dependencies
Expand Down Expand Up @@ -51,4 +51,5 @@ docs-clean = "rm -rf docs/_build/"
[pypi-dependencies] # == [feature.default.pypi-dependencies]
# Editable install of the package itself
easyimaging = { path = ".", editable = true }
easyscience = { git = "https://github.com/easyscience/corelib", branch = "easylist2" }

13 changes: 9 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@ classifiers = [
"Topic :: Scientific/Engineering",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Development Status :: 3 - Alpha"
]
requires-python = ">=3.10,<3.13"
requires-python = ">=3.11,<3.14"
dependencies = [
"easyscience>=2.0.0",
#"easyscience@git+https://github.com/easyscience/corelib#egg=easylist2",
Copy link
Member

@rozyczko rozyczko Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You rely on EasyList but use the release version. The current code doesn't work when installed

#"easyscience>=2.0.0",
"scitiff",
"essimaging",
"plopp",
"ncrystal[composer]"
]
Expand All @@ -51,7 +53,10 @@ dev = [
"pytest>=5.2",
"pytest-cov>=3.0.0",
"ruff",
"tox-gh-actions"
"tox-gh-actions",
"ipython==9.7.0",
"matplotlib==3.10.7",
"ipympl==0.9.8",
]
docs = [
"doc8",
Expand Down
Binary file added small_scitiff.tiff
View file
Open in desktop
Copy link
Member

@henrikjacobsenfys henrikjacobsenfys Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to have the same file in two different places in the project?

Binary file not shown.
Binary file added small_tiff.tiff
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions src/easyimaging/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@
__version__ = '0.0.0'

del importlib

from .measurement import Measurement

__all__ = [Measurement]
3 changes: 3 additions & 0 deletions src/easyimaging/measurement/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from .measurement import Measurement

__all__ = [Measurement]
Loading
Loading