Skip to content
Merged
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
6 changes: 5 additions & 1 deletion src/jade/post/manipulate_tally.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ def groupby(tally: pd.DataFrame, by: str, action: str) -> pd.DataFrame:
# Valid both for sum and mean
error = pd.Series(
np.sqrt(((tally["Error"] * tally["Value"]) ** 2).sum())
/ tally["Value"].sum(),
/ tally["Value"].sum()
if tally["Value"].sum() != 0
else 0,
name="Error",
)
else:
Expand All @@ -181,6 +183,8 @@ def groupby(tally: pd.DataFrame, by: str, action: str) -> pd.DataFrame:
# Valid both for sum and mean
err = (
np.sqrt(np.sum((subset_error * subset_value) ** 2)) / subset_value.sum()
if subset_value.sum() != 0
else 0
)
rows.append(err)
error = pd.Series(rows, name="Error")
Expand Down
26 changes: 14 additions & 12 deletions tests/post/test_manipulate_tally.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
divide_by_bin,
format_decimals,
gaussian_broadening,
volume,
mass,
groupby,
mass,
no_action,
no_concat,
ratio,
Expand All @@ -30,6 +29,7 @@
subtract_tallies,
sum_tallies,
tof_to_energy,
volume,
)


Expand Down Expand Up @@ -200,27 +200,28 @@ def test_add_column_with_dict():
pd.testing.assert_frame_equal(result, expected)


def test_groupby():
def test_groupby(recwarn):
data = {
"Energy": [1, 1, 2, 2],
"Value": [1, 2, 3, 4],
"Error": [0.1, 0.2, 0.3, 0.1],
"Energy": [1, 1, 2, 2, 3, 3],
"Value": [1, 2, 3, 4, 0, 0],
"Error": [0.1, 0.2, 0.3, 0.1, 0.0, 0.0],
}
df = pd.DataFrame(data)

result = groupby(df.copy(), "Energy", "sum")
assert (result["Value"] == [3, 7]).all()
assert (result["Value"] == [3, 7, 0]).all()
assert (
result["Error"].iloc[0]
== np.sqrt((0.1 * 1) ** 2 + (0.2 * 2) ** 2) / result["Value"].iloc[0]
)
result = groupby(df.copy(), "Energy", "mean")
assert (result["Value"] == [1.5, 3.5]).all()
assert (result["Value"] == [1.5, 3.5, 0.0]).all()
result = groupby(df.copy(), "Energy", "max")
assert (result["Value"] == [2, 4]).all()
assert (result["Error"] == [0.2, 0.1]).all()
assert (result["Value"] == [2, 4, 0]).all()
assert (result["Error"] == [0.2, 0.1, 0.0]).all()
result = groupby(df.copy(), "Energy", "min")
assert (result["Value"] == [1, 3]).all()
assert (result["Error"] == [0.1, 0.3]).all()
assert (result["Value"] == [1, 3, 0]).all()
assert (result["Error"] == [0.1, 0.3, 0.0]).all()
result = groupby(df.copy(), "all", "sum")
assert result["Value"].iloc[0] == 10
assert (
Expand All @@ -229,6 +230,7 @@ def test_groupby():
/ result["Value"].iloc[0]
)
assert len(result) == 1
assert len(recwarn) == 0 # If any warning is raised, the test fails


def test_delete_cols():
Expand Down
Loading