Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change progress bar for add histograms #101

Merged
merged 7 commits into from
Jul 2, 2024
Merged

chore: change progress bar for add histograms #101

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
159acbb
Small fixes for the linter and drop_branches
zbilodea Jul 2, 2024
809405d
More little fixes
zbilodea Jul 2, 2024
9147242
linter fix
zbilodea Jul 2, 2024
2630830
linter
zbilodea Jul 2, 2024
97ef13c
changed hadd progress bar
zbilodea Jul 2, 2024
3bf042e
Merge branch 'main' into chore-change-progress-bar
zbilodea Jul 2, 2024
5277c98
formatting
zbilodea Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions src/hepconvert/histogram_adding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,15 +453,11 @@ def add_histograms(
keys = file.keys(filter_classname="TH[1|2|3][I|S|F|D|C]", cycle=False)
if progress_bar is not False:
tqdm = _utils.check_tqdm()
file_bar = progress_bar
hist_bar = tqdm.tqdm(desc="Histograms added")
number_of_items = len(files)
if progress_bar is True:
file_bar = tqdm.tqdm(desc="Files added")
hist_bar = tqdm.tqdm(desc="Histograms added")
else:
hist_bar = None
file_bar.reset(number_of_items)
file_bar = tqdm.tqdm(desc="Files summed")
file_bar.reset(number_of_items)

if same_names:
if union:
for i, _value in enumerate(files[1:]):
Expand Down Expand Up @@ -491,8 +487,6 @@ def add_histograms(
msg = f"File: {input_file} does not exist or is corrupt."
raise FileNotFoundError(msg) from None
if same_names:
if progress_bar and hist_bar:
hist_bar.reset(len(keys))
for key in keys:
try:
in_file[key]
Expand All @@ -510,15 +504,10 @@ def add_histograms(
else:
h_sum = _hadd_3d(hists, in_file, key, first)

if progress_bar:
hist_bar.update(n=1)

if h_sum is not None:
hists[key] = h_sum
else:
n_keys = in_file.keys(filter_classname="TH[1|2|3][I|S|F|D|C]", cycle=False)
if progress_bar:
hist_bar.reset(len(n_keys))
for i, _value in enumerate(keys):
if len(in_file[n_keys[i]].axes) == 1:
h_sum = _hadd_1d(out_file, in_file, keys[i], first, n_key=n_keys[i])
Expand All @@ -531,8 +520,6 @@ def add_histograms(

if h_sum is not None:
out_file[keys[i]] = h_sum
if progress_bar:
hist_bar.update(n=1)
if progress_bar:
file_bar.update(n=1)

Expand Down
Loading