Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 2770)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 2781)
@@ -274,7 +274,4 @@
 #include "MCerPhotEvt.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
-
 #include "MGGroupFrame.h" // MGGroupFrame
 
@@ -559,8 +556,8 @@
     else
     {
-        fPed = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
+        fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
         if (!fPed)
         {
-            *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
+            *fLog << dbginf << "MPedPhotCam not found... aborting." << endl;
             return kFALSE;
         }
@@ -581,7 +578,7 @@
 {
     if (fSgb)
-        fData->Calc(*fEvt, *fSgb, *fCam);
+        fData->CalcCleaningLevel(*fEvt, *fSgb, *fCam);
     else
-        fData->Calc(*fEvt, *fPed, *fCam);
+        fData->CalcCleaningLevel(*fEvt, *fPed, *fCam);
 
 #ifdef DEBUG
Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.h	(revision 2770)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.h	(revision 2781)
@@ -10,5 +10,5 @@
 class MCerPhotPix;
 class MCerPhotEvt;
-class MPedestalCam;
+class MPedPhotCam;
 class MCameraData;
 
@@ -24,9 +24,9 @@
 
 private:
-    const MGeomCam     *fCam;  //!
-          MCerPhotEvt  *fEvt;  //!
-          MSigmabar    *fSgb;  //!
-          MPedestalCam *fPed;  //!
-          MCameraData  *fData; //!
+    const MGeomCam    *fCam;  //!
+          MCerPhotEvt *fEvt;  //!
+          MSigmabar   *fSgb;  //!
+          MPedPhotCam *fPed;  //!
+          MCameraData *fData; //!
 
     CleaningMethod_t fCleaningMethod;
Index: trunk/MagicSoft/Mars/mimage/MImgCleanTGB.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanTGB.cc	(revision 2770)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanTGB.cc	(revision 2781)
@@ -59,6 +59,6 @@
 #include "MCerPhotEvt.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
+#include "MPedPhotPix.h"
+#include "MPedPhotCam.h"
 
 #include "MGGroupFrame.h" // MGGroupFrame
@@ -223,8 +223,8 @@
     else
     {
-        fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
+        fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
         if (!fPed)
         {
-            *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
+            *fLog << dbginf << "MPedPhotCam not found... aborting." << endl;
             return kFALSE;
         }
@@ -257,5 +257,5 @@
         const Double_t factor     = fCam->GetPixRatio(idx);
         const Double_t factorsqrt = fCam->GetPixRatioSqrt(idx);
-        const Float_t  noise      = (*fPed)[idx].GetPedestalRms();
+        const Float_t  noise      = (*fPed)[idx].GetRms();
 
         if (entry * factorsqrt <= fCleanLvl2 * noise)
Index: trunk/MagicSoft/Mars/mimage/MImgCleanTGB.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanTGB.h	(revision 2770)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanTGB.h	(revision 2781)
@@ -10,5 +10,5 @@
 class MCerPhotPix;
 class MCerPhotEvt;
-class MPedestalCam;
+class MPedPhotCam;
 
 class MGGroupFrame;
@@ -23,8 +23,8 @@
 
 private:
-    const MGeomCam     *fCam;  //!
-          MCerPhotEvt  *fEvt;  //!
-          MSigmabar    *fSgb;  //!
-          MPedestalCam *fPed;  //!
+    const MGeomCam    *fCam;  //!
+          MCerPhotEvt *fEvt;  //!
+          MSigmabar   *fSgb;  //!
+          MPedPhotCam *fPed;  //!
 
     CleaningMethod_t fCleaningMethod;