Changeset 5280 for trunk/MagicSoft/Mars

Timestamp:

10/15/04 15:56:43 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTime.cc (modified) (3 diffs)
• MExtractTime.h (modified) (2 diffs)
• MExtractor.cc (modified) (3 diffs)
• MExtractor.h (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -70 +70 @@
 using namespace std;
 
-const Float_t MExtractTime::fgOffsetLoGain = 1.51;   // 5 ns
-
 // --------------------------------------------------------------------------
 //
@@ -91 +89 @@
     fTitle = title ? title : "Base class for signal extractors";
 
-    SetOffsetLoGain();
 }
 
@@ -215 +212 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// In addition to the resources of the base-class MExtractor:
-//   MJPedestal.MExtractor.OffsetLoGain: 1.51
-//
-Int_t MExtractTime::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
-{
-    Bool_t rc = kFALSE;
-
-    if (IsEnvDefined(env, prefix, "OffsetLoGain", print))
-    {
-        fOffsetLoGain = GetEnvValue(env, prefix, "OffsetLoGain", fOffsetLoGain);
-        rc = kTRUE;
-    }
-
-    return MExtractor::ReadEnv(env, prefix, print) ? kTRUE : rc;
-}
-
 void MExtractTime::Print(Option_t *o) const
 {

trunk/MagicSoft/Mars/msignal/MExtractTime.h

@@ -11 +11 @@
 class MExtractTime : public MExtractor
 {
-private:
-
-  static const Float_t fgOffsetLoGain;  // Default for fOffsetLoGain (now set to 1.51 (= 5ns)
-
 protected:
   
-  Float_t fOffsetLoGain;     // Offset of the low-gain signal w.r.t. the High-Gain slices
-
   MArrivalTimeCam *fArrTime; //! Container with the photons arrival times
   
@@ -30 +24 @@
   Int_t  Process   ();
 
-  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+public:
 
-public:
   MExtractTime(const char *name=NULL, const char *title=NULL);
-
-  void SetOffsetLoGain( const Float_t f=fgOffsetLoGain) { fOffsetLoGain = f; }
 
   void Print(Option_t *o) const;

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -84 +84 @@
 using namespace std;
 
-const Byte_t  MExtractor::fgSaturationLimit  = 254;
+const Byte_t  MExtractor::fgSaturationLimit = 254;
 const TString MExtractor::fgNamePedestalCam = "MPedestalCam";
-
+const Float_t MExtractor::fgOffsetLoGain    = 1.51;   // 5 ns
 // --------------------------------------------------------------------------
 //
@@ -110 +110 @@
 
     SetNamePedestalCam();
+    SetOffsetLoGain();
     SetRange();
     SetSaturationLimit();
@@ -380 +381 @@
     SetRange(hf, hl, lf, ll);
 
+    if (IsEnvDefined(env, prefix, "OffsetLoGain", print))
+    {
+        SetOffsetLoGain(GetEnvValue(env, prefix, "OffsetLoGain", fOffsetLoGain));
+        rc = kTRUE;
+    }
+
     if (IsEnvDefined(env, prefix, "SaturationLimit", print))
     {

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -22 +22 @@
 class MExtractor : public MTask
 {
+private:
+
+  static const Float_t fgOffsetLoGain;     //! Default for fOffsetLoGain (now set to 1.51 (= 5ns)
+  
 protected:
 
   static const Byte_t  fgSaturationLimit;  //! Default for fSaturationLimit (now set to: 254)
-  static const TString fgNamePedestalCam; //! "MPedestalCam"
-  
+  static const TString fgNamePedestalCam;  //! "MPedestalCam"
+
+  Float_t fOffsetLoGain;                  // Offset of the low-gain signal w.r.t. the High-Gain slices
+
   MPedestalCam        *fPedestals;         //! Pedestals of all pixels in the camera
   MExtractedSignalCam *fSignals;           //! Extracted signal of all pixels in the camera
@@ -70 +76 @@
   virtual void SetRange    ( Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0 );
 
+  void SetOffsetLoGain ( const Float_t f=fgOffsetLoGain) { fOffsetLoGain = f; }
   void SetSaturationLimit  ( Byte_t       lim=fgSaturationLimit        ) { fSaturationLimit  = lim;  }
   void SetNamePedestalCam ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam = name; }