From e4b2e7bc768108f12c2b9d3539919a8bbe7351f5 Mon Sep 17 00:00:00 2001
From: Johannes Schumann <johannes.schumann@fau.de>
Date: Mon, 3 Apr 2023 17:50:34 +0200
Subject: [PATCH] yapf
---
km3buu/output.py | 57 +++++++++++++++++++++-----------
km3buu/tests/test_propagation.py | 3 +-
2 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/km3buu/output.py b/km3buu/output.py
index df74a19..faa94ff 100644
--- a/km3buu/output.py
+++ b/km3buu/output.py
@@ -684,27 +684,44 @@ def write_detector_file(gibuu_output,
evt.w.push_back(-1.0) # w3 (= w2*flux)
# Event Information (w2list)
evt.w2list.resize(W2LIST_LENGTH)
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_PS"]] = global_generation_weight
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_EG"]] = gibuu_output.flux_index
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_XSEC_MEAN"]] = mean_xsec_func(
- event.lepIn_E)
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_XSEC"]] = event.xsec
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_TARGETA"]] = gibuu_output.A
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_TARGETZ"]] = gibuu_output.Z
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_BX"]] = bjorkenx[mc_event_id]
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_BY"]] = bjorkeny[mc_event_id]
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_CC"]] = ichan
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_ICHAN"]] = SCATTERING_TYPE_TO_GENIE[
- event.evType]
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_VERINCAN"]] = 1
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_LEPINCAN"]] = 1
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_GIBUU_WEIGHT"]] = event.weight
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_GIBUU_SCAT_TYPE"]] = event.evType
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_PS"]] = global_generation_weight
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_EG"]] = gibuu_output.flux_index
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_XSEC_MEAN"]] = mean_xsec_func(event.lepIn_E)
+ evt.w2list[km3io.definitions.
+ w2list_km3buu["W2LIST_KM3BUU_XSEC"]] = event.xsec
+ evt.w2list[km3io.definitions.
+ w2list_km3buu["W2LIST_KM3BUU_TARGETA"]] = gibuu_output.A
+ evt.w2list[km3io.definitions.
+ w2list_km3buu["W2LIST_KM3BUU_TARGETZ"]] = gibuu_output.Z
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_BX"]] = bjorkenx[mc_event_id]
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_BY"]] = bjorkeny[mc_event_id]
+ evt.w2list[
+ km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_CC"]] = ichan
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_ICHAN"]] = SCATTERING_TYPE_TO_GENIE[
+ event.evType]
+ evt.w2list[
+ km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_VERINCAN"]] = 1
+ evt.w2list[
+ km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_LEPINCAN"]] = 1
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_GIBUU_WEIGHT"]] = event.weight
+ evt.w2list[km3io.definitions.w2list_km3buu[
+ "W2LIST_KM3BUU_GIBUU_SCAT_TYPE"]] = event.evType
# TODO
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_DXSEC"]] = np.nan
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_COLUMN_DEPTH"]] = np.nan
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_P_EARTH"]] = np.nan
- evt.w2list[km3io.definitions.w2list_km3buu["W2LIST_KM3BUU_WATER_INT_LEN"]] = np.nan
+ evt.w2list[km3io.definitions.
+ w2list_km3buu["W2LIST_KM3BUU_DXSEC"]] = np.nan
+ evt.w2list[km3io.definitions.
+ w2list_km3buu["W2LIST_KM3BUU_COLUMN_DEPTH"]] = np.nan
+ evt.w2list[km3io.definitions.
+ w2list_km3buu["W2LIST_KM3BUU_P_EARTH"]] = np.nan
+ evt.w2list[km3io.definitions.
+ w2list_km3buu["W2LIST_KM3BUU_WATER_INT_LEN"]] = np.nan
timestamp = event_times[total_id]
# Direction
diff --git a/km3buu/tests/test_propagation.py b/km3buu/tests/test_propagation.py
index 403b79e..abfc659 100644
--- a/km3buu/tests/test_propagation.py
+++ b/km3buu/tests/test_propagation.py
@@ -87,8 +87,7 @@ class TestMuonPropagation(unittest.TestCase):
decimal=3)
np.testing.assert_array_almost_equal(np.array(self.sec.Py), [-54.519],
decimal=3)
- np.testing.assert_array_almost_equal(np.array(self.sec.Pz),
- [-0.],
+ np.testing.assert_array_almost_equal(np.array(self.sec.Pz), [-0.],
decimal=3)
def test_secondary_types(self):
--
GitLab