Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2721)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2722)
@@ -15,5 +15,5 @@
    * manalysis/MCalibrate.cc
      - Corrected variable names: Convertion -> Conversion, and also
-       removed the "f" in from of local (non-member) variables.
+       removed the "f" at the beginning of local (non-member) variables.
      - Added fGeomCam, fPedPhotCam (created in the PreProcess).
 
Index: /trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.h	(revision 2721)
+++ /trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.h	(revision 2722)
@@ -7,4 +7,6 @@
 
 class MCalibrationCam;
+class MPedPhotCam;
+class MGeomCam;
 class MMcFadcHeader;
 class MExtractedSignalCam;
@@ -19,15 +21,17 @@
 
     MCalibrationCam     *fCalCam;
+    MPedPhotCam         *fPedPhotCam;
+    MGeomCam            *fGeom;
     MMcFadcHeader       *fHeaderFadc;
     MExtractedSignalCam *fSignalCam;
 
-    Float_t fADC2PheInner;
-    Float_t fADC2PheOuter;
+    Float_t fADC2PhInner; // Conversion factor from ADC counts to photons
+    Float_t fADC2PhOuter; // for inner and outer pixels.
 
 public:
     MMcCalibrationCalc(const char *name=NULL, const char *title=NULL);
 
-    void SetADC2PheInner(Float_t x) {fADC2PheInner = x; }
-    void SetADC2PheOuter(Float_t x) {fADC2PheOuter = x; }
+    void SetADC2PhInner(Float_t x) {fADC2PhInner = x; }
+    void SetADC2PhOuter(Float_t x) {fADC2PhOuter = x; }
 
     ClassDef(MMcCalibrationCalc, 0)   // Task which obtains, for MC files, the pedestal mean and rms, and the calibration factor from ADC counts to photons.