Index: /trunk/MagicSoft/Mars/manalysis/MCalibrate.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrate.cc	(revision 2725)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrate.cc	(revision 2726)
@@ -159,10 +159,11 @@
 	    Float_t calibrationConversionFactor      = pix.GetMeanConversionBlindPixelMethod();
 	    Float_t calibrationConversionFactorError = pix.GetErrorConversionBlindPixelMethod();
-	    
 
 	    Float_t nphot    = signal*calibrationConversionFactor;
+	    Float_t nphotErr = signal*calibrationConversionFactorError
+                              *signal*calibrationConversionFactorError;
+	    nphotErr        += signalErr*calibrationConversionFactor
+                              *signalErr*calibrationConversionFactor;
 
-	    Float_t nphotErr = signal*calibrationConversionFactorError*signal*calibrationConversionFactorError;
-	    nphotErr += signalErr*signalErr*calibrationConversionFactor*calibrationConversionFactor;
             nphotErr  = TMath::Sqrt(nphotErr);
 
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2725)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2726)
@@ -329,5 +329,4 @@
 	      *fLog << warn << 
 		"Overflow or Underflow occurred filling Blind Pixel eventnr = " << fEvents << endl;
-	    break;
             
           case gkCalibrationPINDiodeId:
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2725)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2726)
@@ -238,7 +238,6 @@
 // --------------------------------------------------------------------------
 //
-// 
-// 
-// 
+// Print first the well fitted pixels 
+// and then the ones which are not FitValid
 //
 void MCalibrationCam::Print(Option_t *o) const
@@ -288,5 +287,24 @@
 }
 
-
+// The types are as follows:
+// 
+// 0: Fitted Charge
+// 1: Error of fitted Charge
+// 2: Sigma of fitted Charge
+// 3: Error of Sigma of fitted Charge
+// 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
+//
 Bool_t MCalibrationCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
 {
@@ -370,13 +388,18 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// What MHCamera needs in order to draw an individual pixel in the camera
+//
 void MCalibrationCam::DrawPixelContent(Int_t idx) const
 {
-
   (*this)[idx].Draw();
-
-}
-
-
-
+}
+
+
+// --------------------------------------------------------------------------
+//
+
+//
 Bool_t MCalibrationCam::CalcNumPhotInsidePlexiglass()
 {