legend-daq2lh5 1.6.1__py3-none-any.whl → 1.6.2__py3-none-any.whl

daq2lh5/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.1'
-__version_tuple__ = version_tuple = (1, 6, 1)
+__version__ = version = '1.6.2'
+__version_tuple__ = version_tuple = (1, 6, 2)

daq2lh5/cli.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+import json
 import os
 import sys
 
@@ -78,6 +79,13 @@ def daq2lh5_cli():
     parser.add_argument(
         "--overwrite", "-w", action="store_true", help="""Overwrite output files"""
     )
+    parser.add_argument(
+        "--kwargs",
+        "-k",
+        type=str,
+        default="{}",
+        help="""Any additional kwargs to pass to build_raw, will be parsed as a JSON string""",
+    )
 
     args = parser.parse_args()
 
@@ -92,6 +100,9 @@ def daq2lh5_cli():
         print(__version__)  # noqa: T201
         sys.exit()
 
+    if args.kwargs:
+        kwargs = json.loads(args.kwargs)
+
     for stream in args.in_stream:
         basename = os.path.splitext(os.path.basename(stream))[0]
         build_raw(
@@ -102,4 +113,5 @@ def daq2lh5_cli():
             n_max=args.max_rows,
             overwrite=args.overwrite,
             orig_basename=basename,
+            **kwargs,
         )

daq2lh5/fc/fc_config_decoder.py

@@ -66,6 +66,7 @@ class FCConfigDecoder(DataDecoder):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.decoded_values = copy.deepcopy(fc_config_decoded_values)
+        self.key_list = []
 
     def decode_packet(
         self,
@@ -126,7 +127,12 @@ class FCConfigDecoder(DataDecoder):
         ntraces = fcio.config.adcs + fcio.config.triggers
         tbl.add_field("tracemap", lgdo.Array(fcio.config.tracemap[:ntraces]))
 
+        self.key_list.append(f"fcid_{fcio.config.streamid & 0xFFFF}/config")
+
         return tbl
 
+    def get_key_lists(self) -> list[list[int | str]]:
+        return [copy.deepcopy(self.key_list)]
+
     def get_decoded_values(self, key: int | str = None) -> dict[str, dict[str, Any]]:
         return self.decoded_values

daq2lh5/fc/fc_eventheader_decoder.py

@@ -212,7 +212,7 @@ class FCEventHeaderDecoder(DataDecoder):
         self.decoded_values["baseline"]["length_guess"] = n_traces
         self.decoded_values["daqenergy"]["length_guess"] = n_traces
 
-        self.key_list = [get_key(fcio_stream.config.streamid, 0, 0)]
+        self.key_list = [f"fcid_{fcio_stream.config.streamid & 0xFFFF}/evt_hdr"]
 
     def get_key_lists(self) -> list[list[int | str]]:
         return [copy.deepcopy(self.key_list)]
@@ -232,7 +232,7 @@ class FCEventHeaderDecoder(DataDecoder):
     ) -> bool:
 
         # only one key available: this streamid
-        key = get_key(fcio.config.streamid, 0, 0)
+        key = f"fcid_{fcio.config.streamid & 0xFFFF}/evt_hdr"
         if key not in evt_hdr_rbkd:
             return False
 

daq2lh5/fc/fc_fsp_decoder.py

@@ -8,7 +8,6 @@ import numpy as np
 from fcio import FCIO, Limits
 
 from ..data_decoder import DataDecoder
-from .fc_eventheader_decoder import get_key
 
 fsp_config_decoded_values = {
     "packet_id": {
@@ -183,7 +182,7 @@ class FSPConfigDecoder(DataDecoder):
         self.key_list = []
 
     def set_fcio_stream(self, fcio_stream: FCIO) -> None:
-        self.key_list = [f"fsp_config_{get_key(fcio_stream.config.streamid, 0, 0)}"]
+        self.key_list = [f"swtid_{fcio_stream.config.streamid & 0xFFFF}/config"]
         if fcio_stream.fsp is not None:
             wps_n_traces = fcio_stream.fsp.config.wps["tracemap"]["n_mapped"]
             hwm_n_traces = fcio_stream.fsp.config.hwm["tracemap"]["n_mapped"]
@@ -229,6 +228,9 @@ class FSPConfigDecoder(DataDecoder):
     def get_decoded_values(self, key: int = None) -> dict[str, dict[str, Any]]:
         return self.decoded_values
 
+    def get_key_lists(self) -> list[list[int | str]]:
+        return [copy.deepcopy(self.key_list)]
+
     def decode_packet(
         self,
         fcio: FCIO,
@@ -659,6 +661,9 @@ class FSPConfigDecoder(DataDecoder):
             "dsp_ct_thresholds",
             lgdo.Array(np.array(ct["thresholds"], dtype="uint16")[:ct_n_traces]),
         )
+
+        self.key_list.append(f"swtid_{fcio.config.streamid & 0xFFFF}/config")
+
         return self.fsp_config
 
     def make_lgdo(self, key: int | str = None, size: int = None) -> lgdo.Struct:
@@ -694,7 +699,7 @@ class FSPStatusDecoder(DataDecoder):
         self.key_list = []
 
     def set_fcio_stream(self, fcio_stream: FCIO) -> None:
-        self.key_list = [f"fsp_status_{get_key(fcio_stream.config.streamid, 0, 0)}"]
+        self.key_list = [f"swtid_{fcio_stream.config.streamid & 0xFFFF}/status"]
 
     def get_key_lists(self) -> list[list[int | str]]:
         return [copy.deepcopy(self.key_list)]
@@ -709,7 +714,7 @@ class FSPStatusDecoder(DataDecoder):
         packet_id: int,
     ) -> bool:
 
-        key = f"fsp_status_{get_key(fcio.config.streamid, 0, 0)}"
+        key = f"swtid_{fcio.config.streamid & 0xFFFF}/status"
         if key not in fsp_status_rbkd:
             return False
         fsp_status_rb = fsp_status_rbkd[key]
@@ -796,8 +801,8 @@ class FSPEventDecoder(DataDecoder):
     def set_fcio_stream(self, fcio_stream: FCIO) -> None:
 
         self.key_list = [
-            f"fsp_event_{get_key(fcio_stream.config.streamid, 0, 0)}",
-            f"fsp_eventheader_{get_key(fcio_stream.config.streamid, 0, 0)}",
+            f"swtid_{fcio_stream.config.streamid & 0xFFFF}/event",
+            f"swtid_{fcio_stream.config.streamid & 0xFFFF}/evt_hdr",
         ]
 
     def get_decoded_values(self, key: int = None) -> dict[str, dict[str, Any]]:
@@ -815,9 +820,9 @@ class FSPEventDecoder(DataDecoder):
     ) -> bool:
 
         if is_header:
-            key = f"fsp_eventheader_{get_key(fcio.config.streamid, 0, 0)}"
+            key = f"swtid_{fcio.config.streamid & 0xFFFF}/evt_hdr"
         else:
-            key = f"fsp_event_{get_key(fcio.config.streamid, 0, 0)}"
+            key = f"swtid_{fcio.config.streamid & 0xFFFF}/event"
 
         if key not in fsp_evt_rbkd:
             return False
@@ -877,7 +882,7 @@ class FSPEventDecoder(DataDecoder):
         if lens > 0:
             tbl["obs_ps_hwm_prescaled_trace_idx"].flattened_data.nda[
                 start:end
-            ] = fcio.fsp.event.obs_ps_hwm_prescaled_trace_ix
+            ] = fcio.fsp.event.obs_ps_hwm_prescaled_trace_idx
         tbl["obs_ps_hwm_prescaled_trace_idx"].cumulative_length[loc] = end
 
         fsp_evt_rb.loc += 1

daq2lh5/fc/fc_status_decoder.py

@@ -122,7 +122,7 @@ fc_status_decoded_values = {
 
 
 def get_key(streamid, reqid):
-    return (streamid & 0xFFFF) * 1000000 + (reqid & 0xFFFF)
+    return f"fcid_{streamid & 0xFFFF}/status/card{(reqid & 0xFFFF)}"
 
 
 def get_fcid(key: int) -> int:

daq2lh5/fc/fc_streamer.py

@@ -148,7 +148,8 @@ class FCStreamer(DataStreamer):
                 if len(config_rb_list) != 1:
                     log.warning(
                         f"config_rb_list for {config_decoder} had length {len(config_rb_list)}, "
-                        "ignoring all but the first"
+                        "ignoring all but the first. "
+                        f"{config_rb_list}"
                     )
                 rb = config_rb_list[0]
             else:

daq2lh5/orca/orca_fcio.py

@@ -15,7 +15,7 @@ from daq2lh5.fc.fc_fsp_decoder import (
     FSPStatusDecoder,
 )
 from daq2lh5.fc.fc_status_decoder import FCStatusDecoder
-from daq2lh5.fc.fc_status_decoder import get_key as get_status_key
+from daq2lh5.fc.fc_status_decoder import get_key as get_fc_status_key
 
 from ..raw_buffer import RawBufferList
 from .orca_base import OrcaDecoder
@@ -126,23 +126,30 @@ class ORFCIOConfigDecoder(OrcaDecoder):
     def set_header(self, header: OrcaHeader) -> None:
         self.header = header
         self.fc_hdr_info = extract_header_information(header)
-        self.decoded_values = copy.deepcopy(self.decoder.get_decoded_values())
+        self.decoded_values["fcid"] = copy.deepcopy(self.decoder.get_decoded_values())
 
         for fcid in self.fc_hdr_info["fsp_enabled"]:
-            key = get_key(fcid, 0, 0)
-            self.key_list["fc_config"].append(key)
+            self.key_list["fc_config"].append(f"fcid_{fcid}/config")
             if self.fc_hdr_info["fsp_enabled"][fcid]:
                 self.fsp_decoder = FSPConfigDecoder()
-                self.key_list["fsp_config"].append(f"fsp_config_{key}")
+                self.key_list["fsp_config"].append(f"swtid_{fcid}/config")
+                self.decoded_values["swtid"] = copy.deepcopy(
+                    self.fsp_decoder.get_decoded_values()
+                )
         self.max_rows_in_packet = 1
 
-    def get_key_lists(self) -> list[list[int, str]]:
+    def get_key_lists(self) -> list[list[str]]:
         return list(self.key_list.values())
 
-    def get_decoded_values(self, key: int | str = None) -> dict[str, Any]:
-        if isinstance(key, str) and key.startswith("fsp_config"):
-            return copy.deepcopy(self.fsp_decoder.get_decoded_values())
-        return self.decoded_values
+    def get_decoded_values(self, key: str = None) -> dict[str, Any]:
+        if (
+            isinstance(key, str)
+            and key.startswith("swtid_")
+            and self.fsp_decoder is not None
+        ):
+            return self.decoded_values["swtid"]
+        elif (isinstance(key, str) and key.startswith("fcid_")) or key is None:
+            return self.decoded_values["fcid"]
         raise KeyError(f"no decoded values for key {key}")
 
     def decode_packet(
@@ -159,18 +166,21 @@ class ORFCIOConfigDecoder(OrcaDecoder):
 
         if fcio_stream.config.streamid != packet[2]:
             log.warning(
-                f"The expected stream id {packet[2]} does not match the contained stream id {fcio_stream.config.streamid}"
+                f"The expected stream id {packet[2]} does not match the contained stream id "
+                f"{fcio_stream.config.streamid}"
             )
 
         config_rbkd = rbl.get_keyed_dict()
 
+        fcid = fcio_stream.config.streamid & 0xFFFF
+
         # TODO: the decoders could fetch lgdo's using it's key_list
-        fc_key = get_key(fcio_stream.config.streamid, 0, 0)
+        fc_key = f"fcid_{fcid}/config"
         any_full = self.decoder.decode_packet(
             fcio_stream, config_rbkd[fc_key], packet_id
         )
-        if self.fsp_decoder is not None:
-            fsp_key = f"fsp_config_{get_key(fcio_stream.config.streamid, 0, 0)}"
+        if self.fsp_decoder is not None and self.fc_hdr_info["fsp_enabled"][fcid]:
+            fsp_key = f"swtid_{fcid}/config"
             any_full |= self.fsp_decoder.decode_packet(
                 fcio_stream, config_rbkd[fsp_key], packet_id
             )
@@ -184,7 +194,7 @@ class ORFCIOStatusDecoder(OrcaDecoder):
         self.decoder = FCStatusDecoder()
         self.fsp_decoder = None
         self.decoded_values = {}
-        self.key_list = {"fc_status": [], "fsp_status": []}
+        self.key_list = []
         self.max_rows_in_packet = 0
         super().__init__(header=header, **kwargs)
 
@@ -192,44 +202,43 @@ class ORFCIOStatusDecoder(OrcaDecoder):
         """Setter for headers. Overload to set card parameters, etc."""
         self.header = header
         self.fc_hdr_info = extract_header_information(header)
-        self.decoded_values = copy.deepcopy(self.decoder.get_decoded_values())
 
         for fcid in self.fc_hdr_info["n_card"]:
             # If the data was taken without a master distribution module,
             # i.e. only one ADC Module the decoder will just not write to the buffer.
 
             # MDB key
-            self.key_list["fc_status"] = [get_status_key(fcid, 0)]
+            key_list_fcid = [get_fc_status_key(fcid, 0)]
             # ADC module keys
-            self.key_list["fc_status"] += [
-                get_status_key(fcid, 0x2000 + i)
+            key_list_fcid += [
+                get_fc_status_key(fcid, 0x2000 + i)
                 for i in range(self.fc_hdr_info["n_card"][fcid])
             ]
-
+            self.key_list.append(key_list_fcid)
+            self.decoded_values["fcid"] = copy.deepcopy(
+                self.decoder.get_decoded_values()
+            )
             if self.fc_hdr_info["fsp_enabled"][fcid]:
-                key = get_key(fcid, 0, 0)
-                self.key_list["fsp_status"].append(f"fsp_status_{key}")
                 self.fsp_decoder = FSPStatusDecoder()
+                self.key_list.append([f"swtid_{fcid}/status"])
+                self.decoded_values["swtid"] = copy.deepcopy(
+                    self.fsp_decoder.get_decoded_values()
+                )
         self.max_rows_in_packet = max(self.fc_hdr_info["n_card"].values()) + 1
 
-    def get_key_lists(self) -> list[list[int | str]]:
-        return list(self.key_list.values())
+    def get_key_lists(self) -> list[list[str]]:
+        return copy.deepcopy(self.key_list)
 
-    def get_decoded_values(self, key: int | str = None) -> dict[str, Any]:
-        if key is None:
-            dec_vals_list = list(self.decoded_values)
-            if len(dec_vals_list) > 0:
-                return {dec_vals_list[0]: self.decoded_values[dec_vals_list[0]]}
-            raise RuntimeError("decoded_values not built")
+    def get_decoded_values(self, key: str = None) -> dict[str, Any]:
 
         if (
             isinstance(key, str)
-            and key.startswith("fsp_status")
+            and key.startswith("swtid_")
             and self.fsp_decoder is not None
         ):
-            return copy.deepcopy(self.fsp_decoder.get_decoded_values())
-        elif isinstance(key, int):
-            return copy.deepcopy(self.decoder.get_decoded_values())
+            return self.decoded_values["swtid"]
+        elif (isinstance(key, str) and key.startswith("fcid_")) or key is None:
+            return self.decoded_values["fcid"]
         else:
             raise KeyError(f"no decoded values for key {key}")
 
@@ -245,15 +254,25 @@ class ORFCIOStatusDecoder(OrcaDecoder):
         fcio_stream.set_mem_field(memoryview(packet[3:]))
 
         any_full = False
-        while fcio_stream.get_record():
-            if fcio_stream.tag == Tags.Status:
-                any_full |= self.decoder.decode_packet(
+
+        if not fcio_stream.get_record():
+            raise OSError(
+                f"Missing record in FCIO stream {fcio_stream.config.streamid & 0xFFFF}."
+            )
+
+        if fcio_stream.tag == Tags.FSPStatus:
+            if self.fsp_decoder is not None:
+                any_full |= self.fsp_decoder.decode_packet(
                     fcio_stream, status_rbkd, packet_id
                 )
-                if self.fsp_decoder is not None:
-                    any_full |= self.fsp_decoder.decode_packet(
-                        fcio_stream, status_rbkd, packet_id
-                    )
+
+            if not fcio_stream.get_record():
+                raise OSError(
+                    f"Missing record in FCIO stream {fcio_stream.config.streamid & 0xFFFF}."
+                )
+
+        if fcio_stream.tag == Tags.Status:
+            any_full |= self.decoder.decode_packet(fcio_stream, status_rbkd, packet_id)
 
         return bool(any_full)
 
@@ -276,35 +295,31 @@ class ORFCIOEventHeaderDecoder(OrcaDecoder):
 
         key_list = self.fc_hdr_info["key_list"]
         for fcid in key_list:
-            key = get_key(fcid, 0, 0)
-            self.key_list["fc_eventheader"].append(key)
-            self.decoded_values[fcid] = copy.deepcopy(self.decoder.get_decoded_values())
+            self.key_list["fc_eventheader"].append(f"fcid_{fcid}/evt_hdr")
+            self.decoded_values["fcid"] = copy.deepcopy(
+                self.decoder.get_decoded_values()
+            )
             if self.fc_hdr_info["fsp_enabled"][fcid]:
                 self.fsp_decoder = FSPEventDecoder()
-                self.key_list["fsp_eventheader"].append(f"fsp_eventheader_{key}")
+                self.key_list["fsp_eventheader"].append(f"swtid_{fcid}/evt_hdr")
+                self.decoded_values["swtid"] = copy.deepcopy(
+                    self.fsp_decoder.get_decoded_values()
+                )
 
         self.max_rows_in_packet = 1
 
-    def get_key_lists(self) -> list[list[int | str]]:
+    def get_key_lists(self) -> list[list[str]]:
         return list(self.key_list.values())
 
-    def get_decoded_values(self, key: int | str = None) -> dict[str, Any]:
+    def get_decoded_values(self, key: str = None) -> dict[str, Any]:
         if (
             isinstance(key, str)
-            and key.startswith("fsp_eventheader_")
+            and key.startswith("swtid_")
             and self.fsp_decoder is not None
         ):
-            return copy.deepcopy(self.fsp_decoder.get_decoded_values())
-        elif isinstance(key, int):
-            fcid = get_fcid(key)
-            if fcid in self.decoded_values:
-                return self.decoded_values[fcid]
-        elif key is None and self.fsp_decoder is None:
-            dec_vals_list = list(self.decoded_values.values())
-            if len(dec_vals_list) > 0:
-                return dec_vals_list[0]
-            raise RuntimeError("decoded_values not built")
-
+            return self.decoded_values["swtid"]
+        elif (isinstance(key, str) and key.startswith("fcid_")) or key is None:
+            return self.decoded_values["fcid"]
         raise KeyError(f"no decoded values for key {key}")
 
     def decode_packet(
@@ -315,15 +330,25 @@ class ORFCIOEventHeaderDecoder(OrcaDecoder):
         fcio_stream.set_mem_field(memoryview(packet[3:]))
 
         any_full = False
-        while fcio_stream.get_record():
-            if fcio_stream.tag == Tags.EventHeader:
-                any_full |= self.decoder.decode_packet(
-                    fcio_stream, evthdr_rbkd, packet_id
+
+        if not fcio_stream.get_record():
+            raise OSError(
+                f"Missing record in FCIO stream {fcio_stream.config.streamid & 0xFFFF}."
+            )
+
+        if fcio_stream.tag == Tags.FSPEvent:
+            if self.fsp_decoder is not None:
+                any_full |= self.fsp_decoder.decode_packet(
+                    fcio_stream, evthdr_rbkd, packet_id, is_header=True
                 )
-                if self.fsp_decoder is not None:
-                    any_full |= self.fsp_decoder.decode_packet(
-                        fcio_stream, evthdr_rbkd, packet_id, True
-                    )
+
+            if not fcio_stream.get_record():
+                raise OSError(
+                    f"Missing record in FCIO stream {fcio_stream.config.streamid & 0xFFFF}."
+                )
+
+        if fcio_stream.tag == Tags.EventHeader:
+            any_full |= self.decoder.decode_packet(fcio_stream, evthdr_rbkd, packet_id)
 
         return bool(any_full)
 
@@ -335,7 +360,7 @@ class ORFCIOEventDecoder(OrcaDecoder):
         self.decoder = FCEventDecoder()
         self.fsp_decoder = None
 
-        self.key_list = {"event": [], "fsp_event": []}
+        self.key_list = []
         self.decoded_values = {}
         self.max_rows_in_packet = 0
 
@@ -347,24 +372,26 @@ class ORFCIOEventDecoder(OrcaDecoder):
         self.fc_hdr_info = extract_header_information(header)
         key_list = self.fc_hdr_info["key_list"]
         for fcid in key_list:
-            self.key_list["event"] += key_list[fcid]
+            self.key_list.append(key_list[fcid])
             self.decoded_values[fcid] = copy.deepcopy(self.decoder.get_decoded_values())
             self.decoded_values[fcid]["waveform"]["wf_len"] = self.fc_hdr_info[
                 "wf_len"
             ][fcid]
             if self.fc_hdr_info["fsp_enabled"][fcid]:
-                key = get_key(fcid, 0, 0)
-                self.key_list["fsp_event"].append(f"fsp_event_{key}")
                 self.fsp_decoder = FSPEventDecoder()
+                self.key_list.append([f"swtid_{fcid}/event"])
+                self.decoded_values["swtid"] = copy.deepcopy(
+                    self.fsp_decoder.get_decoded_values()
+                )
         self.max_rows_in_packet = max(self.fc_hdr_info["n_adc"].values())
 
-    def get_key_lists(self) -> list[list[int]]:
-        return list(self.key_list.values())
+    def get_key_lists(self) -> list[list[int | str]]:
+        return copy.deepcopy(self.key_list)
 
     def get_max_rows_in_packet(self) -> int:
         return self.max_rows_in_packet
 
-    def get_decoded_values(self, key: int = None) -> dict[str, Any]:
+    def get_decoded_values(self, key: int | str = None) -> dict[str, Any]:
         if key is None:
             dec_vals_list = list(self.decoded_values.values())
             if len(dec_vals_list) > 0:
@@ -373,10 +400,10 @@ class ORFCIOEventDecoder(OrcaDecoder):
 
         if (
             isinstance(key, str)
-            and key.startswith("fsp_event_")
+            and key.startswith("swtid_")
             and self.fsp_decoder is not None
         ):
-            return copy.deepcopy(self.fsp_decoder.get_decoded_values())
+            return self.decoded_values["swtid"]
         elif isinstance(key, int):
             fcid = get_fcid(key)
             if fcid in self.decoded_values:
@@ -394,12 +421,24 @@ class ORFCIOEventDecoder(OrcaDecoder):
         fcio_stream.set_mem_field(memoryview(packet[3:]))
 
         any_full = False
-        while fcio_stream.get_record():
-            if fcio_stream.tag == Tags.Event or fcio_stream.tag == Tags.SparseEvent:
-                any_full |= self.decoder.decode_packet(fcio_stream, evt_rbkd, packet_id)
-                if self.fsp_decoder is not None:
-                    any_full |= self.fsp_decoder.decode_packet(
-                        fcio_stream, evt_rbkd, packet_id, False
-                    )
+
+        if not fcio_stream.get_record():
+            raise OSError(
+                f"Missing record in FCIO stream {fcio_stream.config.streamid & 0xFFFF}."
+            )
+
+        if fcio_stream.tag == Tags.FSPEvent:
+            if self.fsp_decoder is not None:
+                any_full |= self.fsp_decoder.decode_packet(
+                    fcio_stream, evt_rbkd, packet_id
+                )
+
+            if not fcio_stream.get_record():
+                raise OSError(
+                    f"Missing record in FCIO stream {fcio_stream.config.streamid & 0xFFFF}."
+                )
+
+        if fcio_stream.tag == Tags.Event or fcio_stream.tag == Tags.SparseEvent:
+            any_full |= self.decoder.decode_packet(fcio_stream, evt_rbkd, packet_id)
 
         return bool(any_full)

{legend_daq2lh5-1.6.1.dist-info → legend_daq2lh5-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-daq2lh5
-Version: 1.6.1
+Version: 1.6.2
 Summary: Convert digitizer data to LH5
 Author-email: Jason Detwiler <jasondet@uw.edu>
 Maintainer: The LEGEND collaboration
@@ -23,7 +23,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dspeed>=1.3
-Requires-Dist: fcio>=0.7.8
+Requires-Dist: fcio>=0.7.9
 Requires-Dist: h5py>=3.2.0
 Requires-Dist: hdf5plugin
 Requires-Dist: legend-pydataobj>=1.6

{legend_daq2lh5-1.6.1.dist-info → legend_daq2lh5-1.6.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 daq2lh5/__init__.py,sha256=VPmwKuZSA0icpce05ojhnsKWhR4_QUgD0oVXUoN9wks,975
-daq2lh5/_version.py,sha256=vFpyllSQPpQuwzP7Cf743S6HuWgZRMOD31pPfh-WoZM,511
+daq2lh5/_version.py,sha256=0l_x32-zDcY9aQqQSs0LtsRx42EjkEfyXdUn9HtFgXU,511
 daq2lh5/build_raw.py,sha256=wehR1jADL_ponguOMfAsMTxsebE-qdztFw4Txm76fpw,10716
-daq2lh5/cli.py,sha256=7bPfH1XbyAS48wZn_0unj4Y5MD5kF7V34Q5srn4jKVM,2913
+daq2lh5/cli.py,sha256=yCLshhXZdXpeaVElqLYwGHR1uN7fcPDRnsrFQgGdwYM,3210
 daq2lh5/data_decoder.py,sha256=45ckhpfqKh6_FfPUn_iETZLjRFd4VtvQhet4l2KvldA,10606
 daq2lh5/data_streamer.py,sha256=-uns1Y9iReVSJTXGCXD05QQLfqjbQn-VodEmDj7uSJo,16016
 daq2lh5/logging.py,sha256=rYNeToaZBTCaIiC42a4CUroAo1PCOreTXbpEZyMO8Fo,987
@@ -16,12 +16,12 @@ daq2lh5/compass/compass_event_decoder.py,sha256=kiPOaEu8SgLD2wbSPbBahcbTBBRAIw35
 daq2lh5/compass/compass_header_decoder.py,sha256=AA-Md2FIT3nD4mXX9CrWvbbfmKiA436-BTmzcU3_XOY,2823
 daq2lh5/compass/compass_streamer.py,sha256=zSl7IqO0ID0wcixkLE9QVEG3bF9hfGVITVPomCeOFTM,8841
 daq2lh5/fc/__init__.py,sha256=bB1j6r-bDmylNi0iutQeAJGjsDSjLSoXMqFfXWwfb8I,141
-daq2lh5/fc/fc_config_decoder.py,sha256=Mlll1SI4HPmTo6EGubkyP-QcmEfmO-kWaiZCKDc4cxg,4448
+daq2lh5/fc/fc_config_decoder.py,sha256=f-WqmvfDDDnx4ho2q4w5Hmzu55yvweHsi1hgM2X4RbM,4654
 daq2lh5/fc/fc_event_decoder.py,sha256=c2CQSiNxlOEGOZNSgqM3eM-26EUW6MIfK48Am9CHfro,7887
-daq2lh5/fc/fc_eventheader_decoder.py,sha256=jAUxgWqgQmzNhAzMLubgFLMiGpxjqVIut6uhVS6JfyA,12313
-daq2lh5/fc/fc_fsp_decoder.py,sha256=-qQjDkXF7xjF3lYIp2085TY2hRrLwxzyXwQYAn1OAJw,34972
-daq2lh5/fc/fc_status_decoder.py,sha256=ChMxALx36caY7zfCOKozNgXYhLGX9HzBnkyOvQfiABk,8809
-daq2lh5/fc/fc_streamer.py,sha256=U1EPKr-xSlxTCqcgQL6SFlO11WDFT9kcna7gocDKLXo,9162
+daq2lh5/fc/fc_eventheader_decoder.py,sha256=zY8uNVs16U6qu4_x9vD8850t031fy_py91kxXFoKY38,12337
+daq2lh5/fc/fc_fsp_decoder.py,sha256=sCv3YfZ0QnN7LAS2msYo9XbMeEIFuKmyLp3SiB4fQ9M,35074
+daq2lh5/fc/fc_status_decoder.py,sha256=o3DjpXtx3VIk3hWrodWopYczfXiJr-ekSUx_HqW2cyc,8818
+daq2lh5/fc/fc_streamer.py,sha256=iJSd2OiOYAjFtBg-Yr9D64_kp3xO_9Jt5XpO9q0sFpE,9208
 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=DVULTX7JzlRe23HZYXn79VkoU2_z03o7nxWc33bGK8U,14981
@@ -30,7 +30,7 @@ daq2lh5/llama/llama_streamer.py,sha256=lrK73JIXjpogPrkP_tpFQQGSyWxFhivSpU1YEfRMH
 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=Vu05xQO3XYqybjLhzk-XJG41wyeVFSIoXOjvdltDoUw,20865
-daq2lh5/orca/orca_fcio.py,sha256=v2kZWUmutd1HcWJW0h50zsVdAZorP8TG39PP9tf_GCg,15107
+daq2lh5/orca/orca_fcio.py,sha256=WDaWp4JkUDOUvrMCxKWI-kXXrZNQNAakDCdNyFaqL3k,16091
 daq2lh5/orca/orca_flashcam.py,sha256=klGWxME2QS3eOBgb5mD3IrPHXXzb1Zz4B7YDvZvaGD8,33291
 daq2lh5/orca/orca_header.py,sha256=2WlB8rFXwzD89lX51JXYiOlop0-C4pWEEsIWKq2ouDM,4403
 daq2lh5/orca/orca_header_decoder.py,sha256=ORIIyfx22ybyKc-uyWy5ER49-dl3BGpHdfV8OCDmjIw,1632
@@ -38,9 +38,9 @@ daq2lh5/orca/orca_packet.py,sha256=LtKEAcH2VGzY8AQEqAokZTHonShACsKisGdQR0AMDAM,2
 daq2lh5/orca/orca_run_decoder.py,sha256=61gghgjqD1ovH3KoHFJuKJp0GLJn4X0MIuoYrsIzMfQ,2059
 daq2lh5/orca/orca_streamer.py,sha256=sLM5PPLOxJ_aJckJOl9UCjyOaPmNxUKDnrLw22fSNbE,16622
 daq2lh5/orca/skim_orca_file.py,sha256=ESWfbv9yDRGaPf3Ptlw6Dxnc4uwhJoagb_aYlWNyrq0,1954
-legend_daq2lh5-1.6.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-legend_daq2lh5-1.6.1.dist-info/METADATA,sha256=UbfgLNJWCAl6CquW11JoohphH6-rre7kC4UjGcH-5Hs,4005
-legend_daq2lh5-1.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-legend_daq2lh5-1.6.1.dist-info/entry_points.txt,sha256=RPm2GPw2YADil9tWgvZsIysmJz9KuktBWH_1P38PWoc,119
-legend_daq2lh5-1.6.1.dist-info/top_level.txt,sha256=MJQVLyLqMgMKBdVfNXFaCKCjHKakAs19VLbC9ctXZ7A,8
-legend_daq2lh5-1.6.1.dist-info/RECORD,,
+legend_daq2lh5-1.6.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+legend_daq2lh5-1.6.2.dist-info/METADATA,sha256=mMmyM0yX1XPih67NgaGQab1q1z519EuA8BTqksnxDsM,4005
+legend_daq2lh5-1.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+legend_daq2lh5-1.6.2.dist-info/entry_points.txt,sha256=RPm2GPw2YADil9tWgvZsIysmJz9KuktBWH_1P38PWoc,119
+legend_daq2lh5-1.6.2.dist-info/top_level.txt,sha256=MJQVLyLqMgMKBdVfNXFaCKCjHKakAs19VLbC9ctXZ7A,8
+legend_daq2lh5-1.6.2.dist-info/RECORD,,