Changeset 5547

Timestamp:

12/02/04 14:11:34 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mpedestal/MPedCalcFromLoGain.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/12/01: Markus Gaug and Thomas Schweizer
+ 
+   * mpedestal/MPedCalcFromLoGain.cc
+     - introduce a check which does not allow the last slice of the 
+       check window to be smaller than the last slice of the 
+       extraction window.
+
+
  2004/12/01: Markus Gaug
 
-   * MExtractTimeAndChargeSpline.[h,cc]:
+   * msignal/MExtractTimeAndChargeSpline.[h,cc]:
      - introduced a random iterator for the "pedestal" calculation of 
        the amplitude spline.
 
 
-   * MExtractTimeAndChargeDigitalFilter.cc:
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc:
      - fixed bug in the loop over the weights which can cause a call to 
        an array index out of range. Since MArrays are used, this call 
@@ -38 +46 @@
  2004/11/30: Thomas Bretz
  
-   * MExtractTimeAndChargeDigitalFilter.cc:
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc:
      - InitArrays: added missing return statement
 

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -267 +267 @@
    if (fCheckWinLast > lastavailable) //changed to override check
      {
-       *fLog << warn << GetDescriptor();
-       *fLog << " - WARNING: Last Check Window slice out of range...adjusting to last available slice ";
-       *fLog << lastavailable << endl;
+       *fLog << warn << GetDescriptor()
+             << " - WARNING: Last Check Window slice out of range...adjusting to last available slice "
+             << lastavailable << endl;
        
        fCheckWinLast = lastavailable;
+     }
+
+   if (fCheckWinLast < fExtractWinLast) 
+     {
+       *fLog << warn << GetDescriptor()
+             << " - WARNING: Last Check Window slice lower than extraction window "
+             << " - push it up to last number of low-gain samples: ";
+       fCheckWinLast = fExtractWinLast;
+       *fLog << fCheckWinLast << endl;
      }