legend-daq2lh5 1.4.2__py3-none-any.whl → 1.5.0__py3-none-any.whl

daq2lh5/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.2'
-__version_tuple__ = version_tuple = (1, 4, 2)
+__version__ = version = '1.5.0'
+__version_tuple__ = version_tuple = (1, 5, 0)

daq2lh5/buffer_processor/lh5_buffer_processor.py

@@ -74,7 +74,7 @@ def lh5_buffer_processor(
         # Look one layer deeper for a :meth:`lgdo.Table` if necessary
         elif lh5.ls(lh5_file, f"{tb}"):
             # Check to make sure that this isn't a table itself
-            maybe_table, _ = raw_store.read(f"{tb}", lh5_file)
+            maybe_table = raw_store.read(f"{tb}", lh5_file)
             if isinstance(maybe_table, lgdo.Table):
                 lh5_tables.append(f"{tb}")
                 del maybe_table
@@ -114,7 +114,7 @@ def lh5_buffer_processor(
 
     # Write everything in the raw file to the new file, check for proc_spec under either the group name, out_name, or the name
     for tb in lh5_tables:
-        lgdo_obj, _ = raw_store.read(f"{tb}", lh5_file)
+        lgdo_obj = raw_store.read(f"{tb}", lh5_file)
 
         # Find the out_name.
         # If the top level group has an lgdo table in it, then the out_name is group

daq2lh5/fc/fc_event_decoder.py

@@ -80,7 +80,7 @@ fc_decoded_values = {
 }
 """Default FlashCam Event decoded values.
 
-Re-used by :class:`~.orca.orca_flashcam.ORFlashCamWaveformDecoder`.
+Reused by :class:`~.orca.orca_flashcam.ORFlashCamWaveformDecoder`.
 
 Warning
 -------

daq2lh5/llama/llama_event_decoder.py

@@ -20,6 +20,8 @@ llama_decoded_values_template = {
     "fadc_channel_id": {"dtype": "uint32"},
     # time since epoch
     "time_since_run_start": {"dtype": "float64", "units": "s"},
+    "unixtime": {"dtype": "float64", "units": "s"},
+    "unixtime_accuracy": {"dtype": "float64", "units": "s"},
     "fadc_status_bits": {"dtype": "uint32"},
     # waveform data --> not always present
     # "waveform": {
@@ -109,6 +111,9 @@ class LLAMAEventDecoder(DataDecoder):
             if format_bits & 0x08:
                 self.__add_energy(self.decoded_values[fch])
 
+    def set_global_configs(self, global_configs: dict[str, Any]):
+        self.global_configs = global_configs
+
     def get_key_lists(self) -> list[list[int | str]]:
         """Get list of keys.
 
@@ -196,6 +201,11 @@ class LLAMAEventDecoder(DataDecoder):
         tbl["fadc_channel_id"].nda[ii] = fadc_channel_id
         tbl["packet_id"].nda[ii] = packet_id
         tbl["time_since_run_start"].nda[ii] = timestamp
+        tbl["unixtime"].nda[ii] = timestamp + self.global_configs["initial_timestamp"]
+        # accuracy when comparing timestamps of different files:
+        tbl["unixtime_accuracy"].nda[ii] = self.global_configs[
+            "initial_timestamp_accuracy"
+        ]
 
         offset = 2
         if format_bits & 0x1:

daq2lh5/llama/llama_header_decoder.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
 
+import datetime
 import io
 import logging
+import os
+import re
 from typing import Any, Dict
 
 import lgdo
@@ -15,6 +18,25 @@ log = logging.getLogger(__name__)
 LLAMA_Channel_Configs_t = Dict[int, Dict[str, Any]]
 
 
+def parse_filename_for_timestamp(f_in_name: str) -> float:
+    """take a filename; return the unixtime parsed from the filename; 0 if impossible."""
+    filename = os.path.basename(f_in_name)
+    if match := re.fullmatch(r".*(\d{8})[-T](\d{6})(Z?).*", filename):
+        tsymd = match.group(1)
+        tshms = match.group(2)
+        utc: bool = True if match.group(3) == "Z" else False
+        when_file: datetime.datetime = datetime.datetime.strptime(
+            tsymd + tshms, "%Y%m%d%H%M%S"
+        )  # naive datetime object
+        if utc:
+            when_file = when_file.replace(
+                tzinfo=datetime.timezone.utc
+            )  # make it aware; UTC. Naive is treated as local
+        return when_file.timestamp()
+    else:
+        return 0
+
+
 class LLAMAHeaderDecoder(DataDecoder):  # DataDecoder currently unused
     """Decode llamaDAQ header data.
 
@@ -31,7 +53,7 @@ class LLAMAHeaderDecoder(DataDecoder):  # DataDecoder currently unused
         self.config = lgdo.Struct()
         self.channel_configs = None
 
-    def decode_header(self, f_in: io.BufferedReader) -> lgdo.Struct:
+    def decode_header(self, f_in: io.BufferedReader, f_in_name: str) -> lgdo.Struct:
         n_bytes_read = 0
 
         f_in.seek(0)  # should be there anyhow, but re-set if not
@@ -55,6 +77,15 @@ class LLAMAHeaderDecoder(DataDecoder):  # DataDecoder currently unused
         self.length_econf = evt_data_16[5]
         self.number_chOpen = evt_data_32[3]
 
+        self.global_configs = {}
+
+        # currently pulled from filename with 1s precision.
+        # change if we have it in the llamaDAQ file's header
+        self.global_configs["initial_timestamp"] = parse_filename_for_timestamp(
+            f_in_name
+        )
+        self.global_configs["initial_timestamp_accuracy"] = 1.0  # in seconds
+
         log.debug(
             f"File version: {self.version_major}.{self.version_minor}.{self.version_patch}"
         )
@@ -72,6 +103,13 @@ class LLAMAHeaderDecoder(DataDecoder):  # DataDecoder currently unused
         self.config.add_field("version_patch", lgdo.Scalar(self.version_patch))
         self.config.add_field("length_econf", lgdo.Scalar(self.length_econf))
         self.config.add_field("number_chOpen", lgdo.Scalar(self.number_chOpen))
+        self.config.add_field(
+            "initial_timestamp", lgdo.Scalar(self.global_configs["initial_timestamp"])
+        )
+        self.config.add_field(
+            "initial_timestamp_accuracy",
+            lgdo.Scalar(self.global_configs["initial_timestamp_accuracy"]),
+        )
 
         for fch_id, fch_content in self.channel_configs.items():
             fch_lgdo = lgdo.Struct()
@@ -88,6 +126,9 @@ class LLAMAHeaderDecoder(DataDecoder):  # DataDecoder currently unused
     def get_channel_configs(self) -> LLAMA_Channel_Configs_t:
         return self.channel_configs
 
+    def get_global_configs(self) -> dict[str, Any]:
+        return self.global_configs
+
     def __decode_channel_configs(self, f_in: io.BufferedReader) -> int:
         """Reads the metadata.
 

daq2lh5/llama/llama_streamer.py

@@ -53,12 +53,15 @@ class LLAMAStreamer(DataStreamer):
         self.packet_id = 0
 
         # read header info here
-        header, n_bytes_hdr = self.header_decoder.decode_header(self.in_stream)
+        header, n_bytes_hdr = self.header_decoder.decode_header(
+            self.in_stream, llama_filename
+        )
         self.n_bytes_read += n_bytes_hdr
 
         self.event_decoder.set_channel_configs(
             self.header_decoder.get_channel_configs()
         )
+        self.event_decoder.set_global_configs(self.header_decoder.get_global_configs())
 
         # as far as I can tell, this happens if a user does not specify output.
         # Then I can still get a rb_lib, but that misses keys entirely, which I need since channels can have different setups.

daq2lh5/orca/orca_streamer.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import bz2
 import gzip
 import json
 import logging
@@ -201,6 +202,8 @@ class OrcaStreamer(DataStreamer):
             self.close_in_stream()
         if stream_name.endswith(".gz"):
             self.in_stream = gzip.open(stream_name.encode("utf-8"), "rb")
+        elif stream_name.endswith(".bz2"):
+            self.in_stream = bz2.open(stream_name.encode("utf-8"), "rb")
         else:
             self.in_stream = open(stream_name.encode("utf-8"), "rb")
         self.n_bytes_read = 0

{legend_daq2lh5-1.4.2.dist-info → legend_daq2lh5-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: legend_daq2lh5
-Version: 1.4.2
+Version: 1.5.0
 Summary: Convert digitizer data to LH5
 Home-page: https://github.com/legend-exp/legend-daq2lh5
 Author: Jason Detwiler
@@ -11,7 +11,6 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
@@ -48,6 +47,7 @@ Requires-Dist: pre-commit; extra == "test"
 Requires-Dist: pylegendtestdata; extra == "test"
 Requires-Dist: pytest>=6.0; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Dynamic: license-file
 
 # legend-daq2lh5
 

{legend_daq2lh5-1.4.2.dist-info → legend_daq2lh5-1.5.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 daq2lh5/__init__.py,sha256=VPmwKuZSA0icpce05ojhnsKWhR4_QUgD0oVXUoN9wks,975
-daq2lh5/_version.py,sha256=Ls_J-pNiuTKX1KU6pZ6tPQXAMcmLAzW_HHHgGVQNEd0,511
+daq2lh5/_version.py,sha256=qEW4HoWHYDkBguijNs9nZzHd38qlKSeRTDG2QQbYrGY,511
 daq2lh5/build_raw.py,sha256=SDpdOU8qpfzMtx8gtFu-RZYqxutQo1smJSkv-LrH9YE,10672
 daq2lh5/cli.py,sha256=7bPfH1XbyAS48wZn_0unj4Y5MD5kF7V34Q5srn4jKVM,2913
 daq2lh5/data_decoder.py,sha256=Cn40fodfKs7pKa2odzG1j806iw9IyQVfbbWObNGmof8,10677
@@ -9,7 +9,7 @@ daq2lh5/raw_buffer.py,sha256=LfkVAOZa4cWz227Ef22rKi57Shk7GbENoxUEkxC6IgU,17403
 daq2lh5/utils.py,sha256=Pc8Oh0ZVBqwwVehyhSJttHnX5tWbOyEZPk-rVg8mb0c,839
 daq2lh5/buffer_processor/__init__.py,sha256=7k6v_KPximtv7805QnX4-xp_S3vqvqwDfdV3q95oZJo,84
 daq2lh5/buffer_processor/buffer_processor.py,sha256=GUxpNDbqGLuUEZmXjeratipbzmki12RFNYZkxgMtesg,14483
-daq2lh5/buffer_processor/lh5_buffer_processor.py,sha256=einRDLI6EVR-U_TT2GdCZPctFnosJ774eMiUj-ahn6c,8316
+daq2lh5/buffer_processor/lh5_buffer_processor.py,sha256=BEWC0fFg7YU-COcp6Z0W51DLBq5NeGNwSI_97H4TrnQ,8310
 daq2lh5/compass/__init__.py,sha256=mOXHWp7kRDgNTPQty3E8k2KPSy_vAzjneKfAcCVaPyE,132
 daq2lh5/compass/compass_config_parser.py,sha256=zeAsOo1dOJPGLL8-zkAcdYRkqt8BodtOPi96n7fWsl4,12300
 daq2lh5/compass/compass_event_decoder.py,sha256=kiPOaEu8SgLD2wbSPbBahcbTBBRAIw35wtVLBcwPcXY,7386
@@ -17,14 +17,14 @@ daq2lh5/compass/compass_header_decoder.py,sha256=AA-Md2FIT3nD4mXX9CrWvbbfmKiA436
 daq2lh5/compass/compass_streamer.py,sha256=zSl7IqO0ID0wcixkLE9QVEG3bF9hfGVITVPomCeOFTM,8841
 daq2lh5/fc/__init__.py,sha256=bB1j6r-bDmylNi0iutQeAJGjsDSjLSoXMqFfXWwfb8I,141
 daq2lh5/fc/fc_config_decoder.py,sha256=RLRfUOZN0vYbAprqTymP7TGg641IiP9rgCGIOwWVKzU,1996
-daq2lh5/fc/fc_event_decoder.py,sha256=JIRsySnxeuY3wmxjJOrTXo6wpelVup8WIvxU-fkPL-A,8131
+daq2lh5/fc/fc_event_decoder.py,sha256=J1kKkd3Qz7SP3y0MGMxbsmWlL9SdVATdYX26bivS_Ho,8130
 daq2lh5/fc/fc_status_decoder.py,sha256=o_3vTAgYXelZxIsreCYioVYid2mY-wqloYKlxoCqX5Q,3390
 daq2lh5/fc/fc_streamer.py,sha256=S0imXdVsiyolPvxI1uiBngpC58DporSNZPqx1HeVi5o,5737
 daq2lh5/llama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 daq2lh5/llama/llama_base.py,sha256=B-NCBjE_FQE1WxijWi4Z1XBy4rqLHm2XhkC40s7Sdms,290
-daq2lh5/llama/llama_event_decoder.py,sha256=D7MRPmE-ucNCjeLJzY3RepmijjkvGHzu3vNV0zkcLho,14489
-daq2lh5/llama/llama_header_decoder.py,sha256=xi_BMw4HLQc-PQ5wIZWSHSsBZvrCpS9_G03X7Mr6tGA,6175
-daq2lh5/llama/llama_streamer.py,sha256=Bmcj5Bs28KSV4y08TeJcntzUAkqz6HqlSNm7Kffgloc,5203
+daq2lh5/llama/llama_event_decoder.py,sha256=DVULTX7JzlRe23HZYXn79VkoU2_z03o7nxWc33bGK8U,14981
+daq2lh5/llama/llama_header_decoder.py,sha256=r57sn_3eh21xpKfsAOPDmhPW4ULzt_0b7M8HZgmwU_4,7712
+daq2lh5/llama/llama_streamer.py,sha256=lrK73JIXjpogPrkP_tpFQQGSyWxFhivSpU1YEfRMHhQ,5329
 daq2lh5/orca/__init__.py,sha256=Xf6uOIOzk_QkKH_7VizGlCo3iuiAgLtUE3A07x_HXC0,175
 daq2lh5/orca/orca_base.py,sha256=-XIolXsHj-1EdewaGxyvJTZvRGZsDyZe-5PzVOd-LFY,1333
 daq2lh5/orca/orca_digitizers.py,sha256=BsAA3OgQ13YIirDM8pd_xDY3F5FqEY4YjSHviflmov8,20867
@@ -33,10 +33,10 @@ daq2lh5/orca/orca_header.py,sha256=1tDRG8l9Gqu4c0K4BjXBSC5eiLTzY_HaCsgNBiv5EgI,4
 daq2lh5/orca/orca_header_decoder.py,sha256=ORIIyfx22ybyKc-uyWy5ER49-dl3BGpHdfV8OCDmjIw,1632
 daq2lh5/orca/orca_packet.py,sha256=nOHuBXsTI1SzTjHZtff0txSQYvkwo4XGx3fpk7XfYj8,2489
 daq2lh5/orca/orca_run_decoder.py,sha256=3atKXC6mDi8_PK6ICUBBJ-LyaTM8OU31kKWIpmttRr4,2065
-daq2lh5/orca/orca_streamer.py,sha256=VbD9PF-rx_Rk-rEy7XECPmgxr6kZSUf0tC7Qbol3Qeg,15693
-legend_daq2lh5-1.4.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-legend_daq2lh5-1.4.2.dist-info/METADATA,sha256=a7rqLL0JYeSoxoD9lopkQN55eyrSC0Ten8M__syVX9A,3956
-legend_daq2lh5-1.4.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-legend_daq2lh5-1.4.2.dist-info/entry_points.txt,sha256=R08R4NrHi0ab5MJN_qKqzePVzrLSsw5WpmbiwwduYjw,59
-legend_daq2lh5-1.4.2.dist-info/top_level.txt,sha256=MJQVLyLqMgMKBdVfNXFaCKCjHKakAs19VLbC9ctXZ7A,8
-legend_daq2lh5-1.4.2.dist-info/RECORD,,
+daq2lh5/orca/orca_streamer.py,sha256=-NxH0oR9ZSd9ljbR-z_GiPx0Bv7aiLdef6nX2vBYJ3k,15820
+legend_daq2lh5-1.5.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+legend_daq2lh5-1.5.0.dist-info/METADATA,sha256=sf5hY5retNd3CuhkpUmMpxEo4OkOJ1XVDsCi-9qyRG4,3901
+legend_daq2lh5-1.5.0.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+legend_daq2lh5-1.5.0.dist-info/entry_points.txt,sha256=R08R4NrHi0ab5MJN_qKqzePVzrLSsw5WpmbiwwduYjw,59
+legend_daq2lh5-1.5.0.dist-info/top_level.txt,sha256=MJQVLyLqMgMKBdVfNXFaCKCjHKakAs19VLbC9ctXZ7A,8
+legend_daq2lh5-1.5.0.dist-info/RECORD,,

{legend_daq2lh5-1.4.2.dist-info → legend_daq2lh5-1.5.0.dist-info}/WHEEL

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