Changeset 8158 for trunk/MagicSoft/Mars/mextralgo

Timestamp:

10/24/06 13:40:58 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mextralgo

Files:

• MExtralgoSpline.cc (modified) (4 diffs)
• MExtralgoSpline.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc

@@ -50 +50 @@
 #include "MExtralgoSpline.h"
 
+#include <TRandom.h>
+
 #include "../mbase/MMath.h"
 
@@ -207 +209 @@
 }
 
-#include <TRandom.h>
-Float_t MExtralgoSpline::ExtractNoise(Int_t iter)
-{
+Float_t MExtralgoSpline::ExtractNoise(/*Int_t iter*/)
+{
+    // FIXME: Shell we keep the extraction inside one slice
+    // or randomize it along the extraction window?
     const Float_t nsx = gRandom->Uniform(); //iter * fResolution;
 
@@ -378 +381 @@
     {
         fTime      = maxpos;
-        fTimeDev   = fResolution;
+        fTimeDev   = 0;
         fSignal    = maxval;
         fSignalDev = 0;  // means: is valid
@@ -389 +392 @@
 
     fTime      = x1;
-    fTimeDev   = fResolution;
+    fTimeDev   = 0;
     fSignal    = CalcIntegral(maxpos);
     fSignalDev = 0;  // means: is valid

trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.h

@@ -30 +30 @@
     Float_t fFallTime;
 
-    Float_t fResolution;
+//    Float_t fResolution;
 
     // Result
@@ -446 +446 @@
 
     void SetRiseFallTime(Float_t rise, Float_t fall) { fRiseTime=rise; fFallTime=fall; }
-    void SetExtrationType(ExtractionType_t typ)      { fExtractionType = typ; }
-    void SetResolution(Float_t res)                  { fResolution=res; }
+    void SetExtractionType(ExtractionType_t typ)     { fExtractionType = typ; }
+//    void SetResolution(Float_t res)                  { fResolution=res; }
 
     Float_t GetTime() const      { return fTime; }
@@ -458 +458 @@
     void GetTime(Float_t &sig, Float_t &dsig) const   { sig=fTime; dsig=fTimeDev; }
 
-    Float_t ExtractNoise(Int_t iter);
+    Float_t ExtractNoise(/*Int_t iter*/);
     void Extract(Byte_t sat, Int_t maxpos);
 };