reboost 0.10.0a0__py3-none-any.whl → 0.10.0a2__py3-none-any.whl

reboost/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.10.0a0'
-__version_tuple__ = version_tuple = (0, 10, 0, 'a0')
+__version__ = version = '0.10.0a2'
+__version_tuple__ = version_tuple = (0, 10, 0, 'a2')
 
 __commit_id__ = commit_id = None

reboost/build_hit.py

@@ -51,14 +51,15 @@ A :func:`build_hit` to parse the following configuration file:
 
             t0: ak.fill_none(ak.firsts(HITS.time, axis=-1), np.nan)
 
-            evtid: ak.fill_none(ak.firsts(HITS.__evtid, axis=-1), np.nan)
+            evtid: ak.fill_none(ak.firsts(HITS.evtid, axis=-1), np.nan)
 
             # distance to the nplus surface in mm
             distance_to_nplus_surface_mm: reboost.hpge.distance_to_surface(
-                HITS.__xloc, HITS.__yloc, HITS.__zloc,
+                HITS.xloc, HITS.yloc, HITS.zloc,
                 DETECTOR_OBJECTS.pyobj,
                 DETECTOR_OBJECTS.phyvol.position.eval(),
-                surface_type='nplus')
+                surface_type='nplus',
+                unit='m')
 
             # activness based on FCCD (no TL)
             activeness: ak.where(
@@ -75,7 +76,7 @@ A :func:`build_hit` to parse the following configuration file:
                 )
 
             # summed energy of the hit accounting for activeness
-            energy_raw: ak.sum(HITS.__edep * HITS.activeness, axis=-1)
+            energy_raw: ak.sum(HITS.edep * HITS.activeness, axis=-1)
 
             # energy with smearing
             energy: reboost.math.sample_convolve(
@@ -92,7 +93,7 @@ A :func:`build_hit` to parse the following configuration file:
                 )
 
             # example of low level reduction on clusters
-            energy_clustered: ak.sum(ak.unflatten(HITS.__edep, HITS.clusters_lengths), axis=-1)
+            energy_clustered: ak.sum(ak.unflatten(HITS.edep, HITS.clusters_lengths), axis=-1)
 
             # example of using a reboost helper
             steps_clustered: reboost.shape.reduction.energy_weighted_average(HITS, HITS.clusters_lengths)
@@ -115,7 +116,7 @@ A :func:`build_hit` to parse the following configuration file:
             - num_scint_ph_lar
 
           operations:
-            tot_edep_wlsr: ak.sum(HITS.edep[np.abs(HITS.zloc) < 3000], axis=-1)
+            tot_edep_wlsr: ak.sum(HITS.edep[np.abs(HITS.zloc) < 3], axis=-1)
 
         - name: spms
 
@@ -180,6 +181,8 @@ from dbetto import AttrsDict
 from lgdo import lh5
 from lgdo.lh5.exceptions import LH5EncodeError
 
+from reboost import units
+
 from . import core, utils
 from .iterator import GLMIterator
 from .profile import ProfileDict
@@ -334,6 +337,7 @@ def build_hit(
                             expression=proc_group["hit_table_layout"],
                             time_dict=time_dict[proc_name],
                         )
+
                     else:
                         hit_table_layouted = copy.deepcopy(stps)
 
@@ -448,5 +452,8 @@ def _evaluate_operation(
         time_dict=time_dict,
         name=field,
     )
+    if not isinstance(info, str) and "units" in info:
+        col = units.attach_units(col, info["units"])
+    units.move_units_to_flattened_data(col)
 
     core.add_field_with_nesting(hit_table, field, col)

reboost/core.py

@@ -11,16 +11,25 @@ from dbetto import AttrsDict
 from lgdo import lh5
 from lgdo.types import LGDO, Table
 
-from . import utils
+from . import units, utils
 from .profile import ProfileDict
 
 log = logging.getLogger(__name__)
 
 
 def read_data_at_channel_as_ak(
-    channels: ak.Array, rows: ak.Array, file: str, field: str, group: str, tab_map: dict[int, str]
+    channels: ak.Array,
+    rows: ak.Array,
+    file: str,
+    field: str,
+    group: str,
+    tab_map: dict[int, str],
+    with_units: bool = False,
 ) -> ak.Array:
-    r"""Read the data from a particular field to an awkward array. This replaces the TCM like object defined by the channels and rows with the corresponding data field.
+    r"""Read the data from a particular field to an Awkward array.
+
+    This replaces the TCM like object defined by the channels and rows with the
+    corresponding data field.
 
     Parameters
     ----------
@@ -68,7 +77,9 @@ def read_data_at_channel_as_ak(
         tcm_rows = np.where(ak.flatten(channels == key))[0]
 
         # read the data with sorted idx
-        data_ch = lh5.read(f"{group}/{tab_name}/{field}", file, idx=idx[arg_idx]).view_as("ak")
+        data_ch = lh5.read(f"{group}/{tab_name}/{field}", file, idx=idx[arg_idx])
+        units = data_ch.attrs.get("units", None)
+        data_ch = data_ch.view_as("ak")
 
         # sort back to order for tcm
         data_ch = data_ch[np.argsort(arg_idx)]
@@ -85,8 +96,12 @@ def read_data_at_channel_as_ak(
 
     # sort the final data
     data_flat = data_flat[np.argsort(tcm_rows_full)]
+    data_unflat = ak.unflatten(data_flat, reorder)
+
+    if with_units and units is not None:
+        return ak.with_parameter(data_unflat, "units", units)
 
-    return ak.unflatten(data_flat, reorder)
+    return data_unflat
 
 
 def evaluate_output_column(
@@ -441,6 +456,10 @@ def evaluate_hit_table_layout(
 
     res = eval(group_func, globs, locs)
 
+    if isinstance(res, Table):
+        for data in res.values():
+            units.move_units_to_flattened_data(data)
+
     if time_dict is not None:
         time_dict.update_field(name="hit_layout", time_start=time_start)
 
@@ -519,8 +538,5 @@ def remove_columns(tab: Table, outputs: list) -> Table:
 
 def merge(hit_table: Table, output_table: ak.Array | None):
     """Merge the table with the array."""
-    return (
-        hit_table.view_as("ak")
-        if output_table is None
-        else ak.concatenate((output_table, hit_table.view_as("ak")))
-    )
+    hit_table = hit_table.view_as("ak", with_units=True)
+    return hit_table if output_table is None else ak.concatenate((output_table, hit_table))

reboost/optmap/evt.py

@@ -3,10 +3,8 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 from collections.abc import Generator, Iterable
-from pathlib import Path
 
 import numpy as np
-from lgdo import lh5
 from lgdo.lh5 import LH5Iterator
 from lgdo.types import Table
 
@@ -105,27 +103,6 @@ def generate_optmap_evt(
     assert had_last_chunk, "did not reach last chunk in optmap-evt building"
 
 
-def build_optmap_evt(
-    lh5_in_file: str, lh5_out_file: str, detectors: Iterable[str | int], buffer_len: int = int(5e6)
-) -> None:
-    """Create a faster map for lookup of the hits in each detector, for each primary event."""
-    lh5_out_file = Path(lh5_out_file)
-    lh5_out_file_tmp = lh5_out_file.with_stem(".evt-tmp." + lh5_out_file.stem)
-    if lh5_out_file_tmp.exists():
-        msg = f"temporary output file {lh5_out_file_tmp} already exists"
-        raise RuntimeError(msg)
-
-    for vert_it_count, chunk in enumerate(generate_optmap_evt(lh5_in_file, detectors, buffer_len)):
-        log.info("store evt file %s (%d)", lh5_out_file_tmp, vert_it_count - 1)
-        lh5.write(Table(chunk), name=EVT_TABLE_NAME, lh5_file=lh5_out_file_tmp, wo_mode="append")
-
-    # after finishing the output file, rename to the actual output file name.
-    if lh5_out_file.exists():
-        msg = f"output file {lh5_out_file_tmp} already exists after writing tmp output file"
-        raise RuntimeError(msg)
-    lh5_out_file_tmp.rename(lh5_out_file)
-
-
 def get_optical_detectors_from_geom(geom_fn) -> dict[int, str]:
     import pyg4ometry
     import pygeomtools

reboost/units.py

@@ -7,7 +7,7 @@ import awkward as ak
 import numpy as np
 import pint
 import pyg4ometry as pg4
-from lgdo import LGDO
+from lgdo import LGDO, VectorOfVectors
 
 log = logging.getLogger(__name__)
 
@@ -69,6 +69,23 @@ def attach_units(data: ak.Array | LGDO, unit: str | None) -> ak.Array | LGDO:
     return data
 
 
+def move_units_to_flattened_data(data: LGDO) -> None:
+    """If `data` is a VectorOfVectors move units from attrs to flattened data attrs.
+
+    Parameters
+    ----------
+    data
+        the nested data structure
+    """
+    if isinstance(data, VectorOfVectors) and ("units" in data.attrs):
+        unit = data.attrs.pop("units")
+        if isinstance(data.flattened_data, VectorOfVectors):
+            data.flattened_data.attrs |= {"units": unit}
+            move_units_to_flattened_data(data.flattened_data)
+        else:
+            data.flattened_data.attrs |= {"units": unit}
+
+
 def units_conv_ak(data: Any | LGDO | ak.Array, target_units: pint.Unit | str) -> Any | ak.Array:
     """Calculate numeric conversion factor to reach `target_units`, and apply to data converted to ak.
 

reboost/utils.py

@@ -5,7 +5,7 @@ import itertools
 import logging
 import re
 import time
-from collections.abc import Iterable, Mapping
+from collections.abc import Iterable
 from contextlib import contextmanager
 from pathlib import Path
 
@@ -182,52 +182,6 @@ def get_file_list(path: str | None, threads: int | None = None) -> list[str]:
     return [f"{(Path(path).with_suffix(''))}_t{idx}.lh5" for idx in range(threads)]
 
 
-def copy_units(tab: Table) -> dict:
-    """Extract a dictionary of attributes (i.e. units).
-
-    Parameters
-    ----------
-    tab
-        Table to get the units from.
-
-    Returns
-    -------
-    a dictionary with the units for each field
-    in the table.
-    """
-    units = {}
-
-    for field in tab:
-        if "units" in tab[field].attrs:
-            units[field] = tab[field].attrs["units"]
-
-    return units
-
-
-def assign_units(tab: Table, units: Mapping) -> Table:
-    """Copy the attributes from the map of attributes to the table.
-
-    Parameters
-    ----------
-    tab
-        Table to add attributes to.
-    units
-        mapping (dictionary like) of units of each field
-
-    Returns
-    -------
-    an updated table with LGDO attributes.
-    """
-    for field in tab:
-        if field in units:
-            if not isinstance(tab[field], VectorOfVectors):
-                tab[field].attrs["units"] = units[field]
-            else:
-                tab[field].flattened_data.attrs["units"] = units[field]
-
-    return tab
-
-
 def _search_string(string: str):
     """Capture the characters matching the pattern for a function call."""
     pattern = r"\b([a-zA-Z_][a-zA-Z0-9_\.]*)\s*\("

{reboost-0.10.0a0.dist-info → reboost-0.10.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reboost
-Version: 0.10.0a0
+Version: 0.10.0a2
 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.10.0a0.dist-info → reboost-0.10.0a2.dist-info}/RECORD

@@ -1,16 +1,16 @@
 reboost/__init__.py,sha256=VZz9uo7i2jgAx8Zi15SptLZnE_qcnGuNWwqkD3rYHFA,278
 reboost/__main__.py,sha256=42koSxY2st4mMIRSAnKz06nP5HppMPxBVFf2jaHljGs,95
-reboost/_version.py,sha256=uvugpfFX1pEScMzJ2JeDcYh7lOMZajzrzSxwt8iaOLU,714
+reboost/_version.py,sha256=o2SCKaFpIjZ_mxQO5CtT0P_LjixtzK8EKUUO8pTQ4Rg,714
 reboost/build_evt.py,sha256=VXIfK_pfe_Cgym6gI8dESwONZi-v_4fll0Pn09vePQY,3767
 reboost/build_glm.py,sha256=IerSLQfe51ZO7CQP2kmfPnOIVaDtcfw3byOM02Vaz6o,9472
-reboost/build_hit.py,sha256=fg0vDPnWCQN7Px0KKLuQvwdsA4DBT2z6IoAb_KjG9CY,17034
+reboost/build_hit.py,sha256=UjS4yp42_7D9IN-Nq1RfpyDeAcnH6THzUNCzupjRDKw,17224
 reboost/cli.py,sha256=68EzKiWTHJ2u1RILUv7IX9HaVq6nTTM80_W_MUnWRe4,6382
-reboost/core.py,sha256=TPxvZgUaHZdxfQSDdX2zIerQXt3Gq-zQaA6AeXZKNvA,15232
+reboost/core.py,sha256=v0ze5wKqU8fmSExzNX6zUYs9E7xgwBvFY_lEJgCMbdQ,15624
 reboost/iterator.py,sha256=qlEqRv5qOh8eIs-dyVOLYTvH-ZpQDx9fLckpcAdtWjs,6975
 reboost/log_utils.py,sha256=VqS_9OC5NeNU3jcowVOBB0NJ6ssYvNWnirEY-JVduEA,766
 reboost/profile.py,sha256=EOTmjmS8Rm_nYgBWNh6Rntl2XDsxdyed7yEdWtsZEeg,2598
-reboost/units.py,sha256=Jj1OjYoY6xoWTVGId_w8Cn5ugN0QLGluVhWvLeqeyII,5019
-reboost/utils.py,sha256=vl-_BUOeXcazNs4zN-9k-OVEptdf3FtCeej2QZhClKc,14599
+reboost/units.py,sha256=ZilbGI70--DZfcOx6wDHgSicH5Vc_FrajmrakyJU_gM,5619
+reboost/utils.py,sha256=5sjavX1TqsZCWy84QVIR4JgfEfa4GVeUrUvEEI__Z1g,13558
 reboost/daq/__init__.py,sha256=rNPhxx1Yawt3tENYhmOYSum9_TdV57ZU5kjxlWFAGuo,107
 reboost/daq/core.py,sha256=Rs6Q-17fzEod2iX_2WqEmnqKnNRFoWTYURl3wYhFihU,9915
 reboost/daq/utils.py,sha256=KcH6zvlInmD2YiF6V--DSYBTYudJw3G-hp2JGOcES2o,1042
@@ -26,7 +26,7 @@ reboost/optmap/__main__.py,sha256=DfzkXQ7labOe53hd7jH5pAbTW491jjQYSMLyl72L4Rk,11
 reboost/optmap/cli.py,sha256=_7WBlx55eRyW_wWB-ELbFaWXin2d3xsh6Q5bFoNJaHE,8694
 reboost/optmap/convolve.py,sha256=e3vTBurYSM4UmicIdDif6_cI04pV8khHEG5n7M_DWNg,16079
 reboost/optmap/create.py,sha256=GmGd0-F0eWmw7ywH8pT1lKiMb60QXCq9al8Ka_ySD1Q,14382
-reboost/optmap/evt.py,sha256=nZcB3aOPtMhySu00J23KlOTijeI5Oazde-vfM5A71e8,5664
+reboost/optmap/evt.py,sha256=eq7NOyP3Y8ybUvl8Gw4xqyIwMqjhcoMFtNDDs0jBu7g,4577
 reboost/optmap/mapview.py,sha256=fswwXolA6au8u8gljBKy8PSXC2W7Cy_GwOV86-duYG8,6880
 reboost/optmap/numba_pdg.py,sha256=y8cXR5PWE2Liprp4ou7vl9do76dl84vXU52ZJD9_I7A,731
 reboost/optmap/optmap.py,sha256=3clc1RA8jA4YJte83w085MY8zLpG-G7DBkpZ2UeKPpM,12825
@@ -36,9 +36,9 @@ reboost/shape/group.py,sha256=PY7FGUnralj1BkRl4YtguCnzvOr-ymMd4ZFVmzPCwmM,6352
 reboost/shape/reduction.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reboost/spms/__init__.py,sha256=8I6WT8i_kUPqEDnSD0aCf6A26cjKjQQZSNrvwZ3o-Ac,415
 reboost/spms/pe.py,sha256=LwqrK1HOZWzGcNZnntaqI6r4rnDww4KW9Mao4xLFbDE,8226
-reboost-0.10.0a0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-reboost-0.10.0a0.dist-info/METADATA,sha256=o7lnoQcj8MkJ-VW7NQKwE75vlHx4qJAV4ycWgb8Yvuc,3880
-reboost-0.10.0a0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-reboost-0.10.0a0.dist-info/entry_points.txt,sha256=DxhD6BidSWNot9BrejHJjQ7RRLmrMaBIl52T75oWTwM,93
-reboost-0.10.0a0.dist-info/top_level.txt,sha256=q-IBsDepaY_AbzbRmQoW8EZrITXRVawVnNrB-_zyXZs,8
-reboost-0.10.0a0.dist-info/RECORD,,
+reboost-0.10.0a2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+reboost-0.10.0a2.dist-info/METADATA,sha256=oaef7gtpw-LErMt8M-oB5CUVAENqjo7tNTwdrkZkQzA,3880
+reboost-0.10.0a2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+reboost-0.10.0a2.dist-info/entry_points.txt,sha256=DxhD6BidSWNot9BrejHJjQ7RRLmrMaBIl52T75oWTwM,93
+reboost-0.10.0a2.dist-info/top_level.txt,sha256=q-IBsDepaY_AbzbRmQoW8EZrITXRVawVnNrB-_zyXZs,8
+reboost-0.10.0a2.dist-info/RECORD,,

{reboost-0.10.0a0.dist-info → reboost-0.10.0a2.dist-info}/WHEEL

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