From 4019aaa1f2e1fec3d70c71026be0d60578448bd8 Mon Sep 17 00:00:00 2001 From: "Matthew F. McEneaney" Date: Mon, 3 Nov 2025 17:47:30 -0500 Subject: [PATCH 1/4] fix: Fix hipopy syntax. --- hipopy/hipopy.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hipopy/hipopy.py b/hipopy/hipopy.py index 8c12638..8831722 100644 --- a/hipopy/hipopy.py +++ b/hipopy/hipopy.py @@ -704,7 +704,7 @@ def getInts(self, bankName, item): Get a column of ints from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = bank.getInts(item) + data = hipopybind.getInts(bank,item) return data def getFloats(self, bankName, item): @@ -726,7 +726,7 @@ def getFloats(self, bankName, item): Get a column of floats from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = bank.getFloats(item) + data = hipopybind.getFloats(bank,item) return data def getDoubles(self, bankName, item): @@ -748,7 +748,7 @@ def getDoubles(self, bankName, item): Get a column of doubles from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = bank.getDoubles(item) + data = hipopybind.getDoubles(bank,item) return data def getShorts(self, bankName, item): @@ -770,7 +770,7 @@ def getShorts(self, bankName, item): Get a column of shorts from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = bank.getShorts(item) + data = hipopybind.getShorts(bank,item) return data def getLongs(self, bankName, item): @@ -792,7 +792,7 @@ def getLongs(self, bankName, item): Get a column of longs from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = bank.getLongs(item) + data = hipopybind.getLongs(bank,item) return data def getBytes(self, bankName, item): @@ -814,7 +814,7 @@ def getBytes(self, bankName, item): Get a column of bytes from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = bank.getBytes(item) + data = hipopybind.getBytes(bank,item) return data def __iter__(self): From 3c60e5d1ce1ab9d416de1d6c236557f3a1779a3a Mon Sep 17 00:00:00 2001 From: "Matthew F. McEneaney" Date: Mon, 3 Nov 2025 17:48:47 -0500 Subject: [PATCH 2/4] fix: Remove extraneous attributes. --- hipopy/hipopy.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hipopy/hipopy.py b/hipopy/hipopy.py index 8831722..d87c87d 100644 --- a/hipopy/hipopy.py +++ b/hipopy/hipopy.py @@ -835,7 +835,6 @@ def __init__(self, hpfile): if self.hpfile.mode != "w": self.hpfile.readAllBanks() # IMPORTANT! self.banks = self.hpfile.getBanks() - self.verbose = False # NOTE: Not really necessary. self.items = {} # Read all requested banks @@ -893,8 +892,6 @@ class hipochain: Batch size for reading banks mode : string Currently fixed to always be in read mode ("r") - verbose : boolean - Currently fixed to always be False tags : int or list of ints Set bank tags for reader to use. 0 works for most banks. 1 is needed for scaler banks. @@ -924,7 +921,6 @@ def __init__(self, names, banks=None, step=100, tags=None, experimental=True): self.banks = banks self.step = step self.mode = "r" - self.verbose = False self.tags = tags self.experimental = experimental From f758edb42b8115d236f4e73888dbf118ef2db10f Mon Sep 17 00:00:00 2001 From: "Matthew F. McEneaney" Date: Mon, 3 Nov 2025 17:50:51 -0500 Subject: [PATCH 3/4] fix: Update version patch. --- docs/source/conf.py | 2 +- hipopy/__init__.py | 2 +- pyproject.toml | 2 +- tests/test_hipopy.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index ba08ffb..3a3936c 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -13,7 +13,7 @@ author = 'Matthew McEneaney' release = '2.0' -version = '2.0.0' +version = '2.0.1' # -- General configuration diff --git a/hipopy/__init__.py b/hipopy/__init__.py index 0422459..d7ec17a 100644 --- a/hipopy/__init__.py +++ b/hipopy/__init__.py @@ -4,6 +4,6 @@ Hipopy - Python library for reading CLAS12 HIPO files """ -__version__ = "2.0.0" +__version__ = "2.0.1" from .hipopy import * diff --git a/pyproject.toml b/pyproject.toml index e9751bb..6d14e3d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "hipopy" -version = "2.0.0" +version = "2.0.1" license = "MIT" description = "UpROOT-Like I/O Interface for CLAS12 HIPO Files" authors = ["Matthew McEneaney "] diff --git a/tests/test_hipopy.py b/tests/test_hipopy.py index e3e91af..10c73a1 100644 --- a/tests/test_hipopy.py +++ b/tests/test_hipopy.py @@ -2,4 +2,4 @@ def test_version(): - assert __version__ == "2.0.0" + assert __version__ == "2.0.1" From f1eb8c010ea68d9c065f2fadb9bec664adfa7921 Mon Sep 17 00:00:00 2001 From: "Matthew F. McEneaney" Date: Mon, 3 Nov 2025 17:53:04 -0500 Subject: [PATCH 4/4] fix: Format code. --- hipopy/hipopy.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hipopy/hipopy.py b/hipopy/hipopy.py index d87c87d..a3e8ccc 100644 --- a/hipopy/hipopy.py +++ b/hipopy/hipopy.py @@ -704,7 +704,7 @@ def getInts(self, bankName, item): Get a column of ints from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = hipopybind.getInts(bank,item) + data = hipopybind.getInts(bank, item) return data def getFloats(self, bankName, item): @@ -726,7 +726,7 @@ def getFloats(self, bankName, item): Get a column of floats from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = hipopybind.getFloats(bank,item) + data = hipopybind.getFloats(bank, item) return data def getDoubles(self, bankName, item): @@ -748,7 +748,7 @@ def getDoubles(self, bankName, item): Get a column of doubles from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = hipopybind.getDoubles(bank,item) + data = hipopybind.getDoubles(bank, item) return data def getShorts(self, bankName, item): @@ -770,7 +770,7 @@ def getShorts(self, bankName, item): Get a column of shorts from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = hipopybind.getShorts(bank,item) + data = hipopybind.getShorts(bank, item) return data def getLongs(self, bankName, item): @@ -792,7 +792,7 @@ def getLongs(self, bankName, item): Get a column of longs from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = hipopybind.getLongs(bank,item) + data = hipopybind.getLongs(bank, item) return data def getBytes(self, bankName, item): @@ -814,7 +814,7 @@ def getBytes(self, bankName, item): Get a column of bytes from the data table in the current event's bank. """ bank = self.banklist[bankName] - data = hipopybind.getBytes(bank,item) + data = hipopybind.getBytes(bank, item) return data def __iter__(self):