Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4585)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4586)
@@ -20,4 +20,24 @@
                                                  -*-*- END OF LINE -*-*-
 
+    2004/08/12: Hendrik Bartko
+    * msignal/MExtractor.[h,cc]:
+      - add SetNamePedContainer to set the name of the pedestal
+        container
+
+    * msignal/MExtractTime.[h,cc]:
+      - add SetNamePedContainer to set the name of the pedestal
+        container
+
+    * mbadpixels/MBadPixelsCalc.[h,cc]
+      - add SetNamePedPhotContainer to set the name of the pedphot
+        container
+
+    * mbadpixels/MBadPixelsTreat.[h,cc]
+      - add SetNamePedPhotContainer to set the name of the pedphot
+        container
+
+    * mimage/MImgCleanStd.[h,cc]
+      - add SetNamePedPhotContainer to set the name of the pedphot
+        container
 
 
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4585)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4586)
@@ -85,5 +85,5 @@
 //
 MBadPixelsCalc::MBadPixelsCalc(const char *name, const char *title)
-    : fPedestalLevel(3)
+    : fPedestalLevel(3), fNamePedPhotContainer("MPedPhotCam")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -102,5 +102,5 @@
     if (fPedestalLevel>0)
     {
-        fPedPhotCam = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
+      fPedPhotCam = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer,  AddSerialNumber("MPedPhotCam"));
         if (!fPedPhotCam)
         {
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h	(revision 4585)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h	(revision 4586)
@@ -21,5 +21,6 @@
 
     Float_t fPedestalLevel;
-
+    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
+   
     //    void CheckPedestalRMS() const;
     Bool_t CheckPedestalRms() const;
@@ -32,4 +33,5 @@
 
     void SetPedestalLevel(Float_t f) { fPedestalLevel=f; }
+    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
 
     ClassDef(MBadPixelsCalc, 1) // Task to find bad pixels (star, broken pixels, etc)
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 4585)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 4586)
@@ -87,5 +87,5 @@
 //
 MBadPixelsTreat::MBadPixelsTreat(const char *name, const char *title)
-    : fFlags(0), fNumMinNeighbors(3)
+  : fFlags(0), fNumMinNeighbors(3), fNamePedPhotContainer("MPedPhotCam")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -121,5 +121,5 @@
     }
 
-    fPedPhot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
+    fPedPhot = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
     if (!fPedPhot)
     {
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h	(revision 4585)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h	(revision 4586)
@@ -21,4 +21,5 @@
     Byte_t fFlags;       // flag for the method which is used
     Byte_t fNumMinNeighbors;
+    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
 
     enum
@@ -64,4 +65,5 @@
     }
     void SetNumMinNeighbors(Byte_t num) { fNumMinNeighbors=num; }
+    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
 
 
Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 4585)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 4586)
@@ -291,5 +291,5 @@
                            const char *name, const char *title)
     : fCleaningMethod(kStandard), fCleanLvl1(lvl1),
-    fCleanLvl2(lvl2), fCleanRings(1)
+      fCleanLvl2(lvl2), fCleanRings(1), fNamePedPhotContainer("MPedPhotCam")
 
 {
@@ -510,5 +510,5 @@
     }
 
-    fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
+    fPed = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
     if (!fPed)
     {
Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.h	(revision 4585)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.h	(revision 4586)
@@ -38,4 +38,6 @@
 
     Float_t fInnerNoise;      //!
+    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
+
 
     void CreateGuiElements(MGGroupFrame *f);
@@ -65,4 +67,5 @@
 
     Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);
+    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
 
     ClassDef(MImgCleanStd, 2)    // task doing the image cleaning
Index: trunk/MagicSoft/Mars/msignal/MExtractTime.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTime.cc	(revision 4585)
+++ trunk/MagicSoft/Mars/msignal/MExtractTime.cc	(revision 4586)
@@ -83,5 +83,5 @@
 //
 MExtractTime::MExtractTime(const char *name, const char *title)
-    : fArrTime(NULL)
+  : fArrTime(NULL), fNamePedContainer("MPedestalCam")
 {
 
@@ -129,5 +129,5 @@
   
 
-  fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
+  fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
   if (!fPedestals)
     {
Index: trunk/MagicSoft/Mars/msignal/MExtractTime.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTime.h	(revision 4585)
+++ trunk/MagicSoft/Mars/msignal/MExtractTime.h	(revision 4586)
@@ -18,5 +18,7 @@
 
   MArrivalTimeCam *fArrTime;            // Container with the photons arrival times
+  TString fNamePedContainer; // name of the 'MPedestalCam' container
   
+
   virtual Int_t PreProcess(MParList *pList);
   virtual Bool_t ReInit(MParList *pList);
@@ -33,4 +35,6 @@
 
   void SetOffsetLoGain( const Float_t f=fgOffsetLoGain) { fOffsetLoGain = f; }
+  void SetNamePedContainer(const char *name)    { fNamePedContainer = name; }
+
  
   ClassDef(MExtractTime, 0)   // Arrival Time Extractor Base Class
Index: trunk/MagicSoft/Mars/msignal/MExtractor.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 4585)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 4586)
@@ -91,5 +91,5 @@
     : fPedestals(NULL), fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL),
       fHiLoLast(0), fNumHiGainSamples(0.), fNumLoGainSamples(0.), 
-      fSaturationLimit(fgSaturationLimit)
+      fSaturationLimit(fgSaturationLimit), fNamePedContainer("MPedestalCam")
 {
     fName  = name  ? name  : "MExtractor";
@@ -143,5 +143,5 @@
         return kFALSE;
 
-    fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
+    fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
     if (!fPedestals)
     {
Index: trunk/MagicSoft/Mars/msignal/MExtractor.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 4585)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 4586)
@@ -46,4 +46,5 @@
 
     Byte_t  fSaturationLimit;
+    TString fNamePedContainer; // name of the 'MPedestalCam' container
 
     virtual void FindSignalHiGain(Byte_t *firstused, Byte_t *lowgain, Float_t &sum, Byte_t &sat) const { }
@@ -68,4 +69,5 @@
     virtual void SetRange  (Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0);
     void SetSaturationLimit(Byte_t lim=fgSaturationLimit) { fSaturationLimit = lim; }
+    void SetNamePedContainer(const char *name)    { fNamePedContainer = name; }
 
     ClassDef(MExtractor, 0) // Signal Extractor Base Class