Skip to content
Snippets Groups Projects
Commit 79028491 authored by Laurent Mercadier's avatar Laurent Mercadier
Browse files

Merge branch 'ufunc_xgm' into 'master'

replace xarray ufunc by numpy ufunc

Closes #56

See merge request !189
parents a1a4c618 c0ee8593
No related branches found
No related tags found
1 merge request!189replace xarray ufunc by numpy ufunc
...@@ -15,6 +15,7 @@ unreleased ...@@ -15,6 +15,7 @@ unreleased
- fix :issue:`57` adds target mono energy mnemonic - fix :issue:`57` adds target mono energy mnemonic
- fix :issue:`55` implementingd dask auto rechunking in notebooks - fix :issue:`55` implementingd dask auto rechunking in notebooks
- fix :issue:`53` wrong flat field correction sometimes being calculated - fix :issue:`53` wrong flat field correction sometimes being calculated
- fix :issue:`56` future warning on xarray.ufuncs :mr:`189`
- **Improvements** - **Improvements**
......
...@@ -146,7 +146,7 @@ def align_xgm_array(xgm_arr, bpt): ...@@ -146,7 +146,7 @@ def align_xgm_array(xgm_arr, bpt):
compute_sa3 = True compute_sa3 = True
mask_sa1 = is_sase_1(bpt.sel(trainId=valid_tid)) mask_sa1 = is_sase_1(bpt.sel(trainId=valid_tid))
mask_sa3 = is_sase_3(bpt.sel(trainId=valid_tid)) mask_sa3 = is_sase_3(bpt.sel(trainId=valid_tid))
mask = xr.ufuncs.logical_or(mask_sa1, mask_sa3) mask = np.logical_or(mask_sa1, mask_sa3)
tid = mask.where(mask.sum(dim='pulse_slot') > 0, tid = mask.where(mask.sum(dim='pulse_slot') > 0,
drop=True).trainId drop=True).trainId
mask_sa1 = mask_sa1.sel(trainId=tid).rename({'pulse_slot': 'sa1_pId'}) mask_sa1 = mask_sa1.sel(trainId=tid).rename({'pulse_slot': 'sa1_pId'})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment