Index: /fact/tools/rootmacros/fpeak_cdf.C
===================================================================
--- /fact/tools/rootmacros/fpeak_cdf.C	(revision 12383)
+++ /fact/tools/rootmacros/fpeak_cdf.C	(revision 12384)
@@ -112,5 +112,5 @@
 	if (spikeDebug){
 		cFiltered = new TCanvas("cFiltered","filtered DRS Waveforms",410,410,400,400);
-		cFiltered->Divide(1, 3);
+		cFiltered->Divide(1, 4);
 	}
 
@@ -144,8 +144,8 @@
 
 	if (verbosityLevel > 0)
-		cout <<"Totel # of Pixel: "<< NumberOfPixels << "\t";
+		cout <<"Total # of Pixel: "<< NumberOfPixels << "\t";
 	if ( npixel == -1 || npixel > (int)NumberOfPixels  ) npixel = (int)NumberOfPixels; // -1 means all!
 	if (verbosityLevel > 0)
-		cout <<"of, which "<< nevents << "will be processed"<< endl;
+		cout <<"of, which "<< npixel << "will be processed"<< endl;
 
 
@@ -171,5 +171,5 @@
 			}
 
-			applyDrsCalibration( Ameas,pix,
+			applyDrsCalibration( Ameas,pix,12,12,
 				drs_basemean, drs_gainmean, drs_triggeroffsetmean,
 				RegionOfInterest, AllPixelDataVector, StartCellVector);
@@ -196,4 +196,5 @@
 			findAbsMaxInRegions( *zXings, Vslide);
 			removeMaximaBelow( *zXings, 3.0, 0);
+			removeRegionWithMaxOnEdge( *zXings, 2);
 			removeRegionOnFallingEdge( *zXings, 100);
 
@@ -210,6 +211,15 @@
 
 			if ( spikeDebug ){
+		
+					// TODO do this correct. The vectors should be the rigt ones... this is just luck	
+					debugHistos[Ameas_].GetXaxis()->Set(Ameas.size() , -0.5 , Ameas.size()-0.5);
+					debugHistos[Vcorr_].GetXaxis()->Set(Ameas.size() , -0.5 , Ameas.size()-0.5);
+					debugHistos[Vslide_].GetXaxis()->Set(Ameas.size() , -0.5 , Ameas.size()-0.5);
+					debugHistos[Vcfd_].GetXaxis()->Set(Ameas.size() , -0.5 , Ameas.size()-0.5);
+					debugHistos[Vcfd2_].GetXaxis()->Set(Ameas.size() , -0.5 , Ameas.size()-0.5);
+
 				for ( unsigned int sl = 0; sl < RegionOfInterest; sl++){
 					debugHistos[Ameas_].SetBinContent(sl, Ameas[sl]);
+					debugHistos[Vcorr_].SetBinContent(sl, Vcorr[sl]);
 					debugHistos[Vslide_].SetBinContent( sl, Vslide[sl] );
 					debugHistos[Vcfd_].SetBinContent( sl, Vcfd[sl] );
@@ -219,7 +229,11 @@
 				cFiltered->cd(1);
 				gPad->SetGrid();
+				debugHistos[Ameas_].Draw();
+				
+				cFiltered->cd(2);
+				gPad->SetGrid();
 				debugHistos[Vcorr_].Draw();
 
-				cFiltered->cd(2);
+				cFiltered->cd(3);
 				gPad->SetGrid();
 				debugHistos[Vslide_].Draw();
@@ -241,5 +255,5 @@
 				}
 
-				cFiltered->cd(3);
+				cFiltered->cd(4);
 				gPad->SetGrid();
 				debugHistos[Vcfd2_].Draw();