Skip to content

Commit 982f7b3

Browse files
committed
Improve name of helper function
1 parent 8e6dff0 commit 982f7b3

File tree

7 files changed

+18
-17
lines changed

7 files changed

+18
-17
lines changed

docs/api-reference/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
:toctree: ../generated/attributes
1111
1212
providers
13+
with_pixel_mask_filenames
1314
```
1415

1516
### Submodules

docs/user-guide/dream/dream-data-reduction.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
")\n",
9595
"\n",
9696
"pipeline = sciline.Pipeline(providers, params=params)\n",
97-
"pipeline = powder.set_pixel_mask_filenames(pipeline, [])"
97+
"pipeline = powder.with_pixel_mask_filenames(pipeline, [])"
9898
]
9999
},
100100
{

docs/user-guide/sns-instruments/POWGEN_data_reduction.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"source": [
8787
"providers = [*powder.providers, *powgen.providers]\n",
8888
"pipeline = sciline.Pipeline(providers, params=params)\n",
89-
"pipeline = powder.set_pixel_mask_filenames(pipeline, [])"
89+
"pipeline = powder.with_pixel_mask_filenames(pipeline, [])"
9090
]
9191
},
9292
{

src/ess/powder/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
smoothing,
1616
uncertainty,
1717
)
18-
from .masking import set_pixel_mask_filenames
18+
from .masking import with_pixel_mask_filenames
1919

2020
try:
2121
__version__ = importlib.metadata.version(__package__ or __name__)
@@ -43,5 +43,5 @@
4343
"providers",
4444
"smoothing",
4545
"uncertainty",
46-
"set_pixel_mask_filenames",
46+
"with_pixel_mask_filenames",
4747
]

src/ess/powder/masking.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def _merge(*dicts: dict) -> dict:
7373
return {key: value for d in dicts for key, value in d.items()}
7474

7575

76-
def set_pixel_mask_filenames(
76+
def with_pixel_mask_filenames(
7777
workflow: sciline.Pipeline, masks: Iterable[str]
7878
) -> sciline.Pipeline:
7979
"""

tests/dream/geant4_reduction_test.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_can_create_pipeline(providers, params):
7070

7171
def test_pipeline_can_compute_dspacing_result(providers, params):
7272
pipeline = sciline.Pipeline(providers, params=params)
73-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
73+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
7474
result = pipeline.compute(IofDspacing)
7575
assert result.sizes == {
7676
'dspacing': len(params[DspacingBins]) - 1,
@@ -80,7 +80,7 @@ def test_pipeline_can_compute_dspacing_result(providers, params):
8080

8181
def test_workflow_is_deterministic(providers, params):
8282
pipeline = sciline.Pipeline(providers, params=params)
83-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
83+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
8484
# This is Sciline's default scheduler, but we want to be explicit here
8585
scheduler = sciline.scheduler.DaskScheduler()
8686
graph = pipeline.get(IofDspacing, scheduler=scheduler)
@@ -91,7 +91,7 @@ def test_workflow_is_deterministic(providers, params):
9191

9292
def test_pipeline_can_compute_intermediate_results(providers, params):
9393
pipeline = sciline.Pipeline(providers, params=params)
94-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
94+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
9595
result = pipeline.compute(NormalizedByProtonCharge[SampleRun])
9696
assert set(result.dims) == {'segment', 'wire', 'counter', 'strip', 'module'}
9797

@@ -101,7 +101,7 @@ def test_pipeline_group_by_two_theta(providers, params):
101101
dim='two_theta', unit='rad', start=0.8, stop=2.4, num=17
102102
)
103103
pipeline = sciline.Pipeline(providers, params=params)
104-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
104+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
105105
result = pipeline.compute(IofDspacingTwoTheta)
106106
assert result.sizes == {
107107
'two_theta': 16,
@@ -116,7 +116,7 @@ def test_pipeline_wavelength_masking(providers, params):
116116
wmax = sc.scalar(0.21, unit="angstrom")
117117
params[WavelengthMask] = lambda x: (x > wmin) & (x < wmax)
118118
pipeline = sciline.Pipeline(providers, params=params)
119-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
119+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
120120
masked_sample = pipeline.compute(MaskedData[SampleRun])
121121
assert 'wavelength' in masked_sample.bins.masks
122122
sum_in_masked_region = (
@@ -135,7 +135,7 @@ def test_pipeline_two_theta_masking(providers, params):
135135
tmax = sc.scalar(1.2, unit="rad")
136136
params[TwoThetaMask] = lambda x: (x > tmin) & (x < tmax)
137137
pipeline = sciline.Pipeline(providers, params=params)
138-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
138+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
139139
masked_sample = pipeline.compute(MaskedData[SampleRun])
140140
assert 'two_theta' in masked_sample.bins.masks
141141
sum_in_masked_region = (

tests/powder/external/powgen/powgen_reduction_test.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def test_can_create_pipeline(providers, params):
5656

5757
def test_pipeline_can_compute_dspacing_result(providers, params):
5858
pipeline = sciline.Pipeline(providers, params=params)
59-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
59+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
6060
result = pipeline.compute(IofDspacing)
6161
assert result.sizes == {
6262
'dspacing': len(params[DspacingBins]) - 1,
@@ -66,7 +66,7 @@ def test_pipeline_can_compute_dspacing_result(providers, params):
6666

6767
def test_workflow_is_deterministic(providers, params):
6868
pipeline = sciline.Pipeline(providers, params=params)
69-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
69+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
7070
# This is Sciline's default scheduler, but we want to be explicit here
7171
scheduler = sciline.scheduler.DaskScheduler()
7272
graph = pipeline.get(IofDspacing, scheduler=scheduler)
@@ -77,7 +77,7 @@ def test_workflow_is_deterministic(providers, params):
7777

7878
def test_pipeline_can_compute_intermediate_results(providers, params):
7979
pipeline = sciline.Pipeline(providers, params=params)
80-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
80+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
8181
result = pipeline.compute(NormalizedByProtonCharge[SampleRun])
8282
assert set(result.dims) == {'bank', 'column', 'row'}
8383

@@ -87,7 +87,7 @@ def test_pipeline_group_by_two_theta(providers, params):
8787
dim='two_theta', unit='deg', start=25.0, stop=90.0, num=16
8888
).to(unit='rad')
8989
pipeline = sciline.Pipeline(providers, params=params)
90-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
90+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
9191
result = pipeline.compute(IofDspacingTwoTheta)
9292
assert result.sizes == {
9393
'two_theta': 15,
@@ -102,7 +102,7 @@ def test_pipeline_wavelength_masking(providers, params):
102102
wmax = sc.scalar(0.21, unit="angstrom")
103103
params[WavelengthMask] = lambda x: (x > wmin) & (x < wmax)
104104
pipeline = sciline.Pipeline(providers, params=params)
105-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
105+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
106106
masked_sample = pipeline.compute(MaskedData[SampleRun])
107107
assert 'wavelength' in masked_sample.bins.masks
108108
sum_in_masked_region = (
@@ -121,7 +121,7 @@ def test_pipeline_two_theta_masking(providers, params):
121121
tmax = sc.scalar(1.0, unit="rad")
122122
params[TwoThetaMask] = lambda x: (x > tmin) & (x < tmax)
123123
pipeline = sciline.Pipeline(providers, params=params)
124-
pipeline = powder.set_pixel_mask_filenames(pipeline, [])
124+
pipeline = powder.with_pixel_mask_filenames(pipeline, [])
125125
masked_sample = pipeline.compute(MaskedData[SampleRun])
126126
assert 'two_theta' in masked_sample.masks
127127
sum_in_masked_region = (

0 commit comments

Comments
 (0)