Skip to content

Commit 7bf45b6

Browse files
authored
Feat add ttree merger (#12)
* beginning tree merger * progress * progress on merging * Very messy right now, but figured out the dtype issues that were preventing writing var * float... * Separated hadd and merge/add, merges better now but issue with uproot Model_TAxis_v9 writing back * save progress * Can merge certain files, but has the copy issue to be resolved * Simplified merge, need to work on grouping * saving progress: fixed duplicating counters, now working on extend issue with zipped data * Able to be built, tests pass * formatting * formatting * formatting * formatting * formatting * formatting, pylint having issues with similar code * formatting, pylint having issues with similar code * removed main hadd function * more formatting * import error fix * import error fix * import error fix * docs * docs
1 parent 137600e commit 7bf45b6

File tree

5 files changed

+549
-248
lines changed

5 files changed

+549
-248
lines changed

src/odapt/__init__.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
from __future__ import annotations
77

88
from odapt._version import __version__
9-
from odapt.operations import hadd # noqa: F401
9+
from odapt.operations import (
10+
hadd, # noqa: F401
11+
merge, # noqa: F401
12+
)
1013

1114
__all__ = ["__version__"]

src/odapt/operations/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
from __future__ import annotations
22

3-
from odapt.operations.hadd import hadd, main # noqa: F401
3+
from odapt.operations.hadd import hadd_1d, hadd_2d, hadd_3d # noqa: F401
4+
from odapt.operations.merge import hadd_and_merge # noqa: F401

0 commit comments

Comments
 (0)