Skip to content

Polarization correction #122

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.

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
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8768696
docs: polarization calibration prototype
jokasimr Feb 25, 2025
f78be6c
docs: include figures
jokasimr Feb 25, 2025
0c686af
docs: add header
jokasimr Feb 25, 2025
a25ef55
changes
jokasimr Feb 27, 2025
d22df0f
feat: implement calibration and reduction
jokasimr Feb 27, 2025
e3bb2c1
refactor: move test code to tests, add docstrings
jokasimr Mar 18, 2025
2e50d3b
feat: draft sciline domain types
jokasimr Mar 18, 2025
7b70b11
test: solve recovers expected parameters
jokasimr Mar 18, 2025
ab78efb
test: stacking logic in linsolve
jokasimr Mar 18, 2025
fc20fd0
fix: remove unused
jokasimr Mar 19, 2025
893abdb
fix: add position already in reduction to lz
jokasimr Mar 19, 2025
0fb609a
fix: calibration on lz grid, compute Q on lz grid for sample + add ma…
jokasimr Mar 19, 2025
727bf44
docs: add esspolarization + tox -e deps
jokasimr Mar 20, 2025
ec48ec6
docs: add example reducing polarized mcstas data
jokasimr Mar 31, 2025
e9acb7c
fix: move factor from normalization to polarization matrix
jokasimr Apr 1, 2025
6e11c7d
fix: use pandas to load csv
jokasimr Apr 1, 2025
381227e
fix: tweak center of incident angle for mcstas data
jokasimr Apr 1, 2025
0329a22
fix: old value was better
jokasimr Apr 2, 2025
179aaef
fix: tests
jokasimr Apr 2, 2025
261ac50
feat: make normalization able to handle different kinds of references
jokasimr Apr 2, 2025
cca0ce5
fix: no need to have two reduce to Q functions
jokasimr Apr 4, 2025
4930b00
docs: stap template
jokasimr Apr 4, 2025
725ee1d
fix: remove unnecessary
jokasimr Apr 7, 2025
91fb8cd
deps: add ipympl to docs
jokasimr Apr 9, 2025
8d9ba1d
Merge branch 'polcal' of github.com:scipp/essreflectometry into polcal
jokasimr Apr 9, 2025
6089d41
docs: remove polarization notebook
jokasimr Apr 9, 2025
f8083b2
docs: remove polarization notebook from docs
jokasimr Apr 9, 2025
d7d31c0
docs: remove polarization correction experiment notebook
jokasimr Apr 9, 2025
b187fbd
Merge branch 'main' into polcal
jokasimr Apr 9, 2025
6e1a83f
docs: remove figures
jokasimr Apr 9, 2025
1c92913
Merge branch 'polcal' of github.com:scipp/essreflectometry into polcal
jokasimr Apr 9, 2025
c5610b7
fix: use np.kron to construct calibration matrix
jokasimr Apr 25, 2025
0913455
deps: use latest sciline for new Scope
jokasimr Apr 25, 2025
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
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ dependencies = [
"plopp",
"pythreejs",
"orsopy",
"sciline>=24.6.0",
"sciline>=25.4.1",
"scipp>=24.09.1", # Fixed new hist/bin API
"scippneutron>=24.7.0",
"scippnexus>=24.9.1",
"essreduce",
"esspolarization",
"pandas",
]

Expand Down
3 changes: 2 additions & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ graphviz
plopp
pythreejs
orsopy
sciline>=24.6.0
sciline>=25.4.1
scipp>=24.09.1
scippneutron>=24.7.0
scippnexus>=24.9.1
essreduce
esspolarization
pandas
101 changes: 69 additions & 32 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# SHA1:e82c2f6f325de86a068c5252c20acc8ebeb12449
# SHA1:363d6af3a72a5d77a04a3a2b46ae8a1f448ab7e3
#
# This file is autogenerated by pip-compile-multi
# This file was generated by pip-compile-multi.
# To update, run:
#
# pip-compile-multi
# requirements upgrade
#
annotated-types==0.7.0
# via pydantic
asttokens==3.0.0
# via stack-data
click==8.1.8
Expand All @@ -13,51 +15,69 @@ cloudpickle==3.1.1
# via dask
comm==0.2.2
# via ipywidgets
contourpy==1.3.1
contourpy==1.3.2
# via matplotlib
cyclebane==24.10.0
# via sciline
cycler==0.12.1
# via matplotlib
dask==2025.1.0
# via -r base.in
decorator==5.1.1
dask==2025.4.0
# via
# -r base.in
# esspolarization
decorator==5.2.1
# via ipython
essreduce==25.2.0
dnspython==2.7.0
# via email-validator
email-validator==2.2.0
# via scippneutron
esspolarization==25.3.0
# via -r base.in
essreduce==25.4.1
# via
# -r base.in
# esspolarization
exceptiongroup==1.2.2
# via ipython
executing==2.2.0
# via stack-data
fonttools==4.56.0
fonttools==4.57.0
# via matplotlib
fsspec==2025.2.0
fsspec==2025.3.2
# via dask
graphviz==0.20.3
# via -r base.in
h5py==3.12.1
# via
# -r base.in
# esspolarization
h5py==3.13.0
# via
# scippneutron
# scippnexus
idna==3.10
# via email-validator
importlib-metadata==8.6.1
# via dask
ipydatawidgets==4.3.5
# via pythreejs
ipython==8.32.0
ipython==8.35.0
# via ipywidgets
ipywidgets==8.1.5
ipywidgets==8.1.6
# via
# ipydatawidgets
# pythreejs
jedi==0.19.2
# via ipython
jupyterlab-widgets==3.0.13
jupyterlab-widgets==3.0.14
# via ipywidgets
kiwisolver==1.4.8
# via matplotlib
lazy-loader==0.4
# via
# plopp
# scippneutron
locket==1.0.0
# via partd
matplotlib==3.10.0
matplotlib==3.10.1
# via
# mpltoolbox
# plopp
Expand All @@ -67,9 +87,10 @@ mpltoolbox==24.5.1
# via scippneutron
networkx==3.4.2
# via cyclebane
numpy==2.2.2
numpy==1.26.4
# via
# contourpy
# esspolarization
# h5py
# ipydatawidgets
# matplotlib
Expand All @@ -81,9 +102,10 @@ numpy==2.2.2
# scipy
orsopy==1.2.1
# via -r base.in
packaging==24.2
packaging==25.0
# via
# dask
# lazy-loader
# matplotlib
pandas==2.2.3
# via -r base.in
Expand All @@ -93,57 +115,65 @@ partd==1.4.2
# via dask
pexpect==4.9.0
# via ipython
pillow==11.1.0
pillow==11.2.1
# via matplotlib
plopp==24.10.0
plopp==25.4.1
# via
# -r base.in
# scippneutron
prompt-toolkit==3.0.50
prompt-toolkit==3.0.51
# via ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.3
# via stack-data
pydantic==2.11.3
# via scippneutron
pydantic-core==2.33.1
# via pydantic
pygments==2.19.1
# via ipython
pyparsing==3.2.1
pyparsing==3.2.3
# via matplotlib
python-dateutil==2.9.0.post0
# via
# -r base.in
# matplotlib
# pandas
# scippneutron
# scippnexus
pythreejs==2.4.2
# via -r base.in
pytz==2025.1
pytz==2025.2
# via pandas
pyyaml==6.0.2
# via
# dask
# orsopy
sciline==24.10.0
sciline==25.4.1
# via
# -r base.in
# esspolarization
# essreduce
scipp==25.2.0
scipp==25.4.0
# via
# -r base.in
# esspolarization
# essreduce
# scippneutron
# scippnexus
scippneutron==25.1.0
scippneutron==25.2.1
# via
# -r base.in
# essreduce
scippnexus==24.11.1
scippnexus==25.4.0
# via
# -r base.in
# essreduce
# scippneutron
scipy==1.15.1
scipy==1.15.2
# via
# esspolarization
# scippneutron
# scippnexus
six==1.17.0
Expand All @@ -164,13 +194,20 @@ traitlets==5.14.3
# traittypes
traittypes==0.2.1
# via ipydatawidgets
typing-extensions==4.12.2
# via ipython
tzdata==2025.1
typing-extensions==4.13.2
# via
# ipython
# pydantic
# pydantic-core
# sciline
# typing-inspection
typing-inspection==0.4.0
# via pydantic
tzdata==2025.2
# via pandas
wcwidth==0.2.13
# via prompt-toolkit
widgetsnbextension==4.0.13
widgetsnbextension==4.0.14
# via ipywidgets
zipp==3.21.0
# via importlib-metadata
14 changes: 7 additions & 7 deletions requirements/basetest.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# SHA1:54ed0e3deb2d458e91bae14067e84eaad659f5fd
#
# This file is autogenerated by pip-compile-multi
# This file was generated by pip-compile-multi.
# To update, run:
#
# pip-compile-multi
# requirements upgrade
#
certifi==2025.1.31
# via requests
Expand All @@ -13,23 +13,23 @@ exceptiongroup==1.2.2
# via pytest
idna==3.10
# via requests
iniconfig==2.0.0
iniconfig==2.1.0
# via pytest
packaging==24.2
packaging==25.0
# via
# pooch
# pytest
platformdirs==4.3.6
platformdirs==4.3.7
# via pooch
pluggy==1.5.0
# via pytest
pooch==1.8.2
# via -r basetest.in
pytest==8.3.4
pytest==8.3.5
# via -r basetest.in
requests==2.32.3
# via pooch
tomli==2.2.1
# via pytest
urllib3==2.3.0
urllib3==2.4.0
# via requests
20 changes: 10 additions & 10 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# SHA1:6344d52635ea11dca331a3bc6eb1833c4c64d585
#
# This file is autogenerated by pip-compile-multi
# This file was generated by pip-compile-multi.
# To update, run:
#
# pip-compile-multi
# requirements upgrade
#
cachetools==5.5.1
cachetools==5.5.2
# via tox
certifi==2025.1.31
# via requests
Expand All @@ -17,7 +17,7 @@ colorama==0.4.6
# via tox
distlib==0.3.9
# via virtualenv
filelock==3.17.0
filelock==3.18.0
# via
# tox
# virtualenv
Expand All @@ -27,12 +27,12 @@ gitpython==3.1.44
# via -r ci.in
idna==3.10
# via requests
packaging==24.2
packaging==25.0
# via
# -r ci.in
# pyproject-api
# tox
platformdirs==4.3.6
platformdirs==4.3.7
# via
# tox
# virtualenv
Expand All @@ -48,11 +48,11 @@ tomli==2.2.1
# via
# pyproject-api
# tox
tox==4.24.1
tox==4.25.0
# via -r ci.in
typing-extensions==4.12.2
typing-extensions==4.13.2
# via tox
urllib3==2.3.0
urllib3==2.4.0
# via requests
virtualenv==20.29.2
virtualenv==20.30.0
# via tox
Loading