Index: trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2659)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2660)
@@ -345,4 +345,12 @@
 	    pix.SetChargesInGraph(sumhi,sumlo);
 
+	    if (!pix.FillRChargevsTimeLoGain(sumlo,fEvents))
+	      *fLog << warn << "Could not fill Lo Gain Charge vs. EvtNr of pixel: " 
+		    << pixid << " signal = " << sumlo  << " event Nr: " << fEvents << endl;
+		
+	    if (!pix.FillRChargevsTimeHiGain(sumhi,fEvents))
+	      *fLog << warn << "Could not fill Hi Gain Charge vs. EvtNr of pixel: " 
+		    << pixid << " signal = " << sumhi  << " event Nr: " << fEvents << endl;
+
 	    if (logain)
 	      {
@@ -355,8 +363,4 @@
 		  *fLog << warn << "Could not fill Lo Gain Time of pixel: " 
 			<< pixid << " time = " << mtime << endl;
-		
-		if (!pix.FillRChargevsTimeLoGain(sumlo,fEvents))
-		  *fLog << warn << "Could not fill Lo Gain Charge vs. EvtNr of pixel: " 
-			<< pixid << " signal = " << sumlo  << " event Nr: " << fEvents << endl;
 		
 	      }
@@ -371,7 +375,4 @@
 			<< pixid << " time = " << mtime << endl;
 		
-		if (!pix.FillRChargevsTimeHiGain(sumhi,fEvents))
-		  *fLog << warn << "Could not fill Hi Gain Charge vs. EvtNr of pixel: " 
-			<< pixid << " signal = " << sumhi  << " event Nr: " << fEvents << endl;
 	      }
 	    break;
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2659)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2660)
@@ -405,4 +405,7 @@
 {
 
+  if (idx > GetSize())
+    return kFALSE;
+
   switch (type)
     {
@@ -429,5 +432,5 @@
       break;
     case 7:
-      val = (*this)[idx].GetTimeProb();
+      val = (*this)[idx].GetTimeChiSquare();
       break;
     case 8:
@@ -438,5 +441,8 @@
       break;
     case 10:
-      val = TMath::Sqrt((*this)[idx].GetRSigmaSquare());
+      if ((*this)[idx].GetRSigmaSquare() > 0.)
+	val = TMath::Sqrt((*this)[idx].GetRSigmaSquare());
+      else
+	val = -1.;
       break;
     case 15:
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h	(revision 2659)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h	(revision 2660)
@@ -22,4 +22,7 @@
 #endif
 
+#ifndef ROOT_TH1F
+#include <TH1F.h>
+#endif
 
 class MGeomCam;
@@ -41,4 +44,22 @@
   Float_t fMeanNrPhotInnerPix;       // The mean number of photons in an inner pixel  
   Float_t fMeanNrPhotInnerPixErr;    // The uncertainty about the number of photons in an inner pixel  
+
+  TH1F* fHChargeAllPixels;
+  TH1F* fHChargeErrAllPixels;
+  TH1F* fHChargeSigmaAllPixels;
+  TH1F* fHChargeProbAllPixels;
+
+  TH1F* fHTimeAllPixels;
+  TH1F* fHTimeSigmaAllPixels;
+  TH1F* fHTimeProbAllPixels;
+
+  TH1F* fHPedAllPixels;
+  TH1F* fHPedRMSAllPixels;
+
+  TH1F* fHSigmaPerChargeAllPixels;
+  TH1F* fHPhEAllPixels;
+
+  TH1F* fHConvPhEperFADCAllPixels;
+  TH1F* fHConvPhperFADCAllPixels;
 
 public:
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2659)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2660)
@@ -56,5 +56,5 @@
       fTime(-1.),
       fSigmaTime(-1.),
-      fTimeProb(-1.),
+      fTimeChiSquare(-1.),
       fFactor(1.3),
       fPheFFactorMethod(-1.),
@@ -201,7 +201,7 @@
     }
     
-  fTime       = fHist->GetTimeMean();
-  fSigmaTime  = fHist->GetTimeSigma();
-  fTimeProb   = fHist->GetTimeProb();
+  fTime          = fHist->GetTimeMean();
+  fSigmaTime     = fHist->GetTimeSigma();
+  fTimeChiSquare = fHist->GetTimeChiSquare();
 
   return kTRUE;
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h	(revision 2659)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h	(revision 2660)
@@ -26,5 +26,5 @@
   Float_t fTime;                // The mean arrival time after the fit  
   Float_t fSigmaTime;           // The error of the mean arrival time after the fit
-  Float_t fTimeProb;            // The probability of the fit function 
+  Float_t fTimeChiSquare;       // The probability of the fit function 
   
   Float_t fFactor;                  // The laboratory F-factor
@@ -53,10 +53,10 @@
   Float_t GetSigmaCharge()    const    { return fSigmaCharge;    }
   Float_t GetErrSigmaCharge() const    { return fErrSigmaCharge; }
-  Float_t GetTime()           const    { return fTime;         }
-  Float_t GetSigmaTime()      const    { return fSigmaTime;    }
-  Float_t GetTimeProb()       const    { return fTimeProb;     }    
+  Float_t GetTime()           const    { return fTime;           }
+  Float_t GetSigmaTime()      const    { return fSigmaTime;      }
+  Float_t GetTimeChiSquare()  const    { return fTimeChiSquare;  }    
   
-  Float_t GetPed()            const    { return fPed;       }
-  Float_t GetPedRms()         const    { return fPedRms;    }    
+  Float_t GetPed()            const    { return fPed;            }
+  Float_t GetPedRms()         const    { return fPedRms;         }    
 
   void SetPedestal(Float_t ped, Float_t pedrms);
Index: trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2659)
+++ trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2660)
@@ -211,4 +211,5 @@
 
 	    sumLo += *ptr;
+
 	    if (*ptr >= fSaturationLimit)
 	      {
@@ -219,4 +220,5 @@
 	      }
 	  }
+
 	pix.SetExtractedSignal((float)sumHi - pedes*(float)fNumHiGainSamples,
 			       pedrms*fSqrtHiGainSamples,