Index: fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C
===================================================================
--- fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C	(revision 13485)
+++ fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C	(revision 13486)
@@ -191,4 +191,5 @@
         bool            spikeDebug          = false,
         bool            debugPixel          = false,
+        bool            testmode            = false,
         int             verbosityLevel      = 0,        // different verbosity levels can be implemented here
         int             firstevent          = 0,
@@ -372,6 +373,9 @@
 //-----------------------------------------------------------------------------
 
-    BookDebugHistos(verbosityLevel );
-    BookTestHistos( verbosityLevel );
+    if (spikeDebug)
+        BookDebugHistos(verbosityLevel );
+
+    if (testmode)
+        BookTestHistos( verbosityLevel );
 
 
@@ -544,7 +548,10 @@
                                             );
                             }
-                            DrawTestHistograms(
-                                        verbosityLevel
-                                        );
+                            if (testmode)
+                            {
+                                DrawTestHistograms(
+                                            verbosityLevel
+                                            );
+                            }
 
                             UpdateCanvases(
@@ -650,5 +657,4 @@
                     maxPulseOrder
                     );
-    }
 
     DeletePixelCanvases(
@@ -656,4 +662,5 @@
                 verbosityLevel
                 );
+    }
     return( 0 );
 }