legend-daq2lh5 1.2.0a2__py3-none-any.whl → 1.2.2__py3-none-any.whl

daq2lh5/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.2.0a2'
-__version_tuple__ = version_tuple = (1, 2, 0)
+__version__ = version = '1.2.2'
+__version_tuple__ = version_tuple = (1, 2, 2)

daq2lh5/cli.py

@@ -1,4 +1,5 @@
 """legend-daq2lh5's command line interface utilities."""
+
 from __future__ import annotations
 
 import argparse

daq2lh5/data_decoder.py

@@ -1,12 +1,14 @@
 """
 Base classes for decoding data into raw LGDO Tables or files
 """
+
 from __future__ import annotations
 
 import lgdo
 import numpy as np
 from lgdo import LGDO
 from lgdo.lh5 import LH5Store
+from lgdo.lh5 import datatype as dtypeutils
 
 
 class DataDecoder:
@@ -72,7 +74,7 @@ class DataDecoder:
     def __init__(
         self, garbage_length: int = 256, packet_size_guess: int = 1024
     ) -> None:
-        self.garbage_table = lgdo.Table(garbage_length)
+        self.garbage_table = lgdo.Table(size=garbage_length)
         shape_guess = (garbage_length, packet_size_guess)
         self.garbage_table.add_field(
             "packets", lgdo.VectorOfVectors(shape_guess=shape_guess, dtype="uint8")
@@ -205,10 +207,10 @@ class DataDecoder:
                 continue
 
             # Parse datatype for remaining lgdos
-            datatype, shape, elements = lgdo.lh5.utils.parse_datatype(datatype)
+            lgdotype = dtypeutils.datatype(datatype)
 
             # ArrayOfEqualSizedArrays
-            if datatype == "array_of_equalsized_arrays":
+            if lgdotype is lgdo.ArrayOfEqualSizedArrays:
                 length = attrs.pop("length")
                 # only arrays of 1D arrays are supported at present
                 dims = (1, 1)
@@ -219,7 +221,7 @@ class DataDecoder:
                 continue
 
             # VectorOfVectors
-            if elements.startswith("array"):
+            if lgdotype is lgdo.VectorOfVectors:
                 length_guess = size
                 if "length_guess" in attrs:
                     length_guess = attrs.pop("length_guess")
@@ -233,7 +235,7 @@ class DataDecoder:
             raise RuntimeError(
                 type(self).__name__,
                 ": do not know how to make a",
-                datatype,
+                lgdotype.__name__,
                 "for",
                 field,
             )

daq2lh5/data_streamer.py

@@ -1,6 +1,7 @@
 """
 Base classes for streaming data.
 """
+
 from __future__ import annotations
 
 import fnmatch

daq2lh5/logging.py

@@ -1,4 +1,5 @@
 """This module implements some helpers for setting up logging."""
+
 import logging
 
 import colorlog

daq2lh5/orca/orca_flashcam.py

@@ -421,13 +421,13 @@ class ORFlashCamListenerStatusDecoder(OrcaDecoder):
                     (fd0 + i_card) * 5 + j
                 ] = packet[i_cd + 14 + j]
             for j in range(5):
-                tbl["card_temps"].flattened_data.nda[
-                    (fd0 + i_card) * 5 + j
-                ] = int_packet[i_cd + 19 + j]
+                tbl["card_temps"].flattened_data.nda[(fd0 + i_card) * 5 + j] = (
+                    int_packet[i_cd + 19 + j]
+                )
             for j in range(6):
-                tbl["card_voltages"].flattened_data.nda[
-                    (fd0 + i_card) * 6 + j
-                ] = int_packet[i_cd + 24 + j]
+                tbl["card_voltages"].flattened_data.nda[(fd0 + i_card) * 6 + j] = (
+                    int_packet[i_cd + 24 + j]
+                )
             tbl["card_main_current"].flattened_data.nda[fd0 + i_card] = int_packet[
                 i_cd + 30
             ]
@@ -435,14 +435,14 @@ class ORFlashCamListenerStatusDecoder(OrcaDecoder):
                 i_cd + 31
             ]
             for j in range(2):
-                tbl["card_adc_temps"].flattened_data.nda[
-                    (fd0 + i_card) * 2 + j
-                ] = int_packet[i_cd + 32 + j]
+                tbl["card_adc_temps"].flattened_data.nda[(fd0 + i_card) * 2 + j] = (
+                    int_packet[i_cd + 32 + j]
+                )
             # packet[34] is empty / dummy
             for j in range(4):
-                tbl["card_cti_links"].flattened_data.nda[
-                    (fd0 + i_card) * 4 + j
-                ] = packet[i_cd + 35 + j]
+                tbl["card_cti_links"].flattened_data.nda[(fd0 + i_card) * 4 + j] = (
+                    packet[i_cd + 35 + j]
+                )
             for j in range(256):
                 value = packet[i_cd + 39 + j] if j < n_link_states else 0
                 tbl["card_link_states"].flattened_data.nda[

daq2lh5/orca/orca_packet.py

@@ -4,6 +4,7 @@ Provides convenience functions for working with ORCA packets.
 An ORCA packet is represented by a one-dimensional :class:`numpy.ndarray` of
 type :class:`numpy.uint32`.
 """
+
 from __future__ import annotations
 
 import logging

daq2lh5/raw_buffer.py

@@ -62,6 +62,7 @@ keys.
       }
     }
 """
+
 from __future__ import annotations
 
 import os

{legend_daq2lh5-1.2.0a2.dist-info → legend_daq2lh5-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: legend_daq2lh5
-Version: 1.2.0a2
+Version: 1.2.2
 Summary: Convert digitizer data to LH5
 Home-page: https://github.com/legend-exp/legend-daq2lh5
 Author: Jason Detwiler
@@ -29,7 +29,7 @@ License-File: LICENSE
 Requires-Dist: dspeed >=1.3.0a4
 Requires-Dist: h5py >=3.2.0
 Requires-Dist: hdf5plugin
-Requires-Dist: legend-pydataobj >=1.5.0a1
+Requires-Dist: legend-pydataobj >=1.6
 Requires-Dist: numpy >=1.21
 Requires-Dist: pyfcutils
 Requires-Dist: tqdm >=4.27
@@ -60,6 +60,7 @@ Requires-Dist: pytest-cov ; extra == 'test'
 ![GitHub pull requests](https://img.shields.io/github/issues-pr/legend-exp/legend-daq2lh5?logo=github)
 ![License](https://img.shields.io/github/license/legend-exp/legend-daq2lh5)
 [![Read the Docs](https://img.shields.io/readthedocs/legend-daq2lh5?logo=readthedocs)](https://legend-daq2lh5.readthedocs.io)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10721223.svg)](https://doi.org/10.5281/zenodo.10721223)
 
 JSON-configurable conversion of digitized data into
 [LEGEND HDF5](https://legend-exp.github.io/legend-data-format-specs/dev/hdf5/),
@@ -73,3 +74,6 @@ Currently supported DAQ data formats:
   - FlashCam
   - [Struck SIS3302](https://www.struck.de/sis3302.htm)
   - [Struck SIS3316](https://www.struck.de/sis3316.html)
+
+If you are using this software, consider
+[citing](https://doi.org/10.5281/zenodo.10721223)!

{legend_daq2lh5-1.2.0a2.dist-info → legend_daq2lh5-1.2.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 daq2lh5/__init__.py,sha256=VPmwKuZSA0icpce05ojhnsKWhR4_QUgD0oVXUoN9wks,975
-daq2lh5/_version.py,sha256=QdieYxCxCPnvnGJZjmRZ-Yg8ihwA80GE9XsqfSLR8Q0,413
+daq2lh5/_version.py,sha256=XEVwqOPlIChKtEnSO5v_SvghWXnn9WeQSoJ436w3v9Y,411
 daq2lh5/build_raw.py,sha256=JFXC5ln9u353TUZMksY3zydLiV2HlxqdI6_Y2_ZMCIE,10524
-daq2lh5/cli.py,sha256=HCZ9Vyg-gqvairN9zJIpBjw5vLpp9ZUOOQYLFxloLL8,2912
-daq2lh5/data_decoder.py,sha256=ka2WIJuPvsG892__HCW1SagCEzyiZJ2kQP6zGDMtlr0,10641
-daq2lh5/data_streamer.py,sha256=6SEAekOHyfC4k3E0df0lW37ap6ZemVFbH8PYMl6UvCU,14130
-daq2lh5/logging.py,sha256=Nu3wgIoWN7cyUxuzPom5rMwFvTlBu8p8d9uONHDquRg,965
-daq2lh5/raw_buffer.py,sha256=dyPUok0N3MP41oP9F8sO_PrH7-SWs9UdPh7dqCF729g,17687
+daq2lh5/cli.py,sha256=7bPfH1XbyAS48wZn_0unj4Y5MD5kF7V34Q5srn4jKVM,2913
+daq2lh5/data_decoder.py,sha256=Cn40fodfKs7pKa2odzG1j806iw9IyQVfbbWObNGmof8,10677
+daq2lh5/data_streamer.py,sha256=uv_pCFR45Yoi8GK7p_MYqGk_lzWspeg8cWZensCDqAQ,14131
+daq2lh5/logging.py,sha256=_1gq0S1PyzfQsSTiNm--ERJy-4FRfborTz0-vkMelyE,966
+daq2lh5/raw_buffer.py,sha256=2jJvH7BbVkJCzF5A2nOIdcgwUs68eLnpvc0FvTjckaI,17688
 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=yL1ru0_GTsZx099oi45sXL-FxPfdChtStd_IFtZNI_Q,8222
@@ -22,15 +22,15 @@ daq2lh5/fc/fc_streamer.py,sha256=S0imXdVsiyolPvxI1uiBngpC58DporSNZPqx1HeVi5o,573
 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
-daq2lh5/orca/orca_flashcam.py,sha256=gsvPorUXk1Jn-U93GsxXJ5z6pbTK2yjsYDqZFVCm57U,33088
+daq2lh5/orca/orca_flashcam.py,sha256=IntAxrPZEL64LnulnoKkMO7URLOB78DpzjD1_u6PlaE,33096
 daq2lh5/orca/orca_header.py,sha256=1tDRG8l9Gqu4c0K4BjXBSC5eiLTzY_HaCsgNBiv5EgI,4283
 daq2lh5/orca/orca_header_decoder.py,sha256=ORIIyfx22ybyKc-uyWy5ER49-dl3BGpHdfV8OCDmjIw,1632
-daq2lh5/orca/orca_packet.py,sha256=TcdfuYN8_gcug_Xdjz98KqjHw1MqJ4J98zc7WI2xtf4,2488
+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.2.0a2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-legend_daq2lh5-1.2.0a2.dist-info/METADATA,sha256=PNlMNfJ4N9zdp9WwOjwQw-pTPftK7wD_CYCOdxUsBTY,3755
-legend_daq2lh5-1.2.0a2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-legend_daq2lh5-1.2.0a2.dist-info/entry_points.txt,sha256=R08R4NrHi0ab5MJN_qKqzePVzrLSsw5WpmbiwwduYjw,59
-legend_daq2lh5-1.2.0a2.dist-info/top_level.txt,sha256=MJQVLyLqMgMKBdVfNXFaCKCjHKakAs19VLbC9ctXZ7A,8
-legend_daq2lh5-1.2.0a2.dist-info/RECORD,,
+legend_daq2lh5-1.2.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+legend_daq2lh5-1.2.2.dist-info/METADATA,sha256=3fISxtb-PvR-D2YG03ZuQYi95ORmLDCPk0w2f0e-wDc,3950
+legend_daq2lh5-1.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+legend_daq2lh5-1.2.2.dist-info/entry_points.txt,sha256=R08R4NrHi0ab5MJN_qKqzePVzrLSsw5WpmbiwwduYjw,59
+legend_daq2lh5-1.2.2.dist-info/top_level.txt,sha256=MJQVLyLqMgMKBdVfNXFaCKCjHKakAs19VLbC9ctXZ7A,8
+legend_daq2lh5-1.2.2.dist-info/RECORD,,

{legend_daq2lh5-1.2.0a2.dist-info → legend_daq2lh5-1.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any