Changeset 13003

Timestamp:

03/07/12 16:28:14 (13 years ago)

Author:

tbretz

Message:

Improved the possible combinations of how to extract the leading edge or position of maximum and the intgeral or amplitude.

Location:

trunk/Mars

Files:

• mextralgo/MExtralgoSpline.cc (modified) (2 diffs)
• mextralgo/MExtralgoSpline.h (modified) (1 diff)
• msignal/MExtractTimeAndChargeSpline.cc (modified) (2 diffs)
• msignal/MExtractTimeAndChargeSpline.h (modified) (1 diff)

trunk/Mars/mextralgo/MExtralgoSpline.cc

@@ -289 +289 @@
         return 0;
 
-    if (fExtractionType == kAmplitude)
+    if (!(fExtractionType&kIntegral))
     {
         const Int_t   pos = gRandom->Integer(fNum-1);
@@ -320 +320 @@
     // --- End NEW ---
 
-    if (fExtractionType == kAmplitude)
-    {
-        fTime      = maxpos;
-        fTimeDev   = 0;
+    if (fExtractionType&kIntegral)
+    {
+        fSignal    = CalcIntegral(maxpos);
+        fSignalDev = 0;  // means: is valid
+    }
+    else
+    {
         fSignal    = fHeight;
         fSignalDev = 0;  // means: is valid
-        return;
-    }
-
-    fSignal    = CalcIntegral(maxpos);
-    fSignalDev = 0;  // means: is valid
-
-    if (fExtractionType==kIntegralRel && fHeightTm<0)
-    {
-        fTime = maxpos;
+    }
+
+    // Position of maximum
+    if (((fExtractionType&kTimeRel) && fHeightTm<0) || (fExtractionType&kMaximum))
+    {
+        fTime    = maxpos;
         fTimeDev = 0;
         return;
     }
 
-    const Float_t h = fExtractionType==kIntegralAbs ? fHeightTm : fHeight*fHeightTm;
+    // Position of fraction height or absolute height
+    const Float_t h = (fExtractionType&kTimeRel) ? fHeight*fHeightTm : fHeightTm;
 
     // Search downwards for fHeight/2

trunk/Mars/mextralgo/MExtralgoSpline.h

@@ -12 +12 @@
 {
 public:  
-    enum ExtractionType_t { kAmplitude, kIntegralRel, kIntegralAbs };    //! Possible time and charge extraction types
+    enum ExtractionType_t
+    {
+        kIntegral = BIT(0),
+        kTimeRel  = BIT(1),
+        kMaximum  = BIT(2),
+
+        // For backward compatibility
+        kAmplitudeAbs = 0,                   // Height of maximum, absolute height leading edge
+        kAmplitudeRel = kTimeRel,            // Height of maximum, relative height leading edge
+        kAmplitude    = kMaximum,            // Position and height of maximum
+        kIntegralAbs  = kIntegral,           // Integral, absolute height leading edge
+        kIntegralRel  = kIntegral|kTimeRel,  // Integral, relative height leading edge
+    };
 
 private:

trunk/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -225 +225 @@
   {
   case MExtralgoSpline::kAmplitude:
+  case MExtralgoSpline::kAmplitudeRel:
+  case MExtralgoSpline::kAmplitudeAbs:
       SetResolutionPerPheHiGain(0.053);
       SetResolutionPerPheLoGain(0.016);
@@ -303 +305 @@
     {
     case MExtralgoSpline::kAmplitude:
+    case MExtralgoSpline::kAmplitudeRel:
+    case MExtralgoSpline::kAmplitudeAbs:
         fNumHiGainSamples  = 1.;
         fNumLoGainSamples  = fLoGainLast ? 1. : 0.;

trunk/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -82 +82 @@
     }
 
+    void SetHeightTm(const Double_t h) { fHeightTm = h; }
+
     void SetLoGainStretch(const Float_t f=fgLoGainStretch) { fLoGainStretch = f;   }