reboost 0.5.3__tar.gz → 0.5.5__tar.gz

{reboost-0.5.3 → reboost-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reboost
-Version: 0.5.3
+Version: 0.5.5
 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.5.3 → reboost-0.5.5}/src/reboost/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.3'
-__version_tuple__ = version_tuple = (0, 5, 3)
+__version__ = version = '0.5.5'
+__version_tuple__ = version_tuple = (0, 5, 5)

{reboost-0.5.3 → reboost-0.5.5}/src/reboost/iterator.py

@@ -111,7 +111,7 @@ class GLMIterator:
 
         # heuristics for a good buffer length
         if self.use_glm:
-            self.buffer = int(buffer * glm_n_rows / stp_n_rows)
+            self.buffer = int(buffer * glm_n_rows / (1 + 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.debug(msg)
 

{reboost-0.5.3 → reboost-0.5.5}/src/reboost/utils.py

@@ -20,8 +20,35 @@ log = logging.getLogger(__name__)
 
 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."""
+) -> str:
+    """Get the mode for lh5 file writing.
+
+    If all indices are 0 and we are writing a new output file
+    then the mode "overwrite_file" is used (if the overwrite) flag
+    is set, otherwise the mode "write_safe" is used.
+
+    Otherwise the code choses between "append_column" if this is the
+    first time a group is being written to the file, or "append"
+
+    Parameters
+    ----------
+    group
+        the index of the processing group
+    out_det
+        the index of the output detector
+    in_det
+        the index of the input detector
+    chunk
+        the chunk index
+    new_hit_file
+        a flag of whether we are writing a new hit file
+    overwrite
+        a flag of whether to overwrite the old file.
+
+    Returns
+    -------
+    the mode for IO
+    """
     indices = [group, out_det, in_det, chunk]
 
     good_idx = all(i == 0 for i in indices)
@@ -30,9 +57,10 @@ def get_wo_mode(
         return "overwrite_file" if overwrite else "write_safe"
 
     # if we have a detector not the first and chunk 0 append column
-    is_append = ((in_det > 0) or (out_det > 0)) & (chunk == 0)
-    is_append = is_append or (in_det == 0 and out_det == 0 and chunk == 0 and group > 0)
-    if is_append:
+    is_ac = ((in_det > 0) or (out_det > 0)) & (chunk == 0)
+    is_ac = is_ac or (in_det == 0 and out_det == 0 and chunk == 0 and (group > 0))
+
+    if is_ac and new_hit_file:
         return "append_column"
     return "append"
 

{reboost-0.5.3 → reboost-0.5.5}/src/reboost.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reboost
-Version: 0.5.3
+Version: 0.5.5
 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.5.3 → reboost-0.5.5}/tests/hit/test_build_hit.py

@@ -179,6 +179,60 @@ def test_file_merging(test_gen_lh5, tmptestdir):
     assert len(hits) == 4
 
 
+def test_multi_file(test_gen_lh5, tmptestdir):
+    outfile = [f"{tmptestdir}/basic_hit_t0.lh5", f"{tmptestdir}/basic_hit_t1.lh5"]
+
+    reboost.build_hit(
+        f"{Path(__file__).parent}/configs/basic.yaml",
+        args={},
+        stp_files=[test_gen_lh5, test_gen_lh5],
+        glm_files=None,
+        hit_files=outfile,
+        overwrite=True,
+    )
+
+    for file in outfile:
+        assert lh5.ls(file) == ["hit", "vtx"]
+
+        hits = lh5.read("hit/det1", file).view_as("ak")
+
+        assert len(hits) == 2
+
+
+def test_overwrite(test_gen_lh5, tmptestdir):
+    # test with two output files
+    outfile = [f"{tmptestdir}/basic_hit_t0.lh5", f"{tmptestdir}/basic_hit_t1.lh5"]
+
+    reboost.build_hit(
+        f"{Path(__file__).parent}/configs/basic.yaml",
+        args={},
+        stp_files=[test_gen_lh5, test_gen_lh5],
+        glm_files=None,
+        hit_files=outfile,
+        overwrite=True,
+    )
+    for file in outfile:
+        assert lh5.ls(file) == ["hit", "vtx"]
+
+        hits = lh5.read("hit/det1", file).view_as("ak")
+
+        assert len(hits) == 2
+
+    outfile = f"{tmptestdir}/basic_hit_merged.lh5"
+
+    reboost.build_hit(
+        f"{Path(__file__).parent}/configs/basic.yaml",
+        args={},
+        stp_files=[test_gen_lh5, test_gen_lh5],
+        glm_files=None,
+        hit_files=outfile,
+        overwrite=True,
+    )
+    assert lh5.ls(outfile) == ["hit", "vtx"]
+    hits = lh5.read("hit/det1", outfile).view_as("ak")
+    assert len(hits) == 4
+
+
 def test_full_chain(test_gen_lh5, tmptestdir):
     args = dbetto.AttrsDict(
         {

{reboost-0.5.3 → reboost-0.5.5}/tests/test_utils.py

@@ -122,6 +122,7 @@ def test_wo_mode():
     assert get_wo_mode(0, 0, 0, 0, True, overwrite=False) == "write_safe"
     assert get_wo_mode(0, 0, 1, 0, True, overwrite=False) == "append_column"
     assert get_wo_mode(0, 0, 1, 1, True, overwrite=False) == "append"
+    assert get_wo_mode(0, 0, 1, 0, False, overwrite=False) == "append"
 
 
 def test_get_files_dict():