Skip to content

Commit

Permalink
Feat add ttree merger (#12)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
zbilodea authored Dec 1, 2023
1 parent 137600e commit 7bf45b6
Show file tree
Hide file tree
Showing 5 changed files with 549 additions and 248 deletions.
5 changes: 4 additions & 1 deletion src/odapt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
from __future__ import annotations

from odapt._version import __version__
from odapt.operations import hadd # noqa: F401
from odapt.operations import (
hadd, # noqa: F401
merge, # noqa: F401
)

__all__ = ["__version__"]
3 changes: 2 additions & 1 deletion src/odapt/operations/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from __future__ import annotations

from odapt.operations.hadd import hadd, main # noqa: F401
from odapt.operations.hadd import hadd_1d, hadd_2d, hadd_3d # noqa: F401
from odapt.operations.merge import hadd_and_merge # noqa: F401
Loading

0 comments on commit 7bf45b6

Please sign in to comment.