Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3250)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3251)
@@ -30,4 +30,6 @@
    * mcalib/MMcCalibrationCalc.[h,cc]
    * manalysis/MGeomApply.cc
+   * mcalib/Makefile
+   * mcalib/CalibLinkDef.h
  
   - replace MCalibrationCam by MCalibrationChargeCam
Index: /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc	(revision 3250)
+++ /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc	(revision 3251)
@@ -33,5 +33,5 @@
 //
 //   MPedestalCam
-//   MCalibrationCam
+//   MCalibrationChargeCam
 //   MPedPhotCam
 //   MExtractedSignalCam
@@ -51,5 +51,5 @@
 //  Output Containers:
 //   [MPedestalCam]
-//   [MCalibrationCam]
+//   [MCalibrationChargeCam]
 //   [MPedPhotCam]
 //   [MExtractedSignalCam]
@@ -70,5 +70,5 @@
 #include "MGeomCam.h"
 #include "MPedestalCam.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MPedPhotCam.h"
 #include "MArrivalTime.h"
@@ -133,5 +133,5 @@
         ped->InitSize(cam->GetNumPixels());
 
-    MCalibrationCam *cal = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam"));
+    MCalibrationChargeCam *cal = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (cal)
         cal->InitSize(cam->GetNumPixels());
Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 3250)
+++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 3251)
@@ -10,15 +10,14 @@
 #pragma link C++ class MCalibrationPix+;
 #pragma link C++ class MCalibrationBlindPix+;
-#pragma link C++ class MCalibrationPINDiode+;
-#pragma link C++ class MCalibrationCam+;
-#pragma link C++ class MCalibrationCalc+;
+#pragma link C++ class MCalibrationChargeCam+;
+#pragma link C++ class MCalibrationChargeCalc+;
+#pragma link C++ class MCalibrationChargePINDiode+;
 
-#pragma link C++ class MHCalibrationPINDiode+;
 #pragma link C++ class MHCalibrationBlindPixel+;
 #pragma link C++ class MHCalibrationPixel+;
 #pragma link C++ class MHCalibrationChargePix+;
+#pragma link C++ class MHCalibrationChargePINDiode+;
 #pragma link C++ class MHCalibrationRelTimePix+;
 #pragma link C++ class MHCalibrationRelTimeCam+;
-#pragma link C++ class MHCalibrationChargePINDiode+;
 
 #pragma link C++ class MMcCalibrationCalc++;
Index: /trunk/MagicSoft/Mars/mcalib/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 3250)
+++ /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 3251)
@@ -39,11 +39,10 @@
 SRCFILES = MCalibrate.cc \
 	   MCalibrateData.cc \
-	   MCalibrationCalc.cc \
+	   MCalibrationChargeCalc.cc \
            MCalibrationPix.cc  \
            MCalibrationBlindPix.cc  \
-           MCalibrationPINDiode.cc  \
-           MCalibrationCam.cc \
+           MCalibrationChargePINDiode.cc  \
+           MCalibrationChargeCam.cc \
            MHCalibrationBlindPixel.cc \
-           MHCalibrationPINDiode.cc \
            MHCalibrationPixel.cc \
            MHCalibrationChargePix.cc \