Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 3254)
+++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 3255)
@@ -39,9 +39,9 @@
 //   MMcFadcHeader
 //   MRawRunHeader
-//  [MCalibrationCam] (if it existed previously)
+//  [MCalibrationChargeCam] (if it existed previously)
 //
 //  Output Containers:
 //   MPedPhotCam
-//  [MCalibrationCam] (if it did not exist previously)
+//  [MCalibrationChargeCam] (if it did not exist previously)
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -54,5 +54,5 @@
 
 #include "MCalibrationPix.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MExtractedSignalCam.h"
 #include "MExtractedSignalPix.h"
@@ -108,13 +108,13 @@
 Int_t MMcCalibrationUpdate::PreProcess(MParList *pList)
 {
-  fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
+  fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
   if ( !fCalCam )
     {
-      *fLog << inf << dbginf << AddSerialNumber("MCalibrationCam") << " does not exist... Creating." << endl;
-
-      fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+      *fLog << inf << dbginf << AddSerialNumber("MCalibrationChargeCam") << " does not exist... Creating." << endl;
+
+      fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam"));
       if ( !fCalCam )
 	{
-	  *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationCam") << "... aborting." << endl;
+	  *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationChargeCam") << "... aborting." << endl;
 	  return kFALSE;
 	}
@@ -123,5 +123,5 @@
     {
       fFillCalibrationCam = kFALSE;
-      *fLog << inf << AddSerialNumber("MCalibrationCam") << " already exists... " << endl;
+      *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl;
     }
 
@@ -148,5 +148,5 @@
 // Check for the runtype.
 // Search for MGeomCam and MMcFadcHeader.
-// Fill the MCalibrationCam object.
+// Fill the MCalibrationChargeCam object.
 //
 Bool_t MMcCalibrationUpdate::ReInit(MParList *pList)