Changeset 6151 for trunk/MagicSoft/Mars

Timestamp:

01/31/05 16:14:26 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc

@@ -271 +271 @@
   // Shift the start slice to the left:
   //
-  if (higainfirst > fHiGainFirst + fOffsetLeftFromPeak)
+  if (higainfirst >= fHiGainFirst + fOffsetLeftFromPeak)
     fHiGainFirst = higainfirst - fOffsetLeftFromPeak;
   else
@@ -279 +279 @@
   // Shift the last slice to the right:
   //
-  if (higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain < hiGainLastsave)
+  if (higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain <= hiGainLastsave)
     fHiGainLast  = higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain;
   else 
@@ -285 +285 @@
       
 
-  if ( fHiGainFirst+(Int_t)fOffsetLoGain > fLoGainFirst ) 
+  if ( fHiGainFirst+(Int_t)fOffsetLoGain >= fLoGainFirst ) 
     fLoGainFirst = fHiGainFirst + (Int_t)fOffsetLoGain;
   else
@@ -400 +400 @@
 
   if (fHiGainOutOfRangeLeft > 0)
-    *fLog << warn << GetDescriptor() << ": " << fHiGainOutOfRangeLeft*100/GetNumExecutions() << "% ranging out of high-gain window to the left!" << endl;
+    *fLog << warn << GetDescriptor() << ": " << Form("%4.2f",((Float_t)fHiGainOutOfRangeLeft*100)/GetNumExecutions())
+          << "% ranging out of high-gain window to the left!" << endl;
   if (fHiGainOutOfRangeRight > 0)
-    *fLog << warn << GetDescriptor() << ": " << fHiGainOutOfRangeRight*100/GetNumExecutions() << "% ranging out of high-gain window to the right!" << endl;
+    *fLog << warn << GetDescriptor() << ": " << Form("%4.2f",((Float_t)fHiGainOutOfRangeRight*100/GetNumExecutions()) 
+          << "% ranging out of high-gain window to the right!" << endl;
   if (fLoGainOutOfRangeLeft > 0)
-    *fLog << warn << GetDescriptor() << ": " << fLoGainOutOfRangeLeft*100/GetNumExecutions() << "% ranging out of low-gain window to the left!" << endl;
+    *fLog << warn << GetDescriptor() << ": " << Form("%4.2f",((Float_t)fLoGainOutOfRangeLeft*100/GetNumExecutions()) 
+          << "% ranging out of low-gain window to the left!" << endl;
   if (fHiGainOutOfRangeRight > 0)
-    *fLog << warn << GetDescriptor() << ": " << fHiGainOutOfRangeRight*100/GetNumExecutions() << "% ranging out of high-gain window to the right!" << endl;
+    *fLog << warn << GetDescriptor() << ": " << Form("%4.2f",((Float_t)fHiGainOutOfRangeRight*100/GetNumExecutions()) 
+          << "% ranging out of high-gain window to the right!" << endl;