From f1af357fa1eb1694298e05f717203ae0348129ea Mon Sep 17 00:00:00 2001
From: Tamas Gal <tgal@km3net.de>
Date: Thu, 10 Dec 2020 23:51:22 +0100
Subject: [PATCH] Fix usr
---
tests/test_offline.py | 29 ++------------------
tests/test_tools.py | 61 +++++--------------------------------------
2 files changed, 8 insertions(+), 82 deletions(-)
diff --git a/tests/test_offline.py b/tests/test_offline.py
index 729f5c7..99f6ef6 100644
--- a/tests/test_offline.py
+++ b/tests/test_offline.py
@@ -8,6 +8,7 @@ from km3net_testdata import data_path
from km3io import OfflineReader
from km3io.offline import Header
+from km3io.tools import usr
OFFLINE_FILE = OfflineReader(data_path("offline/km3net_offline.root"))
OFFLINE_USR = OfflineReader(data_path("offline/usr-sample.root"))
@@ -208,14 +209,12 @@ class TestOfflineEvents(unittest.TestCase):
assert 8 == len(first_tracks.rec_stages)
assert 8 == len(first_tracks.lik)
- @unittest.skip
def test_iteration(self):
i = 0
for event in self.events:
i += 1
assert 10 == i
- @unittest.skip
def test_iteration_2(self):
n_hits = [len(e.hits.id) for e in self.events]
assert np.allclose(n_hits, ak.num(self.events.hits.id, axis=1).tolist())
@@ -444,11 +443,9 @@ class TestUsr(unittest.TestCase):
def setUp(self):
self.f = OFFLINE_USR
- @unittest.skip
def test_str_flat(self):
print(self.f.events.usr)
- @unittest.skip
def test_keys_flat(self):
self.assertListEqual(
[
@@ -470,29 +467,7 @@ class TestUsr(unittest.TestCase):
"NGeometryVetoHits",
"ClassficationScore",
],
- self.f.events.usr.keys().tolist(),
- )
-
- @unittest.skip
- def test_getitem_flat(self):
- assert np.allclose(
- [118.6302815337638, 44.33580521344907, 99.93916717621543],
- self.f.events.usr["CoC"].tolist(),
- )
- assert np.allclose(
- [37.51967774166617, -10.280346193553832, 13.67595659707355],
- self.f.events.usr["DeltaPosZ"].tolist(),
- )
-
- @unittest.skip
- def test_attributes_flat(self):
- assert np.allclose(
- [118.6302815337638, 44.33580521344907, 99.93916717621543],
- self.f.events.usr.CoC.tolist(),
- )
- assert np.allclose(
- [37.51967774166617, -10.280346193553832, 13.67595659707355],
- self.f.events.usr.DeltaPosZ.tolist(),
+ self.f.events.usr_names[0].tolist(),
)
diff --git a/tests/test_tools.py b/tests/test_tools.py
index 9ea78fa..43d12ef 100644
--- a/tests/test_tools.py
+++ b/tests/test_tools.py
@@ -549,69 +549,20 @@ class TestIsCC(unittest.TestCase):
class TestUsr(unittest.TestCase):
- def setUp(self):
- self.f = OFFLINE_USR
-
- def test_str_flat(self):
- print(self.f.events.usr)
-
- def test_keys_flat(self):
- self.assertListEqual(
- [
- "RecoQuality",
- "RecoNDF",
- "CoC",
- "ToT",
- "ChargeAbove",
- "ChargeBelow",
- "ChargeRatio",
- "DeltaPosZ",
- "FirstPartPosZ",
- "LastPartPosZ",
- "NSnapHits",
- "NTrigHits",
- "NTrigDOMs",
- "NTrigLines",
- "NSpeedVetoHits",
- "NGeometryVetoHits",
- "ClassficationScore",
- ],
- self.f.events.usr_names[0].tolist(),
- )
- def test_getitem_flat(self):
+ def test_event_usr(self):
assert np.allclose(
[118.6302815337638, 44.33580521344907, 99.93916717621543],
- usr(self.f.events, "CoC").tolist(),
+ usr(OFFLINE_USR.events, "CoC").tolist(),
)
assert np.allclose(
[37.51967774166617, -10.280346193553832, 13.67595659707355],
- usr(self.f.events, "DeltaPosZ").tolist(),
+ usr(OFFLINE_USR.events, "DeltaPosZ").tolist(),
)
-
-class TestMcTrackUsr(unittest.TestCase):
- def setUp(self):
- self.f = OFFLINE_MC_TRACK_USR
-
- def test_usr_names(self):
- n_tracks = len(self.f.events)
- for i in range(3):
- self.assertListEqual(
- ["bx", "by", "ichan", "cc"],
- self.f.events.mc_tracks.usr_names[i][0].tolist(),
- )
- self.assertListEqual(
- ["energy_lost_in_can"],
- self.f.events.mc_tracks.usr_names[i][1].tolist(),
- )
-
- def test_usr(self):
+ def test_mc_tracks_usr(self):
assert np.allclose(
- [0.0487, 0.0588, 3, 2],
- self.f.events.mc_tracks.usr[0][0].tolist(),
+ [0.0487],
+ usr(OFFLINE_MC_TRACK_USR.mc_tracks[0], "bx").tolist(),
atol=0.0001,
)
- assert np.allclose(
- [0.147, 0.4, 3, 2], self.f.events.mc_tracks.usr[1][0].tolist(), atol=0.001
- )
--
GitLab