Index: trunk/MagicSoft/Mars/manalysis/MArrivalTime.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MArrivalTime.h	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MArrivalTime.h	(revision 2958)
@@ -2,4 +2,7 @@
 #define MARS_MArrivalTime
 
+#ifndef MARS_MParContainer
+#include "MParContainer.h"
+#endif
 #ifndef MARS_MCamEvent
 #include "MCamEvent.h"
@@ -15,5 +18,5 @@
 class MRawEvtData;
 
-class MArrivalTime : public MCamEvent
+class MArrivalTime : public MParContainer, public MCamEvent
 {
  private:
Index: trunk/MagicSoft/Mars/manalysis/MCameraData.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCameraData.h	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MCameraData.h	(revision 2958)
@@ -7,4 +7,7 @@
 #ifndef ROOT_TArrayC
 #include <TArrayC.h>
+#endif
+#ifndef MARS_MParContainer
+#include "MParContainer.h"
 #endif
 #ifndef MARS_MCamEvent
@@ -17,5 +20,5 @@
 class MPedPhotCam;
 
-class MCameraData : public MCamEvent
+class MCameraData : public MParContainer, public MCamEvent
 {
 private:
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 2958)
@@ -18,5 +18,5 @@
 class MCerPhotPix;
 
-class MCerPhotEvt : public MCamEvent
+class MCerPhotEvt : public MParContainer, public MCamEvent
 {
 private:
Index: trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2958)
@@ -36,5 +36,4 @@
 
 #include "MParList.h"
-#include "MGeomCam.h"
 
 #include "MRawEvtData.h"
@@ -125,22 +124,4 @@
         return kFALSE;
     
-    return kTRUE;
-}
-
-
-// --------------------------------------------------------------------------
-//
-// The ReInit searches for the following input containers:
-//  - MRawRunHeader
-//
-Bool_t MExtractSignal::ReInit(MParList *pList )
-{
-    MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
-    if (!cam)
-    {
-        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
-        return kFALSE;
-    }
-
     return kTRUE;
 }
Index: trunk/MagicSoft/Mars/manalysis/MExtractSignal.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2958)
@@ -29,17 +29,17 @@
     static const Byte_t fgLast;
 
-    MPedestalCam             *fPedestals;    // Pedestals of all pixels in the camera
-    MExtractedSignalCam      *fSignals;      // Extracted signal of all pixels in the camera
+    MPedestalCam        *fPedestals;    // Pedestals of all pixels in the camera
+    MExtractedSignalCam *fSignals;      // Extracted signal of all pixels in the camera
 
-    MRawEvtData              *fRawEvt;       // raw event data (time slices)
-    MRawRunHeader            *fRunHeader;    // RunHeader information
+    MRawEvtData         *fRawEvt;       // raw event data (time slices)
+    MRawRunHeader       *fRunHeader;    // RunHeader information
 
-    MArrivalTime             *fArrivalTime;  // Arrival Time of FADC sample
+    MArrivalTime        *fArrivalTime;  // Arrival Time of FADC sample
   
-    Byte_t fHiGainFirst;
-    Byte_t fLoGainFirst;
+    Byte_t  fHiGainFirst;
+    Byte_t  fLoGainFirst;
 
-    Byte_t fNumHiGainSamples;
-    Byte_t fNumLoGainSamples;
+    Byte_t  fNumHiGainSamples;
+    Byte_t  fNumLoGainSamples;
 
     Float_t fSqrtHiGainSamples;
@@ -48,5 +48,4 @@
     Byte_t  fSaturationLimit;
 
-    Bool_t ReInit(MParList *pList);
     Int_t  PreProcess(MParList *pList);
     Int_t  Process();
Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h	(revision 2958)
@@ -1,4 +1,8 @@
 #ifndef MARS_MExtractedSignalCam
 #define MARS_MExtractedSignalCam
+
+#ifndef MARS_MParContainer
+#include "MParContainer.h"
+#endif
 
 #ifndef MARS_MCamEvent
@@ -9,8 +13,8 @@
 class MExtractedSignalPix;
 
-class MExtractedSignalCam : public MCamEvent
+class MExtractedSignalCam : public MParContainer, public MCamEvent
 {
 private:
-    TClonesArray *fArray; // FIXME: Change TClonesArray away from a pointer?
+    TClonesArray *fArray; //-> FIXME: Change TClonesArray away from a pointer?
 
     Byte_t fFirstUsedSliceHiGain;
Index: trunk/MagicSoft/Mars/manalysis/MPedPhotCam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPedPhotCam.h	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MPedPhotCam.h	(revision 2958)
@@ -2,4 +2,7 @@
 #define MARS_MPedPhotCam
 
+#ifndef MARS_MParContainer
+#include "MParContainer.h"
+#endif
 #ifndef MARS_MCamEvent
 #include "MCamEvent.h"
@@ -11,5 +14,5 @@
 class MPedPhotPix;
 
-class MPedPhotCam : public MCamEvent
+class MPedPhotCam : public MParContainer, public MCamEvent
 {
 private:
Index: trunk/MagicSoft/Mars/manalysis/MPedestalCam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPedestalCam.h	(revision 2951)
+++ trunk/MagicSoft/Mars/manalysis/MPedestalCam.h	(revision 2958)
@@ -2,4 +2,7 @@
 #define MARS_MPedestalCam
 
+#ifndef MARS_MParContainer
+#include "MParContainer.h"
+#endif
 #ifndef MARS_MCamEvent
 #include "MCamEvent.h"
@@ -11,5 +14,5 @@
 class MPedestalPix;
 
-class MPedestalCam : public MCamEvent
+class MPedestalCam : public MParContainer, public MCamEvent
 {
 private:
@@ -21,8 +24,9 @@
 
     void Clear(Option_t *o="");
-    void InitUseHists();
     
     void InitSize(const UInt_t i);
     Int_t GetSize() const;
+
+    void InitUseHists();
 
     MPedestalPix &operator[](Int_t i);