Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4614)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4615)
@@ -19,4 +19,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2004/08/14: Markus Gaug
+
+   * msignal/MExtractor.cc:
+     - documented data members
+     - included default for SetNamePedContainer()
 
 
Index: /trunk/MagicSoft/Mars/msignal/MExtractor.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 4614)
+++ /trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 4615)
@@ -74,6 +74,6 @@
 using namespace std;
 
-const Byte_t MExtractor::fgSaturationLimit = 254;
-
+const Byte_t  MExtractor::fgSaturationLimit  = 254;
+const TString MExtractor::fgNamePedContainer = "MPedestalCam";
 // --------------------------------------------------------------------------
 //
@@ -84,4 +84,5 @@
 // - all variables to 0
 // - fSaturationLimit to fgSaturationLimit
+// - fNamePedContainer to fgNamePedContainer
 //
 // Call:
@@ -90,6 +91,5 @@
 MExtractor::MExtractor(const char *name, const char *title)
     : fPedestals(NULL), fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL),
-      fHiLoLast(0), fNumHiGainSamples(0.), fNumLoGainSamples(0.), 
-      fSaturationLimit(fgSaturationLimit), fNamePedContainer("MPedestalCam")
+      fHiLoLast(0), fNumHiGainSamples(0.), fNumLoGainSamples(0.)
 {
     fName  = name  ? name  : "MExtractor";
@@ -98,5 +98,7 @@
     AddToBranchList("MRawEvtData.*");
 
+    SetNamePedContainer();
     SetRange();
+    SetSaturationLimit();
 }
 
@@ -225,4 +227,22 @@
 }
 
+
+/*
+void MExtractor::FindPedestalLoGain(Byte_t *maxpos, Float_t &sum) const
+{
+
+  Byte_t *p   =  maxpos-4;
+  Byte_t *end =  maxpos-2;
+
+  Int_t summ = 0;
+
+  while (p<end)
+    summ += *p++;
+  
+  sum = summ/2.;
+
+  return;
+}
+*/
 // --------------------------------------------------------------------------
 //
@@ -242,10 +262,10 @@
       FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), sumhi, sathi);
 
-      Float_t sumlo = 0.;
-      Byte_t satlo = 0;
+      Float_t sumlo  = 0.;
+      Byte_t  satlo  = 0;
 
       if (pixel.HasLoGain())
-        FindSignalLoGain(pixel.GetLoGainSamples()+fLoGainFirst, sumlo, satlo);
-      
+	FindSignalLoGain(pixel.GetLoGainSamples()+fLoGainFirst, sumlo, satlo);
+
       const Int_t pixid = pixel.GetPixelId();
       
Index: /trunk/MagicSoft/Mars/msignal/MExtractor.h
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 4614)
+++ /trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 4615)
@@ -23,53 +23,56 @@
 {
 protected:
-    static const Byte_t fgSaturationLimit;
 
-    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
-
-    Byte_t   fHiGainFirst;
-    Byte_t   fLoGainFirst;
-
-    Byte_t   fHiGainLast;
-    Byte_t   fLoGainLast;
-
-    Byte_t   fHiLoLast;
-    
-    Float_t  fNumHiGainSamples;
-    Float_t  fNumLoGainSamples;
-
-    Float_t  fSqrtHiGainSamples;
-    Float_t  fSqrtLoGainSamples;
-
-    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 { }
-    virtual void FindSignalLoGain(Byte_t *firstused, Float_t &sum, Byte_t &sat) const { }
-
-    Int_t  PreProcess(MParList *pList);
-    Bool_t ReInit(MParList *pList);
-    Int_t  Process();
-    void   StreamPrimitive(ofstream &out) const;
-    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+  static const Byte_t  fgSaturationLimit;  //! Default for fSaturationLimit (now set to: 254)
+  static const TString fgNamePedContainer; //! "MPedestalCam"
+  
+  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
+                                       
+  Byte_t   fHiGainFirst;                   // First FADC slice nr. to extract the High Gain signal
+  Byte_t   fHiGainLast;                    // Last FADC slice nr. to extract the High Gain signal
+  Byte_t   fLoGainFirst;                   // First FADC slice nr. to extract the Low Gain signal
+  Byte_t   fLoGainLast;                    // Last FADC slice nr. to extract the Low Gain signal
+                                           
+  Byte_t   fHiLoLast;                      // Number of slices in fLoGainSamples counted for the High-Gain signal
+                                           
+  Float_t  fNumHiGainSamples;              // Number High Gain FADC slices used to extract the signal
+  Float_t  fNumLoGainSamples;              // Number Low  Gain FADC slices used to extract the signal
+                                           
+  Float_t  fSqrtHiGainSamples;             // Sqrt. nr. High Gain FADC slices used to extract the signal
+  Float_t  fSqrtLoGainSamples;             // Sqrt. nr. Low  Gain FADC slices used to extract the signal
+                                           
+  Byte_t   fSaturationLimit;               // Highest FADC slice value until being declared saturated
+  TString  fNamePedContainer;              // Name of the 'MPedestalCam' container
+  
+  virtual void FindSignalHiGain(Byte_t *firstused, Byte_t *lowgain, Float_t &sum, Byte_t &sat) const { }
+  virtual void FindSignalLoGain(Byte_t *firstused, Float_t &sum, Byte_t &sat) const { }
+  
+  Int_t   PreProcess(MParList *pList);
+  Bool_t  ReInit(MParList *pList);
+  Int_t   Process();
+  void    StreamPrimitive(ofstream &out) const;
+  Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public:
-    MExtractor(const char *name=NULL, const char *title=NULL);
 
-    Byte_t  GetHiGainFirst()      const { return fHiGainFirst;      }
-    Byte_t  GetHiGainLast ()      const { return fHiGainLast ;      }
-    Byte_t  GetLoGainFirst()      const { return fLoGainFirst;      }
-    Byte_t  GetLoGainLast ()      const { return fLoGainLast ;      }
-    Float_t GetNumHiGainSamples() const { return fNumHiGainSamples; }
-    Float_t GetNumLoGainSamples() const { return fNumLoGainSamples; }
-    
-    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; }
+  MExtractor(const char *name=NULL, const char *title=NULL);
+  
+  Byte_t  GetHiGainFirst()      const { return fHiGainFirst;      }
+  Byte_t  GetHiGainLast ()      const { return fHiGainLast ;      }
+  Byte_t  GetLoGainFirst()      const { return fLoGainFirst;      }
+  Byte_t  GetLoGainLast ()      const { return fLoGainLast ;      }
+  Float_t GetNumHiGainSamples() const { return fNumHiGainSamples; }
+  Float_t GetNumLoGainSamples() const { return fNumLoGainSamples; }
+  
+  virtual void SetRange    ( Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0 );
 
-    ClassDef(MExtractor, 0) // Signal Extractor Base Class
+  void SetSaturationLimit  ( Byte_t       lim=fgSaturationLimit        ) { fSaturationLimit  = lim;  }
+  void SetNamePedContainer ( const char *name=fgNamePedContainer.Data()) { fNamePedContainer = name; }
+  
+  ClassDef(MExtractor, 0) // Signal Extractor Base Class
 };