Index: fact/tools/rootmacros/PulseTemplates/rootfilehandler.C
===================================================================
--- fact/tools/rootmacros/PulseTemplates/rootfilehandler.C	(revision 13475)
+++ fact/tools/rootmacros/PulseTemplates/rootfilehandler.C	(revision 13476)
@@ -1,10 +1,9 @@
 #include "rootfilehandler.h"
-#include <TROOT.h>
-#include <TFile.h>
+
 
 void
 CreateRootFile(
-        const char * loc_fname,
-        int verbosityLevel
+        const char*     loc_fname,
+        int             verbosityLevel
         )
 {
@@ -66,8 +65,8 @@
 void
 SaveHistograms(
-        const char* loc_fname,
-        const char* subdirectory,
-        TObjArray* histList,
-        int verbosityLevel
+        const char*     loc_fname,
+        TString     subdirectory,
+        TObjArray*      histList,
+        int             verbosityLevel
         )
 {
@@ -77,5 +76,5 @@
 
     TFile* tf = OpenRootFile(loc_fname, verbosityLevel);
-    if ( subdirectory != "root")
+    if ( !( subdirectory.CompareTo("root") ) ) //if subdirectory = root
     {
         tf->cd();
@@ -123,43 +122,2 @@
 //----------------------------------------------------------------------------
 
-
-int
-CalculateHistogramId(
-        int         pixelID,
-        int         pulseOrder,
-        int         maxPulseOrder
-        )
-{
-    return (pixelID*maxPulseOrder + pulseOrder);
-}
-// end of CalculateHistogramId
-//----------------------------------------------------------------------------
-
-int
-CalculatePixelId(
-        int         mHistogramId,
-        int         pulseOrder,
-        int         maxPulseOrder
-        )
-{
-    return (mHistogramId - pulseOrder)/(maxPulseOrder - 1);
-}
-// end of CalculatePixelIdFromHistogramId
-//----------------------------------------------------------------------------
-
-CalculatePulseOrder(
-        int         mHistogramId,
-        int         maxPulseOrder
-        )
-{
-    if (mHistogramId < maxPulseOrder)
-    {
-            return mHistogramId;
-    }
-    else
-    {
-            return mHistogramId % (maxPulseOrder - 1);
-    }
-}
-// end of CalculatePulseOrderFromHistogramId
-//----------------------------------------------------------------------------