Changeset 6138 for trunk/MagicSoft

Timestamp:

01/30/05 19:29:40 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndChargeDigitalFilter.cc (modified) (1 diff)
• MExtractTimeAndChargeDigitalFilterPeakSearch.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -395 +395 @@
       return;
 
-  time = max_p + fTimeShiftHiGain /* this shifts the time to the start of the rising edge */
+  time = max_p + fTimeShiftHiGain + (Float_t)fHiGainFirst /* this shifts the time to the start of the rising edge */
       - ((Float_t)t_iter)/fBinningResolutionHiGain;
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc

@@ -77 +77 @@
 using namespace std;
 
-const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgHiGainFirst             =  1;
-const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgHiGainLast              = 15;
+const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgHiGainFirst             =  0;
+const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgHiGainLast              = 18;
 const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgLoGainFirst             =  3;
 const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgLoGainLast              = 14;
@@ -230 +230 @@
   // Shift the start slice to the left:
   //
-  if (higainfirst > fOffsetLeftFromPeak)
+  if (higainfirst > fHiGainFirst + fOffsetLeftFromPeak)
     fHiGainFirst = higainfirst - fOffsetLeftFromPeak;
   else
-    *fLog << warn << " High Gain ranges out of limits to the left!!! " << endl;
+    *fLog << warn << " High Gain ranges out of limits to the left!!! " << (Int_t)higainfirst << endl;
 
   //
   // Shift the last slice to the right:
   //
-  if (higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain > hiGainLastsave)
+  if (higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain < hiGainLastsave)
     fHiGainLast  = higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain;
   else 
-    *fLog << warn << " High Gain ranges out of limits to the right!!! " << endl;
+    *fLog << warn << " High Gain ranges out of limits to the right!!! " << (Int_t)higainfirst << endl;
+      
 
   if ( fHiGainFirst+(Int_t)fOffsetLoGain > fLoGainFirst ) 
     fLoGainFirst = fHiGainFirst + (Int_t)fOffsetLoGain;
   else
-    *fLog << warn << " High Gain ranges out of limits to the left!!! " << endl;
+    *fLog << inf << " High Gain ranges out of limits to the left!!! " << (Int_t)fHiGainFirst << endl;
   
   //