Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2780)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2781)
@@ -54,4 +54,12 @@
    * mreport/MReportCurrents.cc, mreport/MReportDAQ.cc:
      - removed some obsolete comments (these comments confused THtml)
+
+   * manalysis/MCameraData.[h,cc], mfileio/MCT1ReadAscii.[h,cc],
+     mfileio/MCT1ReadPreProc.[h,cc], mfilter/MFCT1SelBasic.cc,
+     mfilter/MFSelBasic.cc, mhist/MHCamera.cc, mhist/MHEvent.[h,cc],
+     mimage/MImgCleanStd.[h,cc], mimage/MImgCleanTGB.[h,cc],
+     mmain/MAnalysis.cc, mmain/MEventDisplay.cc:
+     - replaced MPedestalCam by MPedPhotCam
+     - removed some obsolete includes
 
 
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; }
Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc	(revision 2781)
@@ -52,6 +52,6 @@
 #include "MCerPhotEvt.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
+#include "MPedPhotPix.h"
+#include "MPedPhotCam.h"
 
 ClassImp(MCT1ReadAscii);
@@ -154,5 +154,5 @@
 // them if they don't exist.
 //
-// Initialize the size of the MPedestalCam container to 127 pixels (CT1 camera)
+// Initialize the size of the MPedPhotCam container to 127 pixels (CT1 camera)
 //
 Int_t MCT1ReadAscii::PreProcess(MParList *pList)
@@ -178,5 +178,5 @@
     //  look for the pedestal class in the plist
     //
-    fPedest = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    fPedest = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
     if (!fPedest)
         return kFALSE;
@@ -210,6 +210,6 @@
         *fIn >> val;
 
-        if (val > 0.0)
-            (*fPedest)[i].SetPedestalRms(val);
+        if (val>0)
+            (*fPedest)[i].Set(0, val);
     }
 }
@@ -221,11 +221,4 @@
 void MCT1ReadAscii::ReadData()
 {
-    /*
-     //
-     // clear the list of cerphot-events
-     //
-     fNphot->Clear();
-     */
-
     //
     // five unsused numbers
@@ -242,6 +235,4 @@
     // too the list with it's id, number of photons and error
     //
-//    fNphot->InitSize(127);
-
     for (Int_t i = 0; i<127; i++ )
     {
@@ -251,5 +242,5 @@
 
         if (nphot > 0.0)
-            fNphot->AddPixel(i, nphot, (*fPedest)[i].GetPedestalRms());
+            fNphot->AddPixel(i, nphot, (*fPedest)[i].GetRms());
     }
     fNphot->FixSize();
@@ -270,5 +261,5 @@
     // reading event data by the 'switch entry'.
     // After reading it should set the InputStreamID correctly.
-    // ( should use MPedestalCam )
+    // (should use MPedPhotCam )
     //
  
Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.h
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.h	(revision 2780)
+++ trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.h	(revision 2781)
@@ -8,13 +8,13 @@
 class TList;
 class MCerPhotEvt;
-class MPedestalCam;
+class MPedPhotCam;
 
 class MCT1ReadAscii : public MTask
 {
 private:
-    ifstream     *fIn;          // the inputfile
-    MCerPhotEvt  *fNphot;       // the data container for all data.
-    MPedestalCam *fPedest;      // ct1 pedestals
-    TList        *fFileNames;   // Array which stores the \0-terminated filenames
+    ifstream    *fIn;        // the inputfile
+    MCerPhotEvt *fNphot;     // the data container for all data.
+    MPedPhotCam *fPedest;    // CT1 pedestals
+    TList       *fFileNames; // Array which stores the \0-terminated filenames
 
     Bool_t OpenNextFile();
Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 2781)
@@ -38,5 +38,5 @@
 //  Output Containers:
 //    MCerPhotEvt     the data container for all data.
-//    MPedestalCam    ct1 pedestals
+//    MPedPhotCam     CT1 pedestals
 //    MMcEvt          monte carlo data container for MC files
 //    MMcTrig         mc data container for trigger information
@@ -67,6 +67,6 @@
 #include "MCerPhotEvt.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
+#include "MPedPhotPix.h"
+#include "MPedPhotCam.h"
 
 #include "MGeomCam.h"
@@ -355,5 +355,5 @@
     for (Int_t i=0; i<iMAXNUMPIX; i++)
     {
-        (*fPedest)[i].SetPedestalRms(outpars.frms_pedsig_phot[i]);
+        (*fPedest)[i].Set(0, outpars.frms_pedsig_phot[i]);
         *fLog << outpars.frms_pedsig_phot[i] << " "; 
         fPedRMS[i] = outpars.frms_pedsig_phot[i];
@@ -722,5 +722,5 @@
 // them if they don't exist.
 //
-// Initialize the size of the MPedestalCam container to 127 pixels (CT1 camera)
+// Initialize the size of the MPedPhotCam container to 127 pixels (CT1 camera)
 //
 Int_t MCT1ReadPreProc::PreProcess(MParList *pList)
@@ -754,5 +754,5 @@
     //  look for the pedestal class in the plist
     //
-    fPedest = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    fPedest = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
     if (!fPedest)
         return kFALSE;
@@ -901,5 +901,5 @@
     // reset pedestal RMS for this event
     for (Int_t i=0; i<iMAXNUMPIX; i++)
-        (*fPedest)[i].SetPedestalRms(fPedRMS[i]);
+        (*fPedest)[i].Set(0, fPedRMS[i]);
 
     //  int   isecs_since_midday; // seconds passed since midday before sunset (JD of run start)
@@ -944,6 +944,5 @@
             continue;
 
-        fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i],
-                         (*fPedest)[i].GetPedestalRms());
+        fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i], (*fPedest)[i].GetRms());
     }
     fNphot->FixSize();
Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h	(revision 2780)
+++ trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h	(revision 2781)
@@ -21,5 +21,5 @@
 class MSrcPosCam;
 class MCerPhotEvt;
-class MPedestalCam;
+class MPedPhotCam;
 class MBlindPixels;
 class MRawRunHeader;
@@ -40,5 +40,5 @@
     MGeomCam      *fGeom;    // camera geometry
     MCerPhotEvt   *fNphot;   // the data container for all data.
-    MPedestalCam  *fPedest;  // ct1 pedestals
+    MPedPhotCam   *fPedest;  // ct1 pedestals
     MTime         *fTime;    // event time
     MMcEvt        *fMcEvt;   // monte carlo data container for MC files
Index: trunk/MagicSoft/Mars/mfilter/MFCT1SelBasic.cc
===================================================================
--- trunk/MagicSoft/Mars/mfilter/MFCT1SelBasic.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mfilter/MFCT1SelBasic.cc	(revision 2781)
@@ -54,7 +54,4 @@
 #include "MGeomCam.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
-
 #include "MLog.h"
 #include "MLogManip.h"
@@ -127,12 +124,5 @@
         return kFALSE;
     }
-/*
-    fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
-    if (!fPed)
-    {
-        *fLog << dbginf << "MPedestalCam missing in Parameter List... aborting." << endl;
-        return kFALSE;
-    }
-*/
+
     memset(fCut, 0, sizeof(fCut));
 
Index: trunk/MagicSoft/Mars/mfilter/MFSelBasic.cc
===================================================================
--- trunk/MagicSoft/Mars/mfilter/MFSelBasic.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mfilter/MFSelBasic.cc	(revision 2781)
@@ -54,7 +54,4 @@
 #include "MGeomCam.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
-
 #include "MLog.h"
 #include "MLogManip.h"
@@ -127,12 +124,5 @@
         return kFALSE;
     }
-/*
-    fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
-    if (!fPed)
-    {
-        *fLog << dbginf << "MPedestalCam missing in Parameter List... aborting." << endl;
-        return kFALSE;
-    }
-*/
+
     memset(fCut, 0, sizeof(fCut));
 
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 2781)
@@ -62,14 +62,5 @@
 #include "MGeomCam.h"
 
-#include "MCerPhotPix.h"
-#include "MCerPhotEvt.h"
-
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
-
-#include "MCurrents.h"
 #include "MCamEvent.h"
-
-#include "MImgCleanStd.h"
 
 
Index: trunk/MagicSoft/Mars/mhist/MHEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 2781)
@@ -57,6 +57,4 @@
 #include "MParList.h"
 #include "MTaskList.h"
-#include "MPedestalCam.h"
-#include "MPedestalPix.h"
 #include "MParList.h"
 #include "MCerPhotEvt.h"
Index: trunk/MagicSoft/Mars/mhist/MHEvent.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 2780)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 2781)
@@ -13,5 +13,4 @@
 class MMcEvt;
 class MCerPhotEvt;
-class MPedestalCam;
 class MImgCleanStd;
 class MCameraSignal;
@@ -33,5 +32,4 @@
     MMcEvt        *fMcEvt;         //!
     MCerPhotEvt   *fCerPhotEvt;    //!
-    MPedestalCam  *fPedestalCam;   //!
     MImgCleanStd  *fImgCleanStd;   //!
     MCameraSignal *fCamSignal;     //!
Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 2780)
+++ 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 2780)
+++ 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 2780)
+++ 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 2780)
+++ 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;
Index: trunk/MagicSoft/Mars/mmain/MAnalysis.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 2781)
@@ -125,5 +125,4 @@
 #include "MTaskList.h"
 #include "MGeomCamMagic.h"
-#include "MPedestalCam.h"
 #include "MHHillas.h"
 #include "MHStarMap.h"
Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 2780)
+++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 2781)
@@ -188,11 +188,11 @@
     MCerPhotCalc      *ncalc = new MCerPhotCalc;
     MCerPhotAnal2     *nanal = new MCerPhotAnal2;
-    MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt",  "MFillH1");
+    MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1");
     MImgCleanStd      *clean = new MImgCleanStd;
-    MFillH            *fill2 = new MFillH(evt2, "MCerPhotEvt",  "MFillH2");
-    MFillH            *fill3 = new MFillH(evt3, "MPedestalCam", "MFillH3");
-    MFillH            *fill4 = new MFillH(evt4, "MPedestalCam", "MFillH4");
-    MFillH            *fill5 = new MFillH(evt5, "MCameraData",  "MFillH5");
-    MFillH            *fill6 = new MFillH(evt6, "MCameraData",  "MFillH6");
+    MFillH            *fill2 = new MFillH(evt2, "MCerPhotEvt", "MFillH2");
+    MFillH            *fill3 = new MFillH(evt3, "MPedPhotCam", "MFillH3");
+    MFillH            *fill4 = new MFillH(evt4, "MPedPhotCam", "MFillH4");
+    MFillH            *fill5 = new MFillH(evt5, "MCameraData", "MFillH5");
+    MFillH            *fill6 = new MFillH(evt6, "MCameraData", "MFillH6");
     MBlindPixelCalc   *blind = new MBlindPixelCalc;
     MHillasCalc       *hcalc = new MHillasCalc;