Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc	(revision 8744)
+++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc	(revision 8788)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.36 2007-09-07 12:17:16 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.37 2007-12-14 09:56:03 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -197,5 +197,6 @@
     : fGeom(NULL), fPedestalsInter(NULL),
     fPedestalsOut(NULL), fExtractor(NULL), fSignal(0),
-    fExtractWinFirst(0), fExtractWinSize(0), fUseSpecialPixels(kFALSE)
+    fExtractWinFirst(0), fExtractWinSize(0), fUseSpecialPixels(kFALSE),
+    fCounter(0)
 {
     fName  = name  ? name  : "MExtractPedestal";
@@ -468,4 +469,6 @@
   }
 
+  fCounter = 0;
+
   return fExtractor ? fExtractor->CallPreProcess(pList) : kTRUE;
 }
@@ -621,4 +624,6 @@
 Int_t MExtractPedestal::PostProcess()
 {
+    fPedestalsOut->SetNumEvents(fCounter);
+
     return fExtractor ? fExtractor->CallPostProcess() : kTRUE;
 }
Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h	(revision 8744)
+++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h	(revision 8788)
@@ -90,4 +90,6 @@
   MArrayI fNumEventsUsed;            // Number of events used for pedestal calc for each pixel
 
+  UInt_t  fCounter;                  // Counter for events processed
+
   // MTask virtual functions
   Int_t  PreProcess(MParList *pList);
Index: trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc	(revision 8744)
+++ trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc	(revision 8788)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.38 2007-05-11 10:25:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.39 2007-12-14 09:56:03 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -238,4 +238,6 @@
     }
 
+    fCounter++;
+
     if (fPedestalUpdate)
         fPedestalsOut->SetReadyToSave();
Index: trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc	(revision 8744)
+++ trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc	(revision 8788)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.51 2007-05-11 10:25:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.52 2007-12-14 09:56:03 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -265,4 +265,6 @@
         CalcPixel(pixel, 0, fUseSpecialPixels);
 
+    fCounter++;
+
     fPedestalsOut->SetReadyToSave();
 
Index: trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc	(revision 8744)
+++ trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc	(revision 8788)
@@ -36,4 +36,8 @@
 //  - fTotalEntries
 //
+// Class Version 3:
+// ----------------
+//  + fNumEvents
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MPedestalCam.h"
@@ -78,5 +82,5 @@
 //
 MPedestalCam::MPedestalCam(const char *name, const char *title) 
-    : fNumSlices(0)
+    : fNumSlices(0), fNumEvents(0)
 {
   fName  = name  ? name  : "MPedestalCam";
@@ -122,4 +126,7 @@
     (*this)[i].Copy(cam[i]);
 
+  cam.fNumEvents = fNumEvents;
+  cam.fNumSlices = fNumSlices;
+
   n = GetNumAverageArea();
   cam.InitAverageAreas(n);
@@ -293,25 +300,26 @@
 }
 
-void MPedestalCam::Print(Option_t *o) const
-{
-    *fLog << all << GetDescriptor() << ":" << endl;
-    *fLog << "Pixels:" << endl;    
+void MPedestalCam::Print(Option_t *option) const
+{
+    *fLog << all << GetDescriptor();
+    *fLog << " - Events=" << fNumEvents << ", Slices=" << fNumSlices << ":" << endl;
     *fLog << endl;
 
-    PrintArr(*fArray);
-
     *fLog << endl;
-    *fLog << "Event-by-event averaged areas:" << endl;    
-    *fLog << endl;
-
+    *fLog << "Event-by-event averaged areas:" << endl;
     PrintArr(*fAverageAreas);
 
     *fLog << endl;
     *fLog << "Event-by-event averaged sectors:" << endl;
-    *fLog << endl;
-
     PrintArr(*fAverageSectors);
-}
-
+
+    if (TString(option).Contains("all", TString::kIgnoreCase))
+    {
+        *fLog << "Pixels:" << endl;
+        PrintArr(*fArray);
+    }
+}
+
+/*
 Float_t MPedestalCam::GetPedestalMin(const MGeomCam *geom) const
 {
@@ -357,4 +365,5 @@
     return maxval;
 }
+*/
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mpedestal/MPedestalCam.h
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedestalCam.h	(revision 8744)
+++ trunk/MagicSoft/Mars/mpedestal/MPedestalCam.h	(revision 8788)
@@ -24,4 +24,5 @@
 
   UInt_t fNumSlices;  // Total number of slices
+  UInt_t fNumEvents;  // Number of events used for pedestal calculation
 
   void PrintArr(const TCollection &list) const;
@@ -31,8 +32,10 @@
   MPedestalCam(const char *name=NULL, const char *title=NULL);
   ~MPedestalCam();
-  
+
+  // TObject
   void Clear(Option_t *o="");
   void Copy(TObject &object) const;
-  
+  void Print(Option_t *o="") const; //*MENU*
+
   // Getters 
         MPedestalPix &GetAverageArea   ( UInt_t i );
@@ -42,8 +45,9 @@
   const MPedestalPix &GetAverageSector ( UInt_t i )            const;
   const Int_t         GetNumAverageSector()                    const;
-  Float_t             GetPedestalMin   ( const MGeomCam *cam ) const;
-  Float_t             GetPedestalMax   ( const MGeomCam *cam ) const;
+  //Float_t             GetPedestalMin   ( const MGeomCam *cam ) const;
+  //Float_t             GetPedestalMax   ( const MGeomCam *cam ) const;
   Int_t               GetSize          ()                      const;
   ULong_t             GetNumSlices() const { return fNumSlices; }
+  UInt_t              GetNumEvents() const { return fNumEvents; }
 
   TArrayF GetAveragedPedPerArea  ( const MGeomCam &geom, const UInt_t ai=0,  MBadPixelsCam *bad=NULL );
@@ -51,5 +55,5 @@
   TArrayF GetAveragedRmsPerArea  ( const MGeomCam &geom, const UInt_t ai=0,  MBadPixelsCam *bad=NULL );
   TArrayF GetAveragedRmsPerSector( const MGeomCam &geom, const UInt_t sec=0, MBadPixelsCam *bad=NULL );
-  
+
         MPedestalPix &operator[]       ( Int_t i             );
   const MPedestalPix &operator[]       ( Int_t i             ) const;
@@ -60,13 +64,13 @@
   void  InitAverageSectors             ( const UInt_t i      );
 
-  void Print(Option_t *o="") const;
-  
   // Setters
   void SetNumSlices(const ULong_t n) { fNumSlices = n; }
-  
+  void SetNumEvents(const UInt_t n)  { fNumEvents = n; }
+
+  // MCamEvent
   Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
   void DrawPixelContent(Int_t idx) const;
 
-  ClassDef(MPedestalCam, 2)	// Storage Container for all pedestal information of the camera
+  ClassDef(MPedestalCam, 3)	// Storage Container for all pedestal information of the camera
 };