From 539c68cee822d532e8b0b39a7787aee86134ef62 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Sun, 19 Jan 2020 21:14:07 +0000
Subject: [PATCH] cleanup up ouput and restricted event timers to only show if
 using event-based mode.

---
 examples/xml/pincell/settings.xml |  2 +-
 src/output.cpp                    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/examples/xml/pincell/settings.xml b/examples/xml/pincell/settings.xml
index 5845898c8d..741427460c 100644
--- a/examples/xml/pincell/settings.xml
+++ b/examples/xml/pincell/settings.xml
@@ -3,7 +3,7 @@
 
   <!-- Define how many particles to run and for how many batches -->
   <run_mode>eigenvalue</run_mode>
-  <batches>100</batches>
+  <batches>20</batches>
   <inactive>10</inactive>
   <particles>1000</particles>
 
diff --git a/src/output.cpp b/src/output.cpp
index 1911606ef1..b231e833eb 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -466,12 +466,14 @@ void print_runtime()
   show_time("Total time in simulation", time_inactive.elapsed() +
     time_active.elapsed());
   show_time("Time in transport only", time_transport.elapsed(), 1);
-  show_time("Event time: Init", time_event_init.elapsed(), 2);
-  show_time("Event time: XS Lookup", time_event_calculate_xs.elapsed(), 2);
-  show_time("Event time: Advance", time_event_advance_particle.elapsed(), 2);
-  show_time("Event time: Surface", time_event_surface_crossing.elapsed(), 2);
-  show_time("Event time: Collision", time_event_collision.elapsed(), 2);
-  show_time("Event time: Death", time_event_death.elapsed(), 2);
+  #ifdef EVENT_BASED
+  show_time("Particle initialization", time_event_init.elapsed(), 2);
+  show_time("XS lookups", time_event_calculate_xs.elapsed(), 2);
+  show_time("Advancing", time_event_advance_particle.elapsed(), 2);
+  show_time("Surface crossings", time_event_surface_crossing.elapsed(), 2);
+  show_time("Collisions", time_event_collision.elapsed(), 2);
+  show_time("Particle death", time_event_death.elapsed(), 2);
+  #endif
   if (settings::run_mode == RUN_MODE_EIGENVALUE) {
     show_time("Time in inactive batches", time_inactive.elapsed(), 1);
   }