From a34a4fb8cec2d5366ba1c84e0f0e1b72653b8411 Mon Sep 17 00:00:00 2001 From: Aaron Finke Date: Wed, 12 Mar 2025 20:04:44 +0100 Subject: [PATCH 1/4] remove all zero lines, not just the first one --- src/ess/nmx/mcstas/load.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ess/nmx/mcstas/load.py b/src/ess/nmx/mcstas/load.py index b989d092..de3f7f4c 100644 --- a/src/ess/nmx/mcstas/load.py +++ b/src/ess/nmx/mcstas/load.py @@ -49,13 +49,11 @@ def load_event_data_bank_name( def _exclude_zero_events(data: sc.Variable) -> sc.Variable: """Exclude events with zero counts from the data. - McStas can add an extra event line containing 0,0,0,0,0,0 - This line should not be included so we skip it. + McStas can add extra event lines containing 0,0,0,0,0,0 + These lines should not be included so we skip it. """ - if (data.values[0] == 0).all(): - data = data["event", 1:] - else: - data = data + nonzeros = data.values[(data.values!=0).all(axis=1)] + data = sc.array(dims=['event', 'dim_1'], values=nonzeros, unit=None ) return data From 80913b2c52cd06cca34abb4ec331de21a3c09547 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 19:17:24 +0000 Subject: [PATCH 2/4] Apply automatic formatting --- src/ess/nmx/mcstas/load.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ess/nmx/mcstas/load.py b/src/ess/nmx/mcstas/load.py index de3f7f4c..a59563a7 100644 --- a/src/ess/nmx/mcstas/load.py +++ b/src/ess/nmx/mcstas/load.py @@ -52,8 +52,8 @@ def _exclude_zero_events(data: sc.Variable) -> sc.Variable: McStas can add extra event lines containing 0,0,0,0,0,0 These lines should not be included so we skip it. """ - nonzeros = data.values[(data.values!=0).all(axis=1)] - data = sc.array(dims=['event', 'dim_1'], values=nonzeros, unit=None ) + nonzeros = data.values[(data.values != 0).all(axis=1)] + data = sc.array(dims=['event', 'dim_1'], values=nonzeros, unit=None) return data From fff2d5377076a231c30e89c237ef7dbbd6877357 Mon Sep 17 00:00:00 2001 From: Sunyoung Yoo Date: Thu, 13 Mar 2025 09:11:39 +0100 Subject: [PATCH 3/4] Update src/ess/nmx/mcstas/load.py --- src/ess/nmx/mcstas/load.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ess/nmx/mcstas/load.py b/src/ess/nmx/mcstas/load.py index a59563a7..05284134 100644 --- a/src/ess/nmx/mcstas/load.py +++ b/src/ess/nmx/mcstas/load.py @@ -52,8 +52,7 @@ def _exclude_zero_events(data: sc.Variable) -> sc.Variable: McStas can add extra event lines containing 0,0,0,0,0,0 These lines should not be included so we skip it. """ - nonzeros = data.values[(data.values != 0).all(axis=1)] - data = sc.array(dims=['event', 'dim_1'], values=nonzeros, unit=None) + data = data[(data!=sc.scalar(0., unit=data.unit)).any(dim="dim_1")] return data From 83903f98b0a2d76ee93c318c40163a48f982e58b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Thu, 13 Mar 2025 08:12:12 +0000 Subject: [PATCH 4/4] Apply automatic formatting --- src/ess/nmx/mcstas/load.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ess/nmx/mcstas/load.py b/src/ess/nmx/mcstas/load.py index 05284134..186e671b 100644 --- a/src/ess/nmx/mcstas/load.py +++ b/src/ess/nmx/mcstas/load.py @@ -52,7 +52,7 @@ def _exclude_zero_events(data: sc.Variable) -> sc.Variable: McStas can add extra event lines containing 0,0,0,0,0,0 These lines should not be included so we skip it. """ - data = data[(data!=sc.scalar(0., unit=data.unit)).any(dim="dim_1")] + data = data[(data != sc.scalar(0.0, unit=data.unit)).any(dim="dim_1")] return data