Merge branch 'master' into add_calibscale

cta-observatory · Jul 7, 2021 · d871baf · d871baf
2 parents 276e5e6 + 513e1ca
commit d871baf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/protopipe/scripts/data_training.py b/protopipe/scripts/data_training.py
@@ -9,7 +9,7 @@
 import signal
 import tables as tb
 import pandas as pd
-from traitlets.config import Config
+from tqdm import tqdm
 
 from ctapipe.utils import CutFlow
 from protopipe.pipeline.temp import MySimTelEventSource
@@ -263,9 +263,14 @@ def main():
             impact_dict,
             good_event,
             good_for_reco,
-        ) in preper.prepare_event(
-            source, save_images=args.save_images, debug=args.debug
-        ):
+        ) in tqdm(
+                    preper.prepare_event(source,
+                                         save_images=args.save_images,
+                                         debug=args.debug),
+                    desc=source.__class__.__name__,
+                    total=source.max_events,
+                    unit="event"
+                 ):
 
             if good_event:
 

diff --git a/protopipe/scripts/write_dl2.py b/protopipe/scripts/write_dl2.py
@@ -8,7 +8,7 @@
 from astropy.coordinates.angle_utilities import angular_separation
 import tables as tb
 import astropy.units as u
-from traitlets.config import Config
+from tqdm import tqdm
 
 # ctapipe
 from ctapipe.utils import CutFlow
@@ -308,9 +308,14 @@ class RecoEvent(tb.IsDescription):
             impact_dict,
             good_event,
             good_for_reco,
-        ) in preper.prepare_event(
-            source, save_images=args.save_images, debug=args.debug
-        ):
+        ) in tqdm(
+                    preper.prepare_event(source,
+                                         save_images=args.save_images,
+                                         debug=args.debug),
+                    desc=source.__class__.__name__,
+                    total=source.max_events,
+                    unit="event"
+                 ):
 
             # True direction
             true_az = event.simulation.shower.az