Changeset 6820 for trunk/MagicSoft/Mars/msignal

Timestamp:

03/15/05 11:10:55 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndCharge.cc (modified) (2 diffs)
• MExtractor.cc (modified) (1 diff)
• MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -85 +85 @@
 using namespace std;
 
-const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -2.8; 
+const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -4.0; 
 const Byte_t  MExtractTimeAndCharge::fgLoGainSwitch = 120; 
 // --------------------------------------------------------------------------
@@ -217 +217 @@
           fLoGainFirstSave = fLoGainFirst;
           const Byte_t logainstart = sathi 
-            ? (sathi > (Int_t)fLoGainStartShift ? sathi + (Int_t)fLoGainStartShift : fLoGainFirst)
-            : (Byte_t)(timehi + fLoGainStartShift);
+            ? (sathi > (Int_t)(-fLoGainStartShift) ? sathi + (Int_t)fLoGainStartShift : fLoGainFirst)
+            : (timehi+fLoGainStartShift > 0. ? (Byte_t)(timehi + fLoGainStartShift) : fLoGainFirst);
           fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
 

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -133 +133 @@
 void MExtractor::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast)
 {
-    fHiGainFirst = hifirst;
-    fHiGainLast  = hilast;
-
-    fLoGainFirst = lofirst;
-    fLoGainLast  = lolast;
+ 
+  Clear();
+
+  fHiGainFirst = hifirst;
+  fHiGainLast  = hilast;
+  
+  fLoGainFirst = lofirst;
+  fLoGainLast  = lolast;
 }
 

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -72 +72 @@
   MExtractor(const char *name=NULL, const char *title=NULL);
   
+  void Clear(Option_t *o="") 
+    {
+      fHiGainFirst = fHiGainLast = fLoGainFirst = fLoGainLast = fHiLoLast = 0;
+    }
+
   Byte_t  GetHiGainFirst()      const { return fHiGainFirst;      }
   Byte_t  GetHiGainLast ()      const { return fHiGainLast ;      }