Changeset 13003 for trunk/Mars/mextralgo/MExtralgoSpline.h

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.

File:

• trunk/Mars/mextralgo/MExtralgoSpline.h (modified) (1 diff)

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: