reboost 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

reboost/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.5'
-__version_tuple__ = version_tuple = (0, 2, 5)
+__version__ = version = '0.2.7'
+__version_tuple__ = version_tuple = (0, 2, 7)

reboost/build_glm.py

@@ -153,6 +153,10 @@ def get_stp_evtids(
         )
         evtids = lh5_obj.view_as("ak")
 
+        # pick the first evtid
+        if evtids.ndim > 1:
+            evtids = ak.fill_none(ak.firsts(evtids, axis=-1), -1)
+
         # if the evtids_proc is not set then this is the first valid chunk
         if evtids_proc is None:
             evtids_proc = evtids

reboost/build_hit.py

@@ -290,7 +290,7 @@ def build_hit(
                     start_row=start_evtid,
                     stp_field=in_field,
                     n_rows=n_evtid,
-                    read_vertices=True,
+                    read_vertices=False,
                     buffer=buffer,
                     time_dict=time_dict[proc_name],
                 )
@@ -299,8 +299,15 @@ def build_hit(
                     if stps is None:
                         continue
 
+                    # convert to awkward
+                    if time_dict is not None:
+                        start_time = time.time()
+
                     ak_obj = stps.view_as("ak")
 
+                    if time_dict is not None:
+                        time_dict[proc_name].update_field("conv", start_time)
+
                     # produce the hit table
                     for out_det_idx, out_detector in enumerate(out_detectors):
                         # loop over the rows
@@ -351,8 +358,11 @@ def build_hit(
                         )
 
                         wo_mode = utils.get_wo_mode(
-                            [group_idx, out_det_idx, in_det_idx, chunk_idx],
-                            new_hit_file,
+                            group=group_idx,
+                            out_det=out_det_idx,
+                            in_det=in_det_idx,
+                            chunk=chunk_idx,
+                            new_hit_file=new_hit_file,
                             overwrite=overwrite,
                         )
 
@@ -361,12 +371,20 @@ def build_hit(
                             if time_dict is not None:
                                 start_time = time.time()
 
-                            lh5.write(
-                                Struct({out_detector: hit_table}),
-                                out_field,
-                                files.hit[file_idx],
-                                wo_mode=wo_mode,
-                            )
+                            if wo_mode != "a":
+                                lh5.write(
+                                    Struct({out_detector: hit_table}),
+                                    out_field,
+                                    files.hit[file_idx],
+                                    wo_mode=wo_mode,
+                                )
+                            else:
+                                lh5.write(
+                                    hit_table,
+                                    f"{out_field}/{out_detector}",
+                                    files.hit[file_idx],
+                                    wo_mode=wo_mode,
+                                )
                             if time_dict is not None:
                                 time_dict[proc_name].update_field("write", start_time)
 

reboost/iterator.py

@@ -4,6 +4,7 @@ import logging
 import time
 import typing
 
+import awkward as ak
 from lgdo.lh5 import LH5Store
 from lgdo.types import LGDO, Table
 
@@ -124,12 +125,16 @@ class GLMIterator:
         if len(glm_ak) > 0:
             # extract range of stp rows to read
             start = glm_ak.start_row[0]
-            n = sum(glm_ak.n_rows)
+            n = ak.sum(glm_ak.n_rows)
+
             if self.time_dict is not None:
                 time_start = time.time()
 
             stp_rows, n_steps = self.sto.read(
-                f"{self.stp_field}/{self.lh5_group}", self.stp_file, start_row=start, n_rows=n
+                f"{self.stp_field}/{self.lh5_group}",
+                self.stp_file,
+                start_row=int(start),
+                n_rows=int(n),
             )
 
             # save time

reboost/utils.py

@@ -9,17 +9,26 @@ from contextlib import contextmanager
 from pathlib import Path
 
 from dbetto import AttrsDict
-from lgdo.types import Table
+from lgdo.types import Table, VectorOfVectors
 
 log = logging.getLogger(__name__)
 
 
-def get_wo_mode(indices: list[int], new_hit_file: bool, overwrite: bool = False):
+def get_wo_mode(
+    group: int, out_det: int, in_det: int, chunk: int, new_hit_file: bool, overwrite: bool = False
+):
     """Get the mode for lh5 file writing."""
+    indices = [group, out_det, in_det, chunk]
+
     good_idx = all(i == 0 for i in indices)
+
     if good_idx and new_hit_file:
         return "of" if overwrite else "w"
-    return "ac"
+
+    # if we have a detector not the first and chunk 0 append column
+    if ((in_det > 0) or (out_det > 0)) & (chunk == 0):
+        return "ac"
+    return "a"
 
 
 def get_file_dict(
@@ -121,7 +130,11 @@ def assign_units(tab: Table, units: Mapping) -> Table:
     """
     for field in tab:
         if field in units:
-            tab[field].attrs["units"] = units[field]
+            if not isinstance(tab[field], VectorOfVectors):
+                tab[field].attrs["units"] = units[field]
+            else:
+                tab[field].flattened_data.attrs["units"] = units[field]
+
     return tab
 
 

{reboost-0.2.5.dist-info → reboost-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reboost
-Version: 0.2.5
+Version: 0.2.7
 Summary: New LEGEND Monte-Carlo simulation post-processing
 Author-email: Manuel Huber <info@manuelhu.de>, Toby Dixon <toby.dixon.23@ucl.ac.uk>, Luigi Pertoldi <gipert@pm.me>
 Maintainer: The LEGEND Collaboration

{reboost-0.2.5.dist-info → reboost-0.2.7.dist-info}/RECORD

@@ -1,16 +1,16 @@
 reboost/__init__.py,sha256=RVNl3Qgx_hTUeBGXaWYmiTcmXUDhTfvlAGGC8bo_jP8,316
-reboost/_version.py,sha256=N3oBwJUFmS-AwCjqOcSlRW4GvSq-uJJMaBvoGfv1-hM,511
+reboost/_version.py,sha256=Xk20v7uvkFqkpy9aLJzVngs1eKQn0FYUP2oyA1MEQUU,511
 reboost/build_evt.py,sha256=zj3wG_kaV3EoRMQ33AkCNa_2Fv8cLtRuhyRyRmSrOYQ,4797
-reboost/build_glm.py,sha256=LQkM6x6mMOE92-c78uoclOvP9zp3vdMuLQCSP2f2Zk4,9263
-reboost/build_hit.py,sha256=yfOUzAaKFGrQ0ENgUvZUh9Q9EVK42kISNcpuRLOjlRg,14167
+reboost/build_glm.py,sha256=kSY9hQjEsOE-0PiblhdBy_SvFIlgXLX6CUlgpxW-_OI,9389
+reboost/build_hit.py,sha256=Zu8WoeFYtFU_xUO3I8OZM5psNaiv1boMJPnBWC58nfQ,14958
 reboost/build_tcm.py,sha256=-PawBHoHj0zsm4XsZu5bco9d9a09STicZchduefSNfI,2951
 reboost/cli.py,sha256=swPJcYzvg18rSOMN-mpe0PCMf1-a9V7osIssX7JP7k0,6459
 reboost/core.py,sha256=7Nclc6RUCOSJ1CWVAX0rFNJGM1LEgqvc4tD04CxEAtg,10766
-reboost/iterator.py,sha256=72AyoRTgMpWghZt2UOqRj0RGiNzaiBAwgNIUZdduK2s,4698
+reboost/iterator.py,sha256=uKCZHobfmfzuy6Q4olHgt7m1XtUMM5KUvrk3lJ3XWec,4782
 reboost/log_utils.py,sha256=VqS_9OC5NeNU3jcowVOBB0NJ6ssYvNWnirEY-JVduEA,766
 reboost/profile.py,sha256=EOTmjmS8Rm_nYgBWNh6Rntl2XDsxdyed7yEdWtsZEeg,2598
 reboost/units.py,sha256=3EH8XlpbsObdu5vLgxhm1600L6UNYD5jng4SjJT_1QE,2202
-reboost/utils.py,sha256=R9_JUOp_CqEn52iLQCKEs_rj9N_icHmMXf8DGettggs,8050
+reboost/utils.py,sha256=eBw0ZzwhlniTLbjz9tnstCXSYrjSeH4FJ0fkJ9-uqps,8450
 reboost/hpge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reboost/hpge/psd.py,sha256=868OUJzO9TNja0YSrZ3NDGeEAbUtpDZnmvBDm0jCC9E,6856
 reboost/hpge/surface.py,sha256=SZyTmOCTipf27jYaJhtdInzGF1RZ2wKpbtf6HlOQYwM,3662
@@ -30,9 +30,9 @@ reboost/shape/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reboost/shape/cluster.py,sha256=RIvBlhHzp88aaUZGofp5SD9bimnoiqIOddhQ84jiwoM,8135
 reboost/shape/group.py,sha256=Q3DhEPxbhw3p4bwvpswSd0A-p224l5vRZnfQIEkOVJE,4475
 reboost/shape/reduction.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reboost-0.2.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-reboost-0.2.5.dist-info/METADATA,sha256=ys5cRQSdNlDrzQW1qxwLuoFq1M8QOhdSC5DKE4meiGQ,44251
-reboost-0.2.5.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-reboost-0.2.5.dist-info/entry_points.txt,sha256=DxhD6BidSWNot9BrejHJjQ7RRLmrMaBIl52T75oWTwM,93
-reboost-0.2.5.dist-info/top_level.txt,sha256=q-IBsDepaY_AbzbRmQoW8EZrITXRVawVnNrB-_zyXZs,8
-reboost-0.2.5.dist-info/RECORD,,
+reboost-0.2.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+reboost-0.2.7.dist-info/METADATA,sha256=91C3mSgN5iDtZLrON4O0iFmLlsdepdW-VX8Rvr_2Kas,44251
+reboost-0.2.7.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+reboost-0.2.7.dist-info/entry_points.txt,sha256=DxhD6BidSWNot9BrejHJjQ7RRLmrMaBIl52T75oWTwM,93
+reboost-0.2.7.dist-info/top_level.txt,sha256=q-IBsDepaY_AbzbRmQoW8EZrITXRVawVnNrB-_zyXZs,8
+reboost-0.2.7.dist-info/RECORD,,

{reboost-0.2.5.dist-info → reboost-0.2.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any