Index: trunk/MagicSoft/Mars/manalysis/MCameraData.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCameraData.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/manalysis/MCameraData.cc	(revision 2781)
@@ -38,6 +38,6 @@
 #include "MLogManip.h"
 
-#include "MPedestalCam.h"
-#include "MPedestalPix.h"
+#include "MPedPhotCam.h"
+#include "MPedPhotPix.h"
 
 #include "MSigmabar.h"
@@ -77,6 +77,6 @@
 */
 
-void MCameraData::Calc(const MCerPhotEvt &evt, const MPedestalCam &cam,
-                      const MGeomCam &geom)
+void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &cam,
+                                    const MGeomCam &geom)
 {
     const Int_t n = geom.GetNumPixels();
@@ -99,5 +99,5 @@
 
         const Int_t idx = pix.GetPixId();
-        const Float_t noise = cam[idx].GetPedestalRms();
+        const Float_t noise = cam[idx].GetRms();
 
         if (noise<=0) // fData[idx]=0, fValidity[idx]=0
@@ -113,12 +113,12 @@
 }
 
-void MCameraData::Calc(const MCerPhotEvt &evt, const MSigmabar &sgb,
-                      const MGeomCam &geom)
+void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb,
+                                    const MGeomCam &geom)
 {
-    Calc(evt, sgb.GetSigmabarInner(), geom);
+    CalcCleaningLevel(evt, sgb.GetSigmabarInner(), geom);
 }
 
-void MCameraData::Calc(const MCerPhotEvt &evt, Double_t noise,
-                      const MGeomCam &geom)
+void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise,
+                                    const MGeomCam &geom)
 {
     const Int_t n = geom.GetNumPixels();
Index: trunk/MagicSoft/Mars/manalysis/MCameraData.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCameraData.h	(revision 2780)
+++ trunk/MagicSoft/Mars/manalysis/MCameraData.h	(revision 2781)
@@ -15,5 +15,5 @@
 class MSigmabar;
 class MCerPhotEvt;
-class MPedestalCam;
+class MPedPhotCam;
 
 class MCameraData : public MCamEvent
@@ -29,16 +29,16 @@
     UInt_t GetNumPixels() const { return fData.GetSize(); }
 
-    void Calc(const MCerPhotEvt &evt, const MPedestalCam &fCam,
-              const MGeomCam &geom);
-    void Calc(const MCerPhotEvt &evt, const MSigmabar &sgb,
-              const MGeomCam &geom);
-    void Calc(const MCerPhotEvt &evt, Double_t noise,
-              const MGeomCam &geom);
-
+    void CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &fCam,
+                           const MGeomCam &geom);
+    void CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb,
+                           const MGeomCam &geom);
+    void CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise,
+                           const MGeomCam &geom);
+/*
     void Calc(const MCerPhotEvt &evt, const MGeomCam &geom)
     {
-        Calc(evt, 1, geom);
+        CalcCleaningLevel(evt, 1, geom);
     }
-
+ */
     const TArrayD &GetData() const { return fData; }
     const TArrayC &GetValidity() const  { return fValidity; }