Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2536)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2537)
@@ -4,4 +4,14 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/11/19: Markus Gaug
+
+   * manalysis/MCalibrationPix:
+     - new functions: GetPed(), GetPedRms(), GetQProb()
+     - new variable: fQProb
+
+   * manalysis/MCalibrationCam.cc:
+     - function GetPixelContent enlarged
+
+
  2003/11/19: Thomas Bretz
 
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2536)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2537)
@@ -433,7 +433,34 @@
     {
     case 0:
+       val = (*this)[idx].GetQ();
+	break;
+    case 1:
+       val = (*this)[idx].GetErrQ();
+	break;
+    case 2:
+       val = (*this)[idx].GetSigmaQ();
+        break;
+    case 3:
+       val = (*this)[idx].GetErrSigmaQ();
+	break;
+    case 4:
+       val = (*this)[idx].GetQProb();
+	break;
+    case 5:
+       val = (*this)[idx].GetT();
+	break;
+    case 6:
+       val = (*this)[idx].GetErrT();
+	break;
+    case 7:
+       val = (*this)[idx].GetPed();
+	break;
+    case 8:
+       val = (*this)[idx].GetPedRms();
+	break;
+    case 9:
       val = (*this)[idx].GetRQ();
         break;
-    case 1:
+    case 10:
       val = (*this)[idx].GetErrRQ();
       break;
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2536)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2537)
@@ -59,4 +59,5 @@
   fRQ  = fErrRQ = 0.;
   fSigmaQ = fErrSigmaQ = 0.;
+  fQProb  = 0.;
 
 }
@@ -93,4 +94,5 @@
   fSigmaQ    = fHist->GetQSigma();
   fErrSigmaQ = fHist->GetQSigmaErr();
+  fQProb     = fHist->GetQProb();
 
   if (fPed)
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h	(revision 2536)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h	(revision 2537)
@@ -19,4 +19,5 @@
   Float_t fQ;                // The mean charge after the fit
   Float_t fErrQ;             // The error of mean charge after the fit
+  Float_t fQProb;            // The probability of the fit function 
   Float_t fPed;              // The mean pedestal (from MPedestalPix)
   Float_t fPedRms;           // The pedestal  RMS (from MPedestalPix)
@@ -42,4 +43,5 @@
   Float_t GetErrQ()  const    { return fErrQ;  }
   Float_t GetErrRQ() const    { return fErrRQ; }    
+  Float_t GetQProb() const    { return fQProb;    }    
   
   Float_t GetSigmaQ()    const   { return fSigmaQ;    }
@@ -48,4 +50,7 @@
   Float_t GetErrT()      const   { return fErrT;      }
   
+  Float_t GetPed()       const    { return fPed;     }
+  Float_t GetPedRms()    const    { return fPedRms;    }    
+
   void SetPedestal(Float_t ped, Float_t pedrms);