Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc	(revision 8358)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc	(revision 8359)
@@ -285,10 +285,10 @@
       MRawEvtPixelIter pixel(fRawEvt);
       pixel.Jump(blindpixIdx);
-      
+/*
       if (sig > fSPheCut)
         hist.FillSinglePheFADCSlices(pixel);
       else
         hist.FillPedestalFADCSlices(pixel);
-
+  */
     }
 
@@ -390,5 +390,5 @@
   }
 
-  hist.FinalizeSinglePheSpectrum();
+  //hist.FinalizeSinglePheSpectrum();
   
   hist.FitPedestal();
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc	(revision 8358)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc	(revision 8359)
@@ -122,6 +122,6 @@
     fTitle = title ? title : "Statistics of the FADC sums of Blind Pixel calibration events";
 
-    fASinglePheFADCSlices.ResizeTo(1);
-    fAPedestalFADCSlices.ResizeTo(1);
+    //fASinglePheFADCSlices.ResizeTo(1);
+    //fAPedestalFADCSlices.ResizeTo(1);
 
     SetNumSinglePheLimit();
@@ -298,9 +298,10 @@
     return TESTBIT(fFlags,kPedestalFitOK);
 }
-  
+
+/*
 // --------------------------------------------------------------------------
 //
 // Normalizes fASinglePheFADCSlices and fAPedestalFADCSlices
-// 
+//
 void MHCalibrationChargeBlindPix::FinalizeSinglePheSpectrum() 
 {
@@ -370,5 +371,5 @@
   fNumPedestals++;
 }
-
+*/
 
 // --------------------------------------------------------------------------
@@ -902,7 +903,6 @@
   if (option.Contains("datacheck"))
     return;
-
+/*
   pad->cd(3);
-
   if (fASinglePheFADCSlices.GetNrows()!=1)
     {
@@ -956,5 +956,5 @@
       fHPedestalFADCSlices->Draw("same");
     }
-  
+  */
   if (win < 2)
   return;
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h	(revision 8358)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h	(revision 8359)
@@ -33,6 +33,6 @@
   Float_t fNumSinglePheLimit;                // Minimum number of single-phe events 
 
-  TVector fASinglePheFADCSlices;             //! Averaged FADC slice entries supposed single-phe events
-  TVector fAPedestalFADCSlices;              //! Averaged FADC slice entries supposed pedestal   events
+//  TVector fASinglePheFADCSlices;             //! Averaged FADC slice entries supposed single-phe events
+//  TVector fAPedestalFADCSlices;              //! Averaged FADC slice entries supposed pedestal   events
  
   TF1 *fSinglePheFit;                        // Single Phe Fit (Gaussians convoluted with Poisson) 
@@ -103,9 +103,9 @@
   const Float_t  GetSinglePheCut  ()  const { return fSinglePheCut;   }
  
-  TVector &GetASinglePheFADCSlices()             { return fASinglePheFADCSlices;  }
-  const TVector &GetASinglePheFADCSlices() const { return fASinglePheFADCSlices;  }
-
-  TVector &GetAPedestalFADCSlices()              { return fAPedestalFADCSlices;  }  
-  const TVector &GetAPedestalFADCSlices()  const { return fAPedestalFADCSlices;  }  
+//  TVector &GetASinglePheFADCSlices()             { return fASinglePheFADCSlices;  }
+//  const TVector &GetASinglePheFADCSlices() const { return fASinglePheFADCSlices;  }
+
+//  TVector &GetAPedestalFADCSlices()              { return fAPedestalFADCSlices;  }
+//  const TVector &GetAPedestalFADCSlices()  const { return fAPedestalFADCSlices;  }
 
   const Bool_t  IsSinglePheFitOK()         const;
@@ -121,7 +121,7 @@
   
   // Fill histos
-  void  FillSinglePheFADCSlices(const MRawEvtPixelIter &iter);
-  void  FillPedestalFADCSlices( const MRawEvtPixelIter &iter);
-  void  FinalizeSinglePheSpectrum();
+//  void  FillSinglePheFADCSlices(const MRawEvtPixelIter &iter);
+//  void  FillPedestalFADCSlices( const MRawEvtPixelIter &iter);
+//  void  FinalizeSinglePheSpectrum();
   
   // Draws
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8358)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8359)
@@ -17,6 +17,7 @@
 !
 !   Author(s): Markus Gaug   02/2004 <mailto:markus@ifae.es>
+!   Author(s): Thomas Bretz <mailto:tbretz@astro.uni-wuerzburg.de>
 !              
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -544,5 +545,5 @@
                   MBadPixelsPix::kRelTimeNotFitted,
                   MBadPixelsPix::kRelTimeOscillating);
-  
+
   if (IsLoGain())        
     FitLoGainArrays(*relcam,*badcam,