Changeset 8500 for trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc

Timestamp:

05/11/07 19:30:04 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc

@@ -225 +225 @@
 }
 
-Float_t MExtralgoSpline::ExtractNoise(/*Int_t iter*/)
+Float_t MExtralgoSpline::ExtractNoise()
 {
     if (fNum<5)
         return 0;
 
-    // FIXME: Shell we keep the extraction inside one slice
-    // or randomize it along the extraction window?
-    const Float_t nsx = gRandom->Uniform(); //iter * fResolution;
-
     if (fExtractionType == kAmplitude)
-        return Eval(2, nsx);
+    {
+        const Int_t   pos = gRandom->Integer(fNum-1);
+        const Float_t nsx = gRandom->Uniform();
+        return Eval(pos, nsx);
+    }
     else
-        return CalcIntegral(2 + nsx);
+    {
+        const Float_t pos = gRandom->Uniform(fNum-1-fRiseTime-fFallTime)+fRiseTime;
+        return CalcIntegral(pos);
+    }
 }