Changeset 8478 for trunk/MagicSoft/Mars/msignal

Timestamp:

05/09/07 13:15:53 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndChargeSpline.cc (modified) (12 diffs)
• MExtractTimeAndChargeSpline.h (modified) (5 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndChargeSpline.cc,v 1.67 2007-03-05 08:55:09 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndChargeSpline.cc,v 1.68 2007-05-09 12:15:53 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -20 +20 @@
 !   Author(s): Markus Gaug 09/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2002-2006
+!   Copyright: MAGIC Software Development, 2002-2007
 !
 !
@@ -145 +145 @@
 #include "MExtractTimeAndChargeSpline.h"
 
-#include "MExtralgoSpline.h"
-
 #include "MPedestalPix.h"
 
@@ -181 +179 @@
 //
 MExtractTimeAndChargeSpline::MExtractTimeAndChargeSpline(const char *name, const char *title) 
-    : fExtractionType(kIntegral)
+    : fHeightTm(0.5), fExtractionType(MExtralgoSpline::kIntegralRel)
 {
 
@@ -220 +218 @@
 //               second derivative to zero, there.
 //
-void MExtractTimeAndChargeSpline::SetChargeType( ExtractionType_t typ )
+void MExtractTimeAndChargeSpline::SetChargeType(MExtralgoSpline::ExtractionType_t typ)
 {
   fExtractionType = typ;
@@ -228 +226 @@
   switch (fExtractionType)
   {
-  case kAmplitude:
+  case MExtralgoSpline::kAmplitude:
       SetResolutionPerPheHiGain(0.053);
       SetResolutionPerPheLoGain(0.016);
       return;
 
-  case kIntegral:
+  case MExtralgoSpline::kIntegralRel:
+  case MExtralgoSpline::kIntegralAbs:
       switch (fWindowSizeHiGain)
       {
@@ -305 +304 @@
     switch (fExtractionType)
     {
-    case kAmplitude:
+    case MExtralgoSpline::kAmplitude:
         fNumHiGainSamples  = 1.;
         fNumLoGainSamples  = fLoGainLast ? 1. : 0.;
@@ -315 +314 @@
         break;
 
-    case kIntegral:
+    case MExtralgoSpline::kIntegralAbs:
+    case MExtralgoSpline::kIntegralRel:
         fNumHiGainSamples  = fRiseTimeHiGain + fFallTimeHiGain;
         fNumLoGainSamples  = fLoGainLast ? fRiseTimeLoGain + fFallTimeLoGain : 0.;
@@ -336 +336 @@
     MExtralgoSpline s(ptr, num, fHiGainFirstDeriv.GetArray(), fHiGainSecondDeriv.GetArray());
 
+    s.SetExtractionType(fExtractionType);
+    s.SetHeightTm(fHeightTm);
     s.SetRiseFallTime(fRiseTimeHiGain, fFallTimeHiGain);
 
@@ -357 +359 @@
     MExtralgoSpline s(ptr, num, fLoGainFirstDeriv.GetArray(), fLoGainSecondDeriv.GetArray());
 
+    s.SetExtractionType(fExtractionType);
+    s.SetHeightTm(fHeightTm);
     s.SetRiseFallTime(fRiseTimeLoGain, fFallTimeLoGain);
 
@@ -404 +408 @@
       rc = kTRUE;
     }
-  
+  if (IsEnvDefined(env, prefix, "HeightTm", print))
+    {
+      fHeightTm = GetEnvValue(env, prefix, "HeightTm", fHeightTm);
+      rc = kTRUE;
+    }
+
   if (IsEnvDefined(env, prefix, "ExtractionType", print))
   {
@@ -411 +420 @@
       type = type.Strip(TString::kBoth);
       if (type==(TString)"amplitude")
-          SetChargeType(kAmplitude);
-      if (type==(TString)"integral")
-          SetChargeType(kIntegral);
+          SetChargeType(MExtralgoSpline::kAmplitude);
+      if (type==(TString)"integralabsolute")
+          SetChargeType(MExtralgoSpline::kIntegralAbs);
+      if (type==(TString)"integralrelative")
+          SetChargeType(MExtralgoSpline::kIntegralRel);
       rc=kTRUE;
   }

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -4 +4 @@
 #ifndef MARS_MExtractTimeAndCharge
 #include "MExtractTimeAndCharge.h"
+#endif
+
+#ifndef MARS_MExtralgoSpline
+#include "MExtralgoSpline.h"
 #endif
 
@@ -41 +45 @@
 
     Float_t fLoGainStretch;                  // The stretch of the low-gain w.r.t. the high-gain pulse
+    Float_t fHeightTm;
 
 //    Int_t   fRandomIter;                     //! Counter used to randomize weights for noise calculation
@@ -47 +52 @@
     Bool_t  InitArrays(Int_t n);
 
-public:
-    enum ExtractionType_t { kAmplitude, kIntegral };    //! Possible time and charge extraction types
-
 private:
-    ExtractionType_t fExtractionType;
+    MExtralgoSpline::ExtractionType_t fExtractionType;
 
 public:
     MExtractTimeAndChargeSpline(const char *name=NULL, const char *title=NULL);
-    ~MExtractTimeAndChargeSpline() {}
 
     Float_t GetRiseTimeHiGain() const { return fRiseTimeHiGain; }
@@ -83 +84 @@
     void SetLoGainStretch(const Float_t f=fgLoGainStretch) { fLoGainStretch = f;   }
 
-    void SetChargeType(const ExtractionType_t typ=kIntegral);
+    void SetChargeType(const MExtralgoSpline::ExtractionType_t typ=MExtralgoSpline::kIntegralRel);
 /*
     void FindTimeAndChargeHiGain(Byte_t *first, Byte_t *logain, Float_t &sum, Float_t &dsum,
@@ -100 +101 @@
                                   Byte_t sat, Int_t maxpos) const;
 
-    ClassDef(MExtractTimeAndChargeSpline, 4)   // Task to Extract Arrival Times and Charges using a Cubic Spline
+    ClassDef(MExtractTimeAndChargeSpline, 5)   // Task to Extract Arrival Times and Charges using a Cubic Spline
 };