legend-daq2lh5 1.2.0a2__tar.gz → 1.2.1__tar.gz

{legend_daq2lh5-1.2.0a2/src/legend_daq2lh5.egg-info → legend_daq2lh5-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: legend_daq2lh5
-Version: 1.2.0a2
+Version: 1.2.1
 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 → legend_daq2lh5-1.2.1}/README.md

@@ -10,6 +10,7 @@
 ![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/),
@@ -23,3 +24,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 → legend_daq2lh5-1.2.1}/setup.cfg

@@ -34,7 +34,7 @@ install_requires =
 	dspeed>=1.3.0a4
 	h5py>=3.2.0
 	hdf5plugin
-	legend-pydataobj>=1.5.0a1
+	legend-pydataobj>=1.6
 	numpy>=1.21
 	pyfcutils
 	tqdm>=4.27

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/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.1'
+__version_tuple__ = version_tuple = (1, 2, 1)

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/daq2lh5/cli.py

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

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/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:
@@ -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,
             )

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/daq2lh5/data_streamer.py

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

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/daq2lh5/logging.py

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

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/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[

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/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

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1}/src/daq2lh5/raw_buffer.py

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

{legend_daq2lh5-1.2.0a2 → legend_daq2lh5-1.2.1/src/legend_daq2lh5.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: legend_daq2lh5
-Version: 1.2.0a2
+Version: 1.2.1
 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 → legend_daq2lh5-1.2.1}/src/legend_daq2lh5.egg-info/requires.txt

@@ -1,7 +1,7 @@
 dspeed>=1.3.0a4
 h5py>=3.2.0
 hdf5plugin
-legend-pydataobj>=1.5.0a1
+legend-pydataobj>=1.6
 numpy>=1.21
 pyfcutils
 tqdm>=4.27