put reader for event table into Resource class

cherenkov-plenoscope · Jun 20, 2024 · 22c0bec · 22c0bec
1 parent fb0fa19
commit 22c0bec
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 70 deletions.
diff --git a/plenoirf/summary/__init__.py b/plenoirf/summary/__init__.py
@@ -135,6 +135,18 @@ def analysis(self):
                 self._analysis = json_utils.loads(fin.read())
         return self._analysis
 
+    def read_event_table(self, particle_key):
+        return snt.read(
+            path=os.path.join(
+                self.plenoirf_dir,
+                "response",
+                self.instrument_key,
+                self.site_key,
+                particle_key,
+                "event_table.tar",
+            )
+        )
+
     def __repr__(self):
         return f"{self.__class__.__name__}()"
 

diff --git a/plenoirf/summary/scripts/0030_splitting_train_and_test_sample.py b/plenoirf/summary/scripts/0030_splitting_train_and_test_sample.py
@@ -12,16 +12,7 @@
 os.makedirs(paths["out_dir"], exist_ok=True)
 
 for pk in res.PARTICLES:
-    event_table = snt.read(
-        path=os.path.join(
-            paths["plenoirf_dir"],
-            "response",
-            res.instrument_key,
-            res.site_key,
-            pk,
-            "event_table.tar",
-        )
-    )
+    event_table = res.read_event_table(particle_key=pk)
 
     train_idxs, test_idxs = sklearn.model_selection.train_test_split(
         event_table["primary"][snt.IDX],

diff --git a/plenoirf/summary/scripts/0040_weights_from_thrown_to_expected_energy_spectrum.py b/plenoirf/summary/scripts/0040_weights_from_thrown_to_expected_energy_spectrum.py
@@ -80,16 +80,7 @@
     thrown_spectrum["rates"][pk] = {}
     energy_ranges[pk] = {}
 
-    _table = snt.read(
-        path=os.path.join(
-            paths["plenoirf_dir"],
-            "response",
-            res.instrument_key,
-            res.site_key,
-            pk,
-            "event_table.tar",
-        )
-    )
+    _table = res.read_event_table(particle_key=pk)
 
     thrown_spectrum["rates"][pk] = np.histogram(
         _table["primary"]["energy_GeV"],

diff --git a/plenoirf/summary/scripts/0054_passing_trigger_if_only_accepting_not_rejecting.py b/plenoirf/summary/scripts/0054_passing_trigger_if_only_accepting_not_rejecting.py
@@ -27,16 +27,7 @@
     pk_dir = os.path.join(paths["out_dir"], pk)
     os.makedirs(pk_dir, exist_ok=True)
 
-    event_table = snt.read(
-        path=os.path.join(
-            paths["plenoirf_dir"],
-            "response",
-            res.instrument_key,
-            res.site_key,
-            pk,
-            "event_table.tar",
-        )
-    )
+    event_table = res.read_event_table(particle_key=pk)
 
     idx_pasttrigger = irf.analysis.light_field_trigger_modi.make_indices(
         trigger_table=event_table["trigger"],

diff --git a/plenoirf/summary/scripts/0055_passing_trigger.py b/plenoirf/summary/scripts/0055_passing_trigger.py
@@ -18,16 +18,7 @@
     pk_dir = os.path.join(paths["out_dir"], pk)
     os.makedirs(pk_dir, exist_ok=True)
 
-    event_table = snt.read(
-        path=os.path.join(
-            paths["plenoirf_dir"],
-            "response",
-            res.instrument_key,
-            res.site_key,
-            pk,
-            "event_table.tar",
-        )
-    )
+    event_table = res.read_event_table(particle_key=pk)
 
     idx_pasttrigger = irf.analysis.light_field_trigger_modi.make_indices(
         trigger_table=event_table["trigger"],

diff --git a/plenoirf/summary/scripts/0056_passing_basic_quality.py b/plenoirf/summary/scripts/0056_passing_basic_quality.py
@@ -19,16 +19,7 @@
     pk_dir = os.path.join(paths["out_dir"], pk)
     os.makedirs(pk_dir, exist_ok=True)
 
-    event_table = snt.read(
-        path=os.path.join(
-            paths["plenoirf_dir"],
-            "response",
-            res.instrument_key,
-            res.site_key,
-            pk,
-            "event_table.tar",
-        )
-    )
+    event_table = res.read_event_table(particle_key=pk)
 
     idx_pastquality = irf.analysis.cuts.cut_quality(
         feature_table=event_table["features"],

diff --git a/plenoirf/summary/scripts/0059_passing_trajectory_quality.py b/plenoirf/summary/scripts/0059_passing_trajectory_quality.py
@@ -14,16 +14,7 @@
     pk_dir = os.path.join(paths["out_dir"], pk)
     os.makedirs(pk_dir, exist_ok=True)
 
-    event_table = snt.read(
-        path=os.path.join(
-            paths["plenoirf_dir"],
-            "response",
-            res.instrument_key,
-            res.site_key,
-            pk,
-            "event_table.tar",
-        )
-    )
+    event_table = res.read_event_table(particle_key=pk)
 
     event_frame = irf.reconstruction.trajectory_quality.make_rectangular_table(
         event_table=event_table,

diff --git a/plenoirf/summary/scripts/0060_cherenkov_photon_classification_plot.py b/plenoirf/summary/scripts/0060_cherenkov_photon_classification_plot.py
@@ -41,16 +41,7 @@ def guess_num_bins(num_events):
     pk_dir = opj(paths["out_dir"], pk)
     os.makedirs(pk_dir, exist_ok=True)
 
-    event_table = snt.read(
-        path=os.path.join(
-            paths["plenoirf_dir"],
-            "response",
-            res.instrument_key,
-            res.site_key,
-            pk,
-            "event_table.tar",
-        )
-    )
+    event_table = res.read_event_table(particle_key=pk)
 
     idx_common = snt.intersection(
         [