Index: fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C
===================================================================
--- fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C	(revision 13628)
+++ fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C	(revision 13629)
@@ -179,5 +179,5 @@
 void DrawTestHistograms( int);
 bool ProduceDebugHistos( vector<Region> *pZXings);
-bool  UseThisPulse( int, int, int, int, int, int);
+bool  UseThisPulse( int, int, int, float, int, int);
 void UpdateCanvases( int, int, bool);
 void DeletePixelCanvases( int, int );
@@ -189,7 +189,7 @@
 //----------------------------------------------------------------------------
 int FPulseOverlay(
-        TString     datafilename        = "/fact/raw/2011/11/10/20111110_005.fits.gz",
-        TString     drsfilename         = "/fact/raw/2011/11/10/20111110_003.drs.fits.gz",
-        TString     OutRootFileName     = "/home_nfs/isdc/jbbuss/analysis/FPulseTemplate/20111110_005/Overlay/20111110_005.root",
+        TString     datafilename        = "/fhgfs/groups/app/fact-construction/raw/2011/11/09/20111109_006.fits.gz",
+        TString     drsfilename         = "/fhgfs/groups/app/fact-construction/raw/2011/11/09/20111109_003.drs.fits.gz",
+        TString     OutRootFileName     = "/home/jbuss/analysis/FPulseTemplate/20111109_006/Overlay/20111109_006.root",
         bool            ProduceGraphic      = false,
         bool            spikeDebug          = false,
@@ -405,4 +405,5 @@
         pixel[i] = NULL;
     }
+    int lastPixelOfSet = 0;
 //-------------------------------------
 // Loop over Pixel Sets
@@ -412,5 +413,9 @@
           firstPixelOfSet += pixelSetSize )
     {
-
+        lastPixelOfSet = firstPixelOfSet + pixelSetSize-1;
+        if (lastPixelOfSet > 1439)
+        {
+            lastPixelOfSet = 1439;
+        }
         if (verbosityLevel == 0)
         {
@@ -419,5 +424,5 @@
                  << firstPixelOfSet
                  << " to Pixel "
-                 << firstPixelOfSet+pixelSetSize-1 << endl;
+                 << lastPixelOfSet << endl;
         }
 
@@ -436,5 +441,5 @@
                   << firstPixelOfSet
                   << " to Pixel "
-                  << firstPixelOfSet+pixelSetSize-1
+                  << lastPixelOfSet
                   << "... Event: " << CurrentEventID
                   << "/" << nevents << endl;
@@ -445,5 +450,5 @@
 //--------------------------------------------------------------------
             for ( int pixelID = firstPixelOfSet;
-                    pixelID < firstPixelOfSet + pixelSetSize
+                    pixelID < lastPixelOfSet + 1
                     && pixelID < firstpixel + npixel;
                     pixelID++ )
@@ -455,5 +460,5 @@
                       << firstPixelOfSet
                       << " to Pixel "
-                      << firstPixelOfSet+pixelSetSize-1
+                      << lastPixelOfSet
                       << "... Event: " << CurrentEventID
                       << "/" << nevents << endl
@@ -938,5 +943,5 @@
         int             order,
         int             AmplWindowWidth,
-        int             gGainMean,
+        float             gGainMean,
         int             maxPulseOrder,
         int             verbosityLevel