Changeset 4732 for trunk/MagicSoft/Mars/msignal

Timestamp:

08/25/04 17:30:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTime.cc (modified) (2 diffs)
• MExtractTimeFastSpline.cc (modified) (2 diffs)
• MExtractTimeFastSpline.h (modified) (2 diffs)
• MExtractTimeHighestIntegral.cc (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -230 +230 @@
     }
 
-    rc = MExtractor::ReadEnv(env, prefix, print) ? kTRUE : rc;
-
-    return rc;
+    return MExtractor::ReadEnv(env, prefix, print) ? kTRUE : rc;
 }
 
@@ -240 +238 @@
     if (IsA()==MExtractTime::Class())
         *fLog << GetDescriptor() << ":" << endl;
-    *fLog << " Offset Lo-Gain=" << fOffsetLoGain << endl;
+    *fLog << " Offset Lo-Gain: " << fOffsetLoGain << endl;
     MExtractor::Print(o);
 }

trunk/MagicSoft/Mars/msignal/MExtractTimeFastSpline.cc

@@ -54 +54 @@
 const Float_t MExtractTimeFastSpline::fgResolution   = 0.003;
 const Float_t MExtractTimeFastSpline::fgRiseTime     = 1.5;
+
 // --------------------------------------------------------------------------
 //
@@ -672 +673 @@
 }
 
-
+// --------------------------------------------------------------------------
+//
+// In addition to the resources of the base-class MExtractor:
+//   MJPedestal.MExtractor.Resolution: 0.003
+//   MJPedestal.MExtractor.RiseTime:   1.5
+//
+Int_t MExtractTimeFastSpline::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+
+    if (IsEnvDefined(env, prefix, "HiGainWindowSize", print))
+    {
+        SetResolution(GetEnvValue(env, prefix, "Resolution", fResolution));
+        rc = kTRUE;
+    }
+    if (IsEnvDefined(env, prefix, "LoGainWindowSize", print))
+    {
+        SetRiseTime(GetEnvValue(env, prefix, "RiseTime", fRiseTime));
+        rc = kTRUE;
+    }
+
+    return MExtractTime::ReadEnv(env, prefix, print) ? kTRUE : rc;
+}
+
+void MExtractTimeFastSpline::Print(Option_t *o) const
+{
+    *fLog << all;
+    *fLog << GetDescriptor() << ":" << endl;
+    *fLog << " Resolution:     " << fResolution << endl;
+    *fLog << " RiseTime:       " << fRiseTime << endl;
+    MExtractTime::Print(o);
+}

trunk/MagicSoft/Mars/msignal/MExtractTimeFastSpline.h

@@ -18 +18 @@
   static const Float_t fgRiseTime  ;     // Default for fRiseTime     (now set to: 1.5  C  
 
-  Float_t *fHiGainFirstDeriv;
-  Float_t *fLoGainFirstDeriv;  
-  Float_t *fHiGainSecondDeriv;
-  Float_t *fLoGainSecondDeriv;  
+  Float_t *fHiGainFirstDeriv;            //!
+  Float_t *fLoGainFirstDeriv;            //!
+  Float_t *fHiGainSecondDeriv;           //!
+  Float_t *fLoGainSecondDeriv;           //!
 
-  Float_t fResolution;                        // The time resolution in FADC units
-  Float_t fRiseTime  ;                        // The rise time of the pulse 
-  Byte_t  fStartBeforeMax;                    // Slices to start searching for the halfmax before max
+  Float_t fResolution;                   // The time resolution in FADC units
+  Float_t fRiseTime  ;                   // The rise time of the pulse
+  Byte_t  fStartBeforeMax;               // Slices to start searching for the halfmax before max
   
   void FindTimeHiGain(Byte_t *first, Float_t &time, Float_t &dtime, Byte_t &sat, const MPedestalPix &ped) const;
   void FindTimeLoGain(Byte_t *first, Float_t &time, Float_t &dtime, Byte_t &sat, const MPedestalPix &ped) const;
+
+  Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
   
 public:
@@ -38 +40 @@
   void SetResolution(Float_t f=fgResolution)     { fResolution = f;  }
   void SetRiseTime  (Float_t f=fgRiseTime  )     { fRiseTime   = f; fStartBeforeMax = (Int_t)(2*fRiseTime); }  
+
+  void Print(Option_t *o) const;
   
-  ClassDef(MExtractTimeFastSpline, 0)   // Task to Extract the Arrival Times using a Fast Spline
+  ClassDef(MExtractTimeFastSpline, 1)   // Task to Extract the Arrival Times using a Fast Spline
 };
 

trunk/MagicSoft/Mars/msignal/MExtractTimeHighestIntegral.cc

@@ -324 +324 @@
         SetWindowSize(hw, lw);
 
-    rc = MExtractTime::ReadEnv(env, prefix, print) ? kTRUE : rc;
-
-    return rc;
+    return MExtractTime::ReadEnv(env, prefix, print) ? kTRUE : rc;
 }