Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2719)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2720)
@@ -4,4 +4,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/12/18: Abelardo Moralejo
+
+   * manalysis/MCalibrate.cc
+     - Corrected variable names: Convertion -> Conversion, and also
+       removed the "f" in from of local (non-member) variables.
+
  2003/12/18: Markus Gaug, Michele Doro
 
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrate.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrate.cc	(revision 2719)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrate.cc	(revision 2720)
@@ -150,11 +150,11 @@
 	    
 	    
-	    //      Float_t fCalibraitonConvertionFactor = pix.GetMeanConversionFFactorMethod();
-	    Float_t fCalibrationConvertionFactor = pix.GetMeanConversionBlindPixelMethod();
-	    Float_t fCalibrationConvertionFactorError = pix.GetErrorConversionBlindPixelMethod();
+	    //      Float_t calibrationConvertionFactor = pix.GetMeanConversionFFactorMethod();
+	    Float_t calibrationConversionFactor = pix.GetMeanConversionBlindPixelMethod();
+	    Float_t calibrationConversionFactorError = pix.GetErrorConversionBlindPixelMethod();
 	    
 
-	    Float_t nphot = signal*fCalibrationConvertionFactor;
-	    Float_t nphoterr = signal*fCalibrationConvertionFactorError;;
+	    Float_t nphot = signal*calibrationConversionFactor;
+	    Float_t nphoterr = signal*calibrationConversionFactorError;;
 	    
 	    fCerPhotEvt->AddPixel(pixid, nphot, nphoterr);