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

Jump to bottom

feat: provide time estimate data generation #286

Merged
merged 1 commit into from
Jun 10, 2021
Merged

feat: provide time estimate data generation #286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions src/tensorwaves/data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""The `.data` module takes care of data generation."""

import logging
import math
from typing import Optional, Tuple

import numpy as np
Expand Down Expand Up @@ -85,7 +84,7 @@ def generate_data(
random_generator = TFUniformRealNumberGenerator()

progress_bar = tqdm(
total=math.ceil(size / bunch_size),
total=size,
desc="Generating intensity-based sample",
disable=logging.getLogger().level > logging.WARNING,
)
Expand All @@ -109,14 +108,14 @@ def generate_data(
current_max,
)
momentum_pool = EventCollection({})
progress_bar.update()
progress_bar.update(n=-progress_bar.n) # reset progress bar
continue
if np.size(momentum_pool, 0) > 0:
momentum_pool.append(bunch)
else:
momentum_pool = bunch
progress_bar.update()
progress_bar.close()
progress_bar.update(n=momentum_pool.n_events - progress_bar.n)
finalize_progress_bar(progress_bar)
return momentum_pool.select_events(slice(0, size))


Expand Down Expand Up @@ -148,7 +147,7 @@ def generate_phsp(
random_generator = TFUniformRealNumberGenerator()

progress_bar = tqdm(
total=size / bunch_size,
total=size,
desc="Generating phase space sample",
disable=logging.getLogger().level > logging.WARNING,
)
Expand All @@ -166,6 +165,12 @@ def generate_phsp(
momentum_pool.append(bunch)
else:
momentum_pool = bunch
progress_bar.update()
progress_bar.close()
progress_bar.update(n=bunch.n_events)
finalize_progress_bar(progress_bar)
return momentum_pool.select_events(slice(0, size))


def finalize_progress_bar(progress_bar: tqdm) -> None:
remainder = progress_bar.total - progress_bar.n
progress_bar.update(n=remainder) # pylint crashes if total is set directly
progress_bar.close()