Changeset 7731 for trunk/MagicSoft/Mars/msignal

Timestamp:

05/23/06 16:31:41 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -63 +63 @@
 #include "MExtractTimeAndCharge.h"
 
+#include <TRandom.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -87 +89 @@
 const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -3.5; 
 const Byte_t  MExtractTimeAndCharge::fgLoGainSwitch = 120; 
+
 // --------------------------------------------------------------------------
 //
@@ -197 +200 @@
       // Make sure that in cases the time couldn't be correctly determined
       // more meaningfull default values are assigned
-      if (timehi<0)
-          timehi = -1;
-      if (timehi>pixel.GetNumHiGainSamples())
-          timehi = pixel.GetNumHiGainSamples();
+      if (timehi<=0 || timehi>pixel.GetNumHiGainSamples())
+          timehi = gRandom->Uniform(pixel.GetNumHiGainSamples());
       
       Float_t sumlo =0., deltasumlo =-1.; // invalidate logain of MExtractedSignalPix
@@ -235 +236 @@
           // Make sure that in cases the time couldn't be correctly determined
           // more meaningfull default values are assigned
-          if (timelo<0)
-              timelo = -1;
-          if (timelo>pixel.GetNumLoGainSamples())
-              timelo = pixel.GetNumLoGainSamples();
+          if (timelo<=0 || timelo>pixel.GetNumLoGainSamples())
+              timelo = gRandom->Uniform(pixel.GetNumLoGainSamples());
       }