Changeset 6332 for trunk/MagicSoft

Timestamp:

02/10/05 02:40:51 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/JobsLinkDef.h (modified) (1 diff)
• mjobs/MJCalibrateSignalFromOutside.cc (deleted)
• mjobs/MJCalibrateSignalFromOutside.h (deleted)
• mjobs/Makefile (modified) (1 diff)
• msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -75 +75 @@
    * mcalib/MCalibrateData.h
      - make default argument for SetSignalType kPhe.
+
+   * mjobs/MJCalibrateSignalFromOuside.[h,cc]
+     - removed
 
 

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -13 +13 @@
 #pragma link C++ class MJCalibration+;
 #pragma link C++ class MJCalibrateSignal+;
-#pragma link C++ class MJCalibrateSignalFromOutside+;
 #pragma link C++ class MJExtractSignal+;
 #pragma link C++ class MJCalibTest+;

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -32 +32 @@
            MJCalibration.cc \
            MJCalibrateSignal.cc \
-           MJCalibrateSignalFromOutside.cc \
            MJExtractSignal.cc \
            MJCalibTest.cc

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc

@@ -83 +83 @@
 const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgPeakSearchWindowSize    =  2;
 const Int_t  MExtractTimeAndChargeDigitalFilterPeakSearch::fgHiGainFailureLimit      = 10;
-const Int_t  MExtractTimeAndChargeDigitalFilterPeakSearch::fgLoGainFailureLimit      = 15;
+const Int_t  MExtractTimeAndChargeDigitalFilterPeakSearch::fgLoGainFailureLimit      = 25;
 // --------------------------------------------------------------------------
 //
@@ -340 +340 @@
   // Shift the last slice to the right:
   //
-  const Byte_t rlim = higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain;
+  const Byte_t rlim = higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain - 1;
   if (rlim <= fHiGainLast+fHiLoLast)
     if (rlim > fHiGainLast)
-      fHiLoLast   = rlim - fHiGainLast;
+      {
+        fHiLoLast   = rlim - fHiGainLast;
+        fHiGainLast = pixel.GetNumHiGainSamples() - 1;
+      }
     else
       {
@@ -355 +358 @@
     }
   
-  const Byte_t llim = fHiGainFirst + (Int_t)fOffsetLoGain;
-  if ( llim >= fLoGainFirst ) 
-    fLoGainFirst = llim;
+  const Byte_t llim = higainfirst + (Int_t)fOffsetLoGain;
+  if ( llim  >= fLoGainFirst + fOffsetLeftFromPeak) 
+    fLoGainFirst = llim - fOffsetLeftFromPeak;
   else
     fLoGainOutOfRangeLeft++;
@@ -364 +367 @@
   // Make sure we will not integrate beyond the lo gain limit:
   //
-  if (fLoGainFirst+fWindowSizeLoGain+fOffsetRightFromPeak <= pixel.GetNumLoGainSamples())
-    fLoGainLast = fLoGainFirst+fWindowSizeLoGain+fOffsetRightFromPeak;
+  const Byte_t lolast = fLoGainFirst+fWindowSizeLoGain+fOffsetRightFromPeak-1;  
+  if (lolast < pixel.GetNumLoGainSamples())
+    fLoGainLast = lolast;
   else
-    fLoGainOutOfRangeRight++;
+    {
+      fLoGainOutOfRangeRight++;
+      //      *fLog << err << (Int_t)higainfirst << "   " << peakpixel << "  " << (int)fLoGainFirst << endl;      
+    }
+  
+  //  *fLog << inf << (int)fHiGainFirst << "  " << (int)higainfirst << "  " << (int)fHiGainLast 
+  //        << "  " << (int)fLoGainFirst << "  " << (int)fLoGainLast << endl;
 
   pixel.Reset();