Bug fix: evt.modules.spm.cast_trigger where Awkward arrays not repl…

…acing `nan`s (#559) * fixed bug in cast_triger where awk arrays not replacing nans
legend-exp · Feb 19, 2024 · a6d5aac · a6d5aac
1 parent e6cf95c
commit a6d5aac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/pygama/evt/modules/spm.py b/src/pygama/evt/modules/spm.py
@@ -37,11 +37,13 @@ def cast_trigger(
             ak.min(ak.fill_none(trgr.view_as("ak"), tdefault), axis=-1), tdefault
         )
 
-    elif isinstance(trgr, ak.Array):
+    elif isinstance(trgr, (ak.Array, ak.highlevel.Array)):
         if trgr.ndim == 1:
-            return ak.fill_none(trgr, tdefault)
+            return ak.fill_none(ak.nan_to_none(trgr), tdefault)
         elif trgr.ndim == 2:
-            return ak.fill_none(ak.min(ak.fill_none(trgr, tdefault), axis=-1), tdefault)
+            return ak.fill_none(
+                ak.min(ak.fill_none(ak.nan_to_none(trgr), tdefault), axis=-1), tdefault
+            )
         else:
             raise ValueError(f"Too many dimensions: {trgr.ndim}")
     elif isinstance(trgr, (float, int)) and isinstance(length, int):

diff --git a/src/pygama/flow/utils.py b/src/pygama/flow/utils.py
@@ -122,12 +122,7 @@ def fill_col_dict(
                         (table_length, len(tier_table[col].nda[0])),
                         dtype=tier_table[col].dtype,
                     )
-                try:
-                    col_dict[col][tcm_idx] = tier_table[col].nda
-                except BaseException:
-                    raise ValueError(
-                        f"self.aoesa_to_vov is False but {col} is a jagged array"
-                    )
+                col_dict[col][tcm_idx] = tier_table[col].nda
         elif isinstance(tier_table[col], VectorOfVectors):
             # Allocate memory for column for all channels
             if col not in col_dict.keys():