[evt.modules.larveto] fix pulse data masking for classifier

legend-exp · May 8, 2024 · a770272 · a770272
1 parent cccec5d
commit a770272
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/pygama/evt/modules/spms.py b/src/pygama/evt/modules/spms.py
@@ -310,7 +310,7 @@ def geds_coincidence_classifier(
     *,
     geds_t0_ns: types.Array,
     bkg_prob: float,
-    dens_array: Sequence[float],
+    dens_array: Sequence[float] = None,
 ) -> types.Array:
     """Calculate the HPGe / SiPMs coincidence classifier.
 
@@ -344,12 +344,12 @@ def geds_coincidence_classifier(
             tcm,
             table_names,
             observable=obs,
-            pulse_mask=pulse_mask,
-            drop_empty=True,
+            pulse_mask=None,
+            drop_empty=False,
         ).view_as("ak")
 
-        # remove pulses below noise threshold
-        data[k] = all_data[is_good_pulse]
+        # remove pulses below noise threshold and outside the HPGe trigger window
+        data[k] = all_data[is_good_pulse & pulse_mask.view_as("ak")]
 
     # load the channel info
     # rawids = spms.gather_tcm_id_data(

diff --git a/tests/evt/configs/spms-module-config.yaml b/tests/evt/configs/spms-module-config.yaml
@@ -96,4 +96,8 @@ operations:
   lar_coin_class:
     channels: spms_on
     aggregation_mode: function
-    expression: pygama.evt.modules.spms.geds_coincidence_classifier(<...>, geds_t0_ns=evt.t0, bkg_prob=0.42, dens_array=None)
+    expression: pygama.evt.modules.spms.geds_coincidence_classifier(
+      <...>,
+      geds_t0_ns=evt.t0,
+      bkg_prob=0.42,
+      dens_array=[0.5, 0.1, 0.05])