Index: trunk/MagicSoft/Mars/macros/mccalibrate.C
===================================================================
--- trunk/MagicSoft/Mars/macros/mccalibrate.C	(revision 4772)
+++ trunk/MagicSoft/Mars/macros/mccalibrate.C	(revision 4773)
@@ -103,6 +103,6 @@
   MMcCalibrationUpdate  mccalibupdate;
 
-  MCalibrate calib; 
-  // MCalibrate transforms signals from ADC counts into photons. In the first
+  MCalibrateData calib; 
+  // MCalibrateData transforms signals from ADC counts into photons. In the first
   // loop it applies a "dummy" calibration supplied by MMcCalibrationUpdate, just 
   // to equalize inner and outer pixels. At the end of the first loop, in the
@@ -110,5 +110,5 @@
   // are calculated.
 
-  calib.SetCalibrationMode(MCalibrate::kFfactor);
+  calib.SetCalibrationMode(MCalibrateData::kFfactor);
 
   MImgCleanStd clean;
Index: trunk/MagicSoft/Mars/macros/pedphotcalc.C
===================================================================
--- trunk/MagicSoft/Mars/macros/pedphotcalc.C	(revision 4772)
+++ trunk/MagicSoft/Mars/macros/pedphotcalc.C	(revision 4773)
@@ -68,5 +68,5 @@
 #include "MExtractFixedWindow.h" 
 #include "MCerPhotEvt.h"
-#include "MCalibrate.h"
+#include "MCalibrateData.h"
 #include "MPedPhotCalc.h"
 #include "MPedPhotCam.h"
@@ -316,6 +316,6 @@
   static_cast<MRead&>(read3).AddFiles(pruns);  
 
-  MCalibrate      photcalc;
-  photcalc.SetCalibrationMode(MCalibrate::kFfactor);
+  MCalibrateData  photcalc;
+  photcalc.SetCalibrationMode(MCalibrateData::kFfactor);
   MPedPhotCalc    pedphotcalc;  
 
Index: trunk/MagicSoft/Mars/macros/starmc.C
===================================================================
--- trunk/MagicSoft/Mars/macros/starmc.C	(revision 4772)
+++ trunk/MagicSoft/Mars/macros/starmc.C	(revision 4773)
@@ -121,6 +121,6 @@
   MMcCalibrationUpdate  mccalibupdate;
 
-  MCalibrate calib; // Transforms signals from ADC counts into photons.
-  calib.SetCalibrationMode(MCalibrate::kFfactor);
+  MCalibrateData calib; // Transforms signals from ADC counts into photons.
+  calib.SetCalibrationMode(MCalibrateData::kFfactor);
 
   //    MBlindPixelCalc   blind;
Index: trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc	(revision 4772)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc	(revision 4773)
@@ -424,5 +424,5 @@
     MGeomApply     apply; // Only necessary to craete geometry
     MExtractSignal extract;
-    MCalibrate     calib;
+    MCalibrateData calib;
     MPedPhotCalc   calc;
 
@@ -492,5 +492,5 @@
     MGeomApply     apply; // Only necessary to craete geometry
     MExtractSignal extract;
-    MCalibrate     calib;
+    MCalibrateData  calib;
     MPedPhotCalc   calc;