Index: /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3280)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3281)
@@ -18,4 +18,5 @@
 !   Author(s): Javier Lopez 12/2003 <mailto:jlopez@ifae.es>
 !   Author(s): Javier Rico  01/2004 <mailto:jrico@ifae.es>
+!   Author(s): Markus Gaug  02/2004 <mailto:markus@ifae.es>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -29,7 +30,22 @@
 //
 //   This task takes the integrated charge from MExtractedSignal and apply
-//   the calibration constants from MCalibraitionCam to the charge. Then
-//   stores number of photons obtained in MCerPhotEvt. Selection of different
-//   calibration methods is allowed through SetCalibrationMode member function
+//   the calibration constants from MCalibraitionCam to convert the summed FADC 
+//   slices to photons. The number of photons obtained is stored in MCerPhotEvt. 
+//
+//   Selection of different calibration methods is possible through the 
+//   SetCalibrationMode member function
+//
+//   The calibration modes which exclude non-valid pixels are the following: 
+//
+//   kFfactor:    calibrates using the F-Factor method
+//   kBlindpixel: calibrates using the BlindPixel method 
+//   kBlindpixel: calibrates using the BlindPixel method 
+//   kDummy:      calibrates with fixed conversion factors of 1 and errors of 0.
+//
+//   The calibration modes which include all pixels regardless of their validity is:
+//
+//   kNone:       calibrates with fixed conversion factors of 1 and errors of 0.
+//
+//   Use the kDummy and kNone methods ONLY FOR DEBUGGING!   
 //
 //   Input Containers:
@@ -191,4 +207,5 @@
   for (UInt_t pixidx=0; pixidx<npix; pixidx++)
     {
+
       if(fCalibrationMode!=kNone)
 	{
@@ -237,5 +254,5 @@
 		break;
             case kDummy:
-	      hiloconv                         = 1.;
+ 	      hiloconv                         = 1.;
 	      hiloconverr                      = 0.;
 	      calibrationConversionFactor      = 1.;
@@ -249,5 +266,11 @@
 	  
 	} /* if(fCalibrationMode!=kNone) */
-      
+      else
+      {
+	  hiloconv                         = 1.;
+	  hiloconverr                      = 0.;
+	  calibrationConversionFactor      = 1.;
+	  calibrationConversionFactorErr   = 0.;
+      }      
       MExtractedSignalPix &sig =  (*fSignals)[pixidx];