Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4771)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4772)
@@ -21,4 +21,10 @@
  2004/08/27: Markus Gaug
 
+   * macros/bootcampstandardanalysis.C 
+   * macros/mccalibrate.C 
+   * macros/pedphotcalc.C
+   * macros/starmc.C:
+     - replace MCalibrate by MCalibrateData
+
    * mjobs/MJCalibration.h
      - re-added function SetInput which had been removed recently 
@@ -33,4 +39,7 @@
        at a completely wrong place in CreateEventXaxis(). Probably a 
        slip of the emacs-pen.
+ 
+   * mcalib/MJExtractSignal.cc
+     - replace MCalibrate by MCalibrateData
 
 
Index: /trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C	(revision 4771)
+++ /trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C	(revision 4772)
@@ -237,6 +237,6 @@
   static_cast<MRead&>(read4).AddFiles(druns);  
   
-  MCalibrate       photcalc;
-  photcalc.SetCalibrationMode(MCalibrate::kFfactor);
+  MCalibrateData   photcalc;
+  photcalc.SetCalibrationMode(MCalibrateData:kFfactor);
   MCalibrateRelTimes  timecal;
 
Index: /trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc	(revision 4771)
+++ /trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc	(revision 4772)
@@ -56,5 +56,5 @@
 #include "MExtractSignal.h"
 #include "MFillH.h"
-#include "MCalibrate.h"
+#include "MCalibrateData.h"
 #include "MPedPhotCalc.h"
 #include "MWriteRootFile.h"
@@ -335,5 +335,5 @@
     MBadPixelsMerge merge(&fBadPixels);
     MExtractSignal  extract;
-    MCalibrate      calib;
+    MCalibrateData  calib;
     MPedPhotCalc    calc;