Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/xas_toolbox/xas/corrections/pre_edge.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,13 @@ def norm_and_flatten(
ynorm = ynorm.T

if flatten is True:
ie0 = np.array(ie0).flatten()
yflat = ynorm - resid.T
for i in range(y.shape[0]):
yflat[i, :] += resid[np.array(ie0)[i], i]
yflat[i, : np.array(ie0)[i]] = ynorm[i, : np.array(ie0)[i]]
yflat[i, :] += resid[np.array(ie0, dtype=int)[i], i]
yflat[i, : np.array(ie0, dtype=int)[i]] = ynorm[
i, : np.array(ie0, dtype=int)[i]
]

if yflat.shape != y.shape:
yflat = yflat.T
Expand Down
30 changes: 20 additions & 10 deletions src/xas_toolbox/xas/edges/find_e0.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import logging
from functools import partial

import numpy as np
from larch.math import remove_nans2
Expand Down Expand Up @@ -47,16 +46,27 @@ def calc_e0(x: np.ndarray, y: np.ndarray, sigma: float = 5):
if len(edge_coords) > 1:
edge_coords = _filter_edge_coords(edge_coords, x, post)
edge_energy = [x[e] for e in edge_coords]
edge_number = len(edge_coords)
edge_number: int | list[int] = len(edge_coords)
else:
edge_coords = [np.where(yf[i, :] == 1)[0] for i in range(y.shape[0])]
edge_coords = np.apply_along_axis(
partial(_filter_edge_coords, energy=x, min_spacing=post), 1, edge_coords
)
edge_energy = [x[e] for i in range(y.shape[0]) for e in edge_coords[i]]
edge_number = [len(e) for e in edge_coords]

return edge_energy, np.array(edge_coords, dtype=int), edge_number
edge_coords = []
for i in range(y.shape[0]):
tmp = np.where(yf[i, :] == 1)[0]
ec = _filter_edge_coords(coords=tmp, energy=x, min_spacing=post)
edge_coords.append(ec)

edge_energy = []
edge_number = []

for i in range(len(edge_coords)):
edge_number.append(len(edge_coords[i]))
if len(edge_coords[i]) > 1:
for e in edge_coords[i]:
edge_energy.append(x[e])
else:
edge_energy.append(x[edge_coords[i]])
edge_energy = list(np.array(edge_energy).flatten())

return edge_energy, edge_coords, edge_number


def get_edge_symbol(
Expand Down
11 changes: 11 additions & 0 deletions tests/test_e0_detection.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,14 @@ def test_detect_decreasing_edge_height():
e0, en, ec = calc_e0(spectrum.energy, ytmp)
ytmp *= 0.5
assert ec == 1


def test_e0_stack():
data = make_fake_spectrum("FeO2", "Fe", "K", nscans=1000)
e0, ec, eno = calc_e0(data.energy, data.mu)
assert isinstance(e0, list)
assert len(e0) == data.mu.shape[0]
assert isinstance(ec, list)
assert len(ec) == data.mu.shape[0]
assert isinstance(eno, list)
assert len(eno) == data.mu.shape[0]
Loading