Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
edcf4c2
feat: more flexible helper for batch reduction
jokasimr May 5, 2025
7dbbf2c
fix: remove duplicate
jokasimr May 5, 2025
25add6b
update docs
jokasimr May 6, 2025
eda422e
spelling
jokasimr May 6, 2025
98a9389
fix: add theta to reference, can be useful in some contexts
jokasimr May 6, 2025
743743a
fix: handle case when SampleRotation etc are set in workflow
jokasimr May 6, 2025
45bcd0e
fix: add parameters before setting filenames
jokasimr May 6, 2025
7fb806b
docs: fix
jokasimr May 6, 2025
f097188
tests
jokasimr May 6, 2025
4f9cbd2
Merge branch 'main' into helper-for-reducing-multiple
jokasimr May 6, 2025
7c1750d
Merge branch 'main' into helper-for-reducing-multiple
jokasimr May 20, 2025
1926849
Merge remote-tracking branch 'origin/main' into helper-for-reducing-m…
jokasimr Jun 4, 2025
fc4214a
Merge branch 'main' into helper-for-reducing-multiple
jokasimr Jun 11, 2025
f158ac2
add scaling factor to Amor workflow
nvaytet Jul 3, 2025
268f487
map on unscaled data
nvaytet Jul 3, 2025
eb56472
add batch_processor and WorkflowCollection to the tools
nvaytet Jul 15, 2025
9637acd
udpate Amor notebook to use workflow collection
nvaytet Jul 15, 2025
2d2871d
fix critical_edge parameter in scaling
nvaytet Jul 15, 2025
2a5120d
remove commented code
nvaytet Jul 15, 2025
84167a5
Merge branch 'main' into pipeline-collection
nvaytet Aug 5, 2025
aced050
add tests for wf collection
nvaytet Aug 5, 2025
504405b
improve docstring
nvaytet Aug 5, 2025
7e0c24d
start fixing existing unit tests
nvaytet Aug 6, 2025
4bd66d3
refactor first tests slightly
nvaytet Aug 6, 2025
9f14288
simplify critical edge handling
nvaytet Aug 7, 2025
fff9b4e
update/fix tools tests
nvaytet Aug 7, 2025
a8d1b3a
fix scaling for a single workflow and fix amor pipeline tests
nvaytet Aug 7, 2025
31c437f
Merge branch 'main' into pipeline-collection
nvaytet Aug 7, 2025
7567565
cleanup
nvaytet Aug 7, 2025
7f884fb
do not fail if UnscaledReducibleData is not in graph
nvaytet Aug 7, 2025
2dea8de
modify the WorkflowCollection to just use cyclebane mapping under the…
nvaytet Aug 13, 2025
f181b41
formatting
nvaytet Aug 13, 2025
a23c007
update amor notebook
nvaytet Aug 13, 2025
ccfb1b7
debugging compute multiple
nvaytet Aug 15, 2025
c8e43a9
fix compute
nvaytet Aug 19, 2025
459a408
Revert "fix compute"
nvaytet Sep 1, 2025
99ea9d7
Revert "debugging compute multiple"
nvaytet Sep 1, 2025
745c68d
Revert "update amor notebook"
nvaytet Sep 1, 2025
9b9797c
Revert "formatting"
nvaytet Sep 1, 2025
76aa1cf
Revert "modify the WorkflowCollection to just use cyclebane mapping u…
nvaytet Sep 1, 2025
ae9b9ac
move workflow initialization inside the WorkflowCollection
nvaytet Sep 1, 2025
7f914f9
move toward using pandas dataframes
nvaytet Sep 1, 2025
c44f79b
make DataTable
nvaytet Sep 2, 2025
7a1e05f
go back to making workflowcollection just a collection of workflows
nvaytet Sep 16, 2025
89facf5
fix collection API, also with visualize
nvaytet Sep 16, 2025
efd90aa
need to fix output format of compute mapped
nvaytet Sep 16, 2025
044a4d1
fix batch compute for mapped/reduced nodes
nvaytet Sep 17, 2025
e2ba030
static
nvaytet Sep 17, 2025
f016474
cleanup
nvaytet Sep 17, 2025
40d2e9e
Merge branch 'main' into workflow-collection
nvaytet Sep 17, 2025
4f28af5
revert changes in with_filenames
nvaytet Sep 17, 2025
4491627
fix tests
nvaytet Sep 17, 2025
536e886
fix more tests
nvaytet Sep 17, 2025
4b5c645
fix amor notebooks
nvaytet Sep 17, 2025
09362fd
remvove commented code
nvaytet Sep 17, 2025
42aa8cb
more cleanup
nvaytet Sep 17, 2025
7212ad6
remove unused imports
nvaytet Sep 17, 2025
5d17884
remove caching of intermediate results in scaling for overlap functio…
nvaytet Sep 18, 2025
42e132c
improve graph visualization by stacking SVGs
nvaytet Sep 18, 2025
872deee
rename to BatchProcessor and fix unit tests
nvaytet Sep 18, 2025
8cb0b2b
comment interactive figs
nvaytet Sep 18, 2025
e35a77d
remove UnscaledReducibleData and ScalingFactorForOverlap from workflo…
nvaytet Sep 25, 2025
2f9f51f
update notebook
nvaytet Sep 25, 2025
11627a1
fix type hint
nvaytet Sep 25, 2025
d66b019
disallow setting a single value on BatchProcessor and always require …
nvaytet Sep 26, 2025
ba7b8b0
fix some tests
nvaytet Sep 26, 2025
68c4530
remove unused import
nvaytet Sep 26, 2025
28f9fbe
fix remaining tests
nvaytet Sep 26, 2025
19a3f1b
use the fact that we are returning results as DataGroup for plotting
nvaytet Sep 26, 2025
34198cf
add batch_compute helper and simple notebook
nvaytet Sep 26, 2025
f9ffa25
add test on amor workflow with batch_compute that concatenates event …
nvaytet Sep 26, 2025
66a4632
add simple notebook to docs TOC
nvaytet Sep 26, 2025
a74f54b
static analysis
nvaytet Sep 26, 2025
2683452
return to single arg api for batch_compute for scaling_to_overlap
nvaytet Sep 26, 2025
ad61d69
expand docstrings
nvaytet Sep 26, 2025
a1a2b98
remove automatic caching of reference run, as it is not always guaran…
nvaytet Sep 26, 2025
7607214
rename notebooks to normal and advanced
nvaytet Sep 26, 2025
027bfa7
remove unused imports
nvaytet Sep 26, 2025
0cc001a
fix notebook
nvaytet Sep 26, 2025
f0578c4
fix type hint
nvaytet Sep 29, 2025
c5237b4
remove warning filtering which does not seem to be needed, and add a …
nvaytet Sep 29, 2025
0297493
cache reference result in Amor simple notebook to avoid computing it …
nvaytet Sep 29, 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
606 changes: 606 additions & 0 deletions docs/user-guide/amor/amor-reduction-advanced.ipynb

Large diffs are not rendered by default.

326 changes: 58 additions & 268 deletions docs/user-guide/amor/amor-reduction.ipynb

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/user-guide/amor/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
maxdepth: 1
---
amor-reduction
amor-reduction-advanced
compare-to-eos
workflow-widget
```
2 changes: 1 addition & 1 deletion src/ess/amor/load.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
NeXusComponent,
NeXusDetectorName,
ProtonCurrent,
RawChopper,
RawSampleRotation,
RunType,
SampleRotation,
Expand All @@ -29,7 +30,6 @@
ChopperFrequency,
ChopperPhase,
ChopperSeparation,
RawChopper,
)


Expand Down
1 change: 1 addition & 0 deletions src/ess/amor/normalization.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def evaluate_reference_at_sample_coords(
ref = ref.transform_coords(
(
"Q",
"theta",
"wavelength_resolution",
"sample_size_resolution",
"angular_resolution",
Expand Down
4 changes: 0 additions & 4 deletions src/ess/amor/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,4 @@ class ChopperSeparation(sciline.Scope[RunType, sc.Variable], sc.Variable):
"""Distance between the two choppers."""


class RawChopper(sciline.Scope[RunType, sc.DataGroup], sc.DataGroup):
"""Chopper data loaded from nexus file."""


GravityToggle = NewType("GravityToggle", bool)
17 changes: 16 additions & 1 deletion src/ess/reflectometry/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@

from . import conversions, corrections, figures, normalization, orso
from .load import load_reference, save_reference
from .tools import (
BatchProcessor,
batch_compute,
batch_processor,
scale_for_reflectivity_overlap,
)

providers = (
*corrections.providers,
Expand All @@ -31,9 +37,18 @@

del importlib


__all__ = [
"BatchProcessor",
"__version__",
"batch_compute",
"batch_processor",
"conversions",
"corrections",
"figures",
"load_reference",
"normalization",
"orso",
"providers",
"save_reference",
"scale_for_reflectivity_overlap",
]
Loading
Loading