Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3079)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3080)
@@ -35,4 +35,82 @@
 // 3) It initializes a pointer to an MCalibrationPINDiode container
 //
+//
+// The calculated values (types of GetPixelContent) are:
+// 
+// Fitted values:
+// ============== 
+//
+// 0: Fitted Charge
+// 1: Error of fitted Charge
+// 2: Sigma of fitted Charge
+// 3: Error of Sigma of fitted Charge
+//
+// Useful variables derived from the fit results:
+// =============================================
+//
+// 4: Returned probability of Gauss fit to Charge distribution
+// 5: Reduced Sigma of fitted Charge --> sqrt(sigma_Q^2 - PedRMS^2)
+// 6: Error Reduced Sigma of fitted Charge 
+// 7: Reduced Sigma per Charge 
+// 8: Error of Reduced Sigma per Charge 
+//
+// Results of the different calibration methods:
+// =============================================
+//
+// 9: Number of Photo-electrons obtained with the F-Factor method
+// 10: Error on Number of Photo-electrons obtained with the F-Factor method
+// 11: Mean conversion factor obtained with the F-Factor method
+// 12: Error on the mean conversion factor obtained with the F-Factor method
+// 13: Overall F-Factor of the readout obtained with the F-Factor method
+// 14: Error on Overall F-Factor of the readout obtained with the F-Factor method
+// 15: Number of Photons inside Plexiglass obtained with the Blind Pixel method
+// 16: Error on Number of Photons inside Plexiglass obtained with the Blind Pixel method
+// 17: Mean conversion factor obtained with the Blind Pixel method
+// 18: Error on the mean conversion factor obtained with the Blind Pixel method
+// 19: Overall F-Factor of the readout obtained with the Blind Pixel method
+// 20: Error on Overall F-Factor of the readout obtained with the Blind Pixel method
+// 21: Number of Photons outside Plexiglass obtained with the PIN Diode method
+// 22: Error on Number of Photons outside Plexiglass obtained with the PIN Diode method
+// 23: Mean conversion factor obtained with the PIN Diode method
+// 24: Error on the mean conversion factor obtained with the PIN Diode method
+// 25: Overall F-Factor of the readout obtained with the PIN Diode method
+// 26: Error on Overall F-Factor of the readout obtained with the PIN Diode method
+//
+// Localized defects:
+// ==================
+//
+// 27: Excluded Pixels
+// 28: Pixels where the fit did not succeed --> results obtained only from the histograms
+// 29: Pixels with succeeded fit, but apparently wrong results
+// 30: Pixels with un-expected behavior in the fourier spectrum (e.g. oscillations)
+//
+// Other classifications of pixels:
+// ================================
+//
+// 31: Pixels with saturated Hi-Gain
+//
+// Classification of validity of the calibrations:
+// ===============================================
+//
+// 32: Pixels with valid calibration by the F-Factor-Method
+// 33: Pixels with valid calibration by the Blind Pixel-Method
+// 34: Pixels with valid calibration by the PIN Diode-Method
+//
+// Used Pedestals:
+// ===============
+//
+// 35: Mean Pedestal over the entire range of signal extraction
+// 36: Error on the Mean Pedestal over the entire range of signal extraction
+// 37: Pedestal RMS over the entire range of signal extraction
+// 38: Error on the Pedestal RMS over the entire range of signal extraction
+//
+// Calculated absolute arrival times (very low precision!):
+// ========================================================
+//
+// 39: Absolute Arrival time of the signal
+// 40: Error on the Absolute Arrival time of the signal
+// 41: RMS of the Absolute Arrival time of the signal
+// 42: Error on the RMS of the Absolute Arrival time of the signal
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationCam.h"
@@ -378,24 +456,82 @@
 }
   
-
+// --------------------------------------------------------------------------
+//
 // The types are as follows:
 // 
+// Fitted values:
+// ============== 
+//
 // 0: Fitted Charge
 // 1: Error of fitted Charge
 // 2: Sigma of fitted Charge
 // 3: Error of Sigma of fitted Charge
+//
+// Useful variables derived from the fit results:
+// =============================================
+//
 // 4: Returned probability of Gauss fit to Charge distribution
-// 5: Mean arrival time
-// 6: Sigma of the arrival time
-// 7: Chi-square of the Gauss fit to the arrival times
-// 8: Pedestal
-// 9: Pedestal RMS
-// 10: Reduced Sigma Square
-// 11: Number of Photo-electrons after the F-Factor method
-// 12: Error on the Number of Photo-electrons after the F-Factor method
-// 13: Mean conversion factor after the F-Factor method
-// 14: Error on the conversion factor after the F-Factor method
-// 15: Number of Photons after the Blind Pixel method
-// 16: Mean conversion factor after the Blind Pixel method
+// 5: Reduced Sigma of fitted Charge --> sqrt(sigma_Q^2 - PedRMS^2)
+// 6: Error Reduced Sigma of fitted Charge 
+// 7: Reduced Sigma per Charge 
+// 8: Error of Reduced Sigma per Charge 
+//
+// Results of the different calibration methods:
+// =============================================
+//
+// 9: Number of Photo-electrons obtained with the F-Factor method
+// 10: Error on Number of Photo-electrons obtained with the F-Factor method
+// 11: Mean conversion factor obtained with the F-Factor method
+// 12: Error on the mean conversion factor obtained with the F-Factor method
+// 13: Overall F-Factor of the readout obtained with the F-Factor method
+// 14: Error on Overall F-Factor of the readout obtained with the F-Factor method
+// 15: Number of Photons inside Plexiglass obtained with the Blind Pixel method
+// 16: Error on Number of Photons inside Plexiglass obtained with the Blind Pixel method
+// 17: Mean conversion factor obtained with the Blind Pixel method
+// 18: Error on the mean conversion factor obtained with the Blind Pixel method
+// 19: Overall F-Factor of the readout obtained with the Blind Pixel method
+// 20: Error on Overall F-Factor of the readout obtained with the Blind Pixel method
+// 21: Number of Photons outside Plexiglass obtained with the PIN Diode method
+// 22: Error on Number of Photons outside Plexiglass obtained with the PIN Diode method
+// 23: Mean conversion factor obtained with the PIN Diode method
+// 24: Error on the mean conversion factor obtained with the PIN Diode method
+// 25: Overall F-Factor of the readout obtained with the PIN Diode method
+// 26: Error on Overall F-Factor of the readout obtained with the PIN Diode method
+//
+// Localized defects:
+// ==================
+//
+// 27: Excluded Pixels
+// 28: Pixels where the fit did not succeed --> results obtained only from the histograms
+// 29: Pixels with succeeded fit, but apparently wrong results
+// 30: Pixels with un-expected behavior in the fourier spectrum (e.g. oscillations)
+//
+// Other classifications of pixels:
+// ================================
+//
+// 31: Pixels with saturated Hi-Gain
+//
+// Classification of validity of the calibrations:
+// ===============================================
+//
+// 32: Pixels with valid calibration by the F-Factor-Method
+// 33: Pixels with valid calibration by the Blind Pixel-Method
+// 34: Pixels with valid calibration by the PIN Diode-Method
+//
+// Used Pedestals:
+// ===============
+//
+// 35: Mean Pedestal over the entire range of signal extraction
+// 36: Error on the Mean Pedestal over the entire range of signal extraction
+// 37: Pedestal RMS over the entire range of signal extraction
+// 38: Error on the Pedestal RMS over the entire range of signal extraction
+//
+// Calculated absolute arrival times (very low precision!):
+// ========================================================
+//
+// 39: Absolute Arrival time of the signal
+// 40: Error on the Absolute Arrival time of the signal
+// 41: RMS of the Absolute Arrival time of the signal
+// 42: Error on the RMS of the Absolute Arrival time of the signal
 //
 Bool_t MCalibrationCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
