reboost 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

reboost/__init__.py

@@ -2,20 +2,12 @@ from __future__ import annotations
 
 from lgdo import lh5
 
-from . import build_hit, core, iterator, math, shape
 from ._version import version as __version__
+from .build_hit import build_hit
 
 __all__ = [
     "__version__",
-    "build_glm",
     "build_hit",
-    "build_hit",
-    "build_tcm",
-    "core",
-    "iterator",
-    "math",
-    "optmap",
-    "shape",
 ]
 
 lh5.settings.DEFAULT_HDF5_SETTINGS = {"shuffle": True, "compression": "lzf"}

reboost/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.0'
-__version_tuple__ = version_tuple = (0, 5, 0)
+__version__ = version = '0.5.2'
+__version_tuple__ = version_tuple = (0, 5, 2)

reboost/build_evt.py

@@ -78,9 +78,6 @@ def build_evt(
     -------
     ak.Array of the evt tier data (if the data is not saved to disk)
     """
-    msg = "... beginning the evt tier processing"
-    log.info(msg)
-
     # create the objects needed for evaluate expression
 
     file_info = {

reboost/build_glm.py

@@ -224,8 +224,8 @@ def build_glm(
     glm_sum = {}
 
     for file_idx, stp_file in enumerate(files.stp):
-        msg = f"Start generating glm for {stp_file} "
-        log.info(msg)
+        msg = f"start generating glm for {stp_file} "
+        log.debug(msg)
 
         # loop over the lh5_tables
         lh5_table_list = [
@@ -298,8 +298,6 @@ def build_glm(
                         if glm_sum[lh5_subgroup] is None
                         else ak.concatenate((glm_sum[lh5_subgroup], glm))
                     )
-        msg = f"Finished generating glm for {stp_file} "
-        log.info(msg)
 
     # return if it was requested to keep glm in memory
     if glm_sum is not None:

reboost/build_hit.py

@@ -239,17 +239,17 @@ def build_hit(
     # iterate over files
     for file_idx, (stp_file, glm_file) in enumerate(zip(files.stp, files.glm)):
         msg = (
-            f"... starting post processing of {stp_file} to {files.hit[file_idx]} "
+            f"starting processing of {stp_file} to {files.hit[file_idx]} "
             if files.hit[file_idx] is not None
-            else f"... starting post processing of {stp_file}"
+            else f"starting processing of {stp_file}"
         )
         log.info(msg)
 
         # loop over processing groups
         for group_idx, proc_group in enumerate(config["processing_groups"]):
             proc_name = proc_group.get("name", "default")
-            msg = f"... starting group {proc_name}"
-            log.info(msg)
+            msg = f"starting group {proc_name}"
+            log.debug(msg)
 
             if proc_name not in time_dict:
                 time_dict[proc_name] = ProfileDict()
@@ -261,7 +261,7 @@ def build_hit(
 
             # loop over detectors
             for in_det_idx, (in_detector, out_detectors) in enumerate(detectors_mapping.items()):
-                msg = f"... processing {in_detector} (to {out_detectors})"
+                msg = f"processing {in_detector} (to {out_detectors})"
                 log.debug(msg)
 
                 # get detector objects
@@ -328,7 +328,14 @@ def build_hit(
                             "DETECTOR": out_detector,
                         }
                         # add fields
-                        for field, expression in proc_group.get("operations", {}).items():
+                        for field, info in proc_group.get("operations", {}).items():
+                            if isinstance(info, str):
+                                expression = info
+                                units = None
+                            else:
+                                expression = info["expression"]
+                                units = info.get("units", None)
+
                             # evaluate the expression
                             col = core.evaluate_output_column(
                                 hit_table,
@@ -338,6 +345,10 @@ def build_hit(
                                 time_dict=time_dict[proc_name],
                                 name=field,
                             )
+
+                            if units is not None:
+                                col.attrs["units"] = units
+
                             core.add_field_with_nesting(hit_table, field, col)
 
                         # remove unwanted fields
@@ -393,14 +404,14 @@ def build_hit(
                         lh5.read(obj, stp_file),
                         obj,
                         files.hit[file_idx],
-                        wo_mode="write_safe",
+                        wo_mode="write_safe" if file_idx == 0 else "append",
                     )
                 except LH5EncodeError as e:
                     msg = f"cannot forward object {obj} as it has been already processed by reboost"
                     raise RuntimeError(msg) from e
 
     # return output table or nothing
-    log.info(time_dict)
+    log.debug(time_dict)
 
     if output_tables == {}:
         output_tables = None

reboost/core.py

@@ -139,7 +139,7 @@ def get_global_objects(
         time_start = time.time()
 
     msg = f"Getting global objects with {expressions.keys()} and {local_dict}"
-    log.info(msg)
+    log.debug(msg)
     res = {}
 
     for obj_name, expression in expressions.items():

reboost/iterator.py

@@ -113,7 +113,7 @@ class GLMIterator:
         if self.use_glm:
             self.buffer = int(buffer * glm_n_rows / stp_n_rows)
             msg = f"Number of stp rows {stp_n_rows}, number of glm rows {glm_n_rows} changing buffer from {buffer} to {self.buffer}"
-            log.info(msg)
+            log.debug(msg)
 
     def __iter__(self) -> typing.Iterator:
         self.current_i_entry = 0

reboost/optmap/convolve.py

@@ -75,8 +75,14 @@ def iterate_stepwise_depositions(
     mode: str = "no-fano",
 ):
     # those np functions are not supported by numba, but needed for efficient array access below.
-    x0 = structured_to_unstructured(edep_df[["xloc_pre", "yloc_pre", "zloc_pre"]], np.float64)
-    x1 = structured_to_unstructured(edep_df[["xloc_post", "yloc_post", "zloc_post"]], np.float64)
+    if "xloc_pre" in edep_df.dtype.names:
+        x0 = structured_to_unstructured(edep_df[["xloc_pre", "yloc_pre", "zloc_pre"]], np.float64)
+        x1 = structured_to_unstructured(
+            edep_df[["xloc_post", "yloc_post", "zloc_post"]], np.float64
+        )
+    else:
+        x0 = structured_to_unstructured(edep_df[["xloc", "yloc", "zloc"]], np.float64)
+        x1 = None
 
     rng = np.random.default_rng() if rng is None else rng
     output_map, res = _iterate_stepwise_depositions(
@@ -157,12 +163,16 @@ def _iterate_stepwise_depositions(
 
         # do the scintillation.
         part, charge = pdgid_map[t.particle]
+
+        # if we have both pre and post step points use them
+        # else pass as None
+
         scint_times = sc.scintillate(
             scint_mat_params,
             x0[rowid],
-            x1[rowid],
-            t.v_pre,
-            t.v_post,
+            x1[rowid] if x1 is not None else None,
+            t.v_pre if x1 is not None else None,
+            t.v_post if x1 is not None else None,
             t.time,
             part,
             charge,
@@ -358,7 +368,7 @@ def convolve(
     it = LH5Iterator(edep_file, edep_path, buffer_len=buffer_len)
 
     for it_count, edep_lgdo in enumerate(it):
-        edep_df = edep_lgdo.view_as("pd").iloc.to_records()
+        edep_df = edep_lgdo.view_as("pd").to_records()
 
         log.info("start event processing (%d)", it_count)
         output_map = iterate_stepwise_depositions(

reboost/optmap/create.py

@@ -131,7 +131,7 @@ def _create_optical_maps_chunk(
     hits_per_primary = np.zeros(10, dtype=np.int64)
     hits_per_primary_len = 0
     for it_count, events_lgdo in enumerate(optmap_events_it):
-        optmap_events = events_lgdo.view_as("pd").iloc
+        optmap_events = events_lgdo.view_as("pd")
         hitcounts = optmap_events[all_det_ids].to_numpy()
         loc = optmap_events[["xloc", "yloc", "zloc"]].to_numpy()
 

reboost/optmap/evt.py

@@ -25,7 +25,6 @@ def build_optmap_evt(
     if lh5_out_file_tmp.exists():
         msg = f"temporary output file {lh5_out_file_tmp} already exists"
         raise RuntimeError(msg)
-
     vert_it = LH5Iterator(lh5_in_file, "vtx", buffer_len=buffer_len)
     opti_it = LH5Iterator(lh5_in_file, "stp/optical", buffer_len=buffer_len)
 
@@ -80,8 +79,7 @@ def build_optmap_evt(
             _store_vert_df()
 
             # read the next vertex chunk into memory.
-            (vert_lgdo, vert_entry) = next(vert_it)
-            vert_df = vert_lgdo.view_as("pd").iloc
+            vert_df = next(vert_it).view_as("pd")
 
             # prepare vertex coordinates.
             vert_df = vert_df.set_index("evtid", drop=True).drop(["n_part", "time"], axis=1)
@@ -95,9 +93,10 @@ def build_optmap_evt(
     # use smaller integer type uint8 to spare RAM when storing types.
     hit_count_type = np.uint8
     for opti_it_count, opti_lgdo in enumerate(opti_it):
-        opti_df = opti_lgdo.view_as("pd").iloc
+        opti_df = opti_lgdo.view_as("pd")
 
         log.info("build evt table (%d)", opti_it_count)
+
         for t in opti_df[["evtid", "det_uid"]].itertuples(name=None, index=False):
             _ensure_vert_df(vert_it, t[0])
             vert_df.loc[t[0], str(t[1])] += 1

{reboost-0.5.0.dist-info → reboost-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reboost
-Version: 0.5.0
+Version: 0.5.2
 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
@@ -701,7 +701,7 @@ Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: numba
 Requires-Dist: legend-pydataobj>=1.12.0
-Requires-Dist: legend-pygeom-optics>=0.6.5
+Requires-Dist: legend-pygeom-optics>=0.9.2
 Requires-Dist: hist
 Requires-Dist: dbetto
 Requires-Dist: particle

{reboost-0.5.0.dist-info → reboost-0.5.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-reboost/__init__.py,sha256=0xtTxM_T8Sp6U3-EJRgFZ6WuqPk31QGQms7jhwouhvs,403
-reboost/_version.py,sha256=N2U3TRgLfYxjXfoF4Dy9PxAbZq24zjCym3P3cwuxKP8,511
-reboost/build_evt.py,sha256=TnJRiZ2O6eChorZeh-_SGgWa9jZQYAl_SsmJsM-wYrY,4779
-reboost/build_glm.py,sha256=uYoKl8U5gHy4oW1Neik5F_1jy5yhnFKS1ezVBA-vQaQ,9550
-reboost/build_hit.py,sha256=riij8oDF3Ajqfmxs52doA92LgdykF773hqDzsHe0eWw,15089
+reboost/__init__.py,sha256=3cYLf7XEyFRX5GK8f50gY4ecGR5O5HORITpDthOFpOg,265
+reboost/_version.py,sha256=066-gEgl89JZttvQIeF8xCmsrdAhgid_eoH5BBz7G58,511
+reboost/build_evt.py,sha256=yH0bf4bwbp4feWV3JgvSAD5RcvhOX6c9PhH8FAe3Xv4,4710
+reboost/build_glm.py,sha256=IerSLQfe51ZO7CQP2kmfPnOIVaDtcfw3byOM02Vaz6o,9472
+reboost/build_hit.py,sha256=23JL5B7qThdHZqAK_HWoytqcEOWDhGsk4n5UMtojJ1c,15513
 reboost/cli.py,sha256=HZgqUZK0tSmnlGqoXjrbmLitW_i001TzibxvDrRxLLg,6324
-reboost/core.py,sha256=B577b5KzAYpGI7c4eCxIRKgt9tq6hwVr2-DtYTml1e8,12826
-reboost/iterator.py,sha256=J--4f7ANW15Nb4kL_OQ0kbIw7U0ks73asefLd-uGoV4,6898
+reboost/core.py,sha256=pUco_IaTKf50PTVrtyFwoYveJVS58mqs9P3TUrtEyjs,12827
+reboost/iterator.py,sha256=o4xAkJmQY5Cn_2pJPY6HbShVWV02loWY9ZlCxFePMdg,6899
 reboost/log_utils.py,sha256=VqS_9OC5NeNU3jcowVOBB0NJ6ssYvNWnirEY-JVduEA,766
 reboost/profile.py,sha256=EOTmjmS8Rm_nYgBWNh6Rntl2XDsxdyed7yEdWtsZEeg,2598
 reboost/units.py,sha256=3EH8XlpbsObdu5vLgxhm1600L6UNYD5jng4SjJT_1QE,2202
@@ -19,9 +19,9 @@ reboost/math/functions.py,sha256=OymiYTcA0NXxxm-MBDw5kqyNwHoLCmuv4J48AwnSrbU,563
 reboost/math/stats.py,sha256=iiOEi87x93kqPWeSmlRiA5Oe-R8XR-plm6Z532PhC9M,1401
 reboost/optmap/__init__.py,sha256=imvuyld-GLw8qdwqW-lXCg2feptcTyQo3wIzPvDHwmY,93
 reboost/optmap/cli.py,sha256=SzbPRgsbR5Llm3aSJubH02Ym8FQyTH7kvuLjK7faLiY,9572
-reboost/optmap/convolve.py,sha256=vj5Wl2M5BeyvLbcnLo8xzaOAIKXUHUu023sXIP7xTCI,14034
-reboost/optmap/create.py,sha256=gd9VWceU0AOX_ABuLvmnAi2GkUdiugNF6CMUT2CbDbE,17053
-reboost/optmap/evt.py,sha256=CRhUXpgnV3nTA6gY-e6V2W2C4K6nJ8AEoW2ffa2ww9s,4571
+reboost/optmap/convolve.py,sha256=_volpLmhW5mOPA0KkzXRyHyqkj4_zDSnvfHv1Dtuxm8,14390
+reboost/optmap/create.py,sha256=B-MWurmnzl4Y62N2Pj7IwM1IaEEt2fydpZa_t0gmsxo,17048
+reboost/optmap/evt.py,sha256=UYESkMAwDbE_ap4Jb-a2n0uWxHRnYmHzQiXh0vexaPQ,4513
 reboost/optmap/mapview.py,sha256=73kpe0_SKDj9bIhEx1ybX1sBP8TyvufiLfps84A_ijA,6798
 reboost/optmap/numba_pdg.py,sha256=y8cXR5PWE2Liprp4ou7vl9do76dl84vXU52ZJD9_I7A,731
 reboost/optmap/optmap.py,sha256=j4rfbQ84PYSpE-BvP4Rdt96ZjPdwy8P4e4eZz1mATys,12817
@@ -29,9 +29,9 @@ reboost/shape/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reboost/shape/cluster.py,sha256=RIvBlhHzp88aaUZGofp5SD9bimnoiqIOddhQ84jiwoM,8135
 reboost/shape/group.py,sha256=_z2qCOret3E-kj-nrp1-J5j2lEwQpgfYdQp2pgpDHR8,4449
 reboost/shape/reduction.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reboost-0.5.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-reboost-0.5.0.dist-info/METADATA,sha256=CpCyIjvfYUoGAC2Sh5b4JbtLLjx2QT281m8TKNmb0rs,44250
-reboost-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-reboost-0.5.0.dist-info/entry_points.txt,sha256=DxhD6BidSWNot9BrejHJjQ7RRLmrMaBIl52T75oWTwM,93
-reboost-0.5.0.dist-info/top_level.txt,sha256=q-IBsDepaY_AbzbRmQoW8EZrITXRVawVnNrB-_zyXZs,8
-reboost-0.5.0.dist-info/RECORD,,
+reboost-0.5.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+reboost-0.5.2.dist-info/METADATA,sha256=8RgyM0cqo8X_SpUghqaN1hd_SudMixVUIVxQPTVDJMk,44250
+reboost-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+reboost-0.5.2.dist-info/entry_points.txt,sha256=DxhD6BidSWNot9BrejHJjQ7RRLmrMaBIl52T75oWTwM,93
+reboost-0.5.2.dist-info/top_level.txt,sha256=q-IBsDepaY_AbzbRmQoW8EZrITXRVawVnNrB-_zyXZs,8
+reboost-0.5.2.dist-info/RECORD,,