Changeset 8478 for trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h (modified) (5 diffs)

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
 };