Changeset 8480

Timestamp:

05/09/07 13:46:08 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mextralgo/MExtralgoSpline.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -70 +70 @@
      - removed the bad pixel levels for first and last bins
 
-   * msignal/MExtractTimeAndChargeSpline.[h,cc]:
+   * msignal/MExtractTimeAndChargeSpline.[h,cc], 
+     mextralgo/MExtralgoSpline.cc:
      - changed to allow setup of the extraction type and the 
        relative or absolute height for arrival
+     - if the height is set < 0 and extraction type is set to
+       relative integral the maximum is used instead of the leading edge.
      - accordingly increased version number by one
 

trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc

@@ -411 +411 @@
     }
 
+    fSignal    = CalcIntegral(maxpos);
+    fSignalDev = 0;  // means: is valid
+
+    if (fExtractionType==kIntegralRel && fHeightTm<0)
+    {
+        fTime = maxpos;
+        fTimeDev = 0;
+        return;
+    }
+
     const Float_t h = fExtractionType==kIntegralAbs ? fHeightTm : fHeight*fHeightTm;
 
@@ -422 +432 @@
         fWidthDev = 0;
     }
-    fSignal    = CalcIntegral(maxpos);
-    fSignalDev = 0;  // means: is valid
 
     //