Changeset 8741 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

09/05/07 20:36:37 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.34 2007-07-14 00:02:24 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.35 2007-09-05 19:36:36 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -350 +350 @@
     const UInt_t num = fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain();
 
+    // Check upper bound for check window
     if (fCheckWinLast >= num)
     {
-        *fLog << "CheckWindow [" << fCheckWinFirst << "," << fCheckWinLast;
+        *fLog << inf << "CheckWindow [" << fCheckWinFirst << "," << fCheckWinLast;
         *fLog << "] out of range [0," << num-1 << "]... ";
         *fLog << "reset upper edge." << endl;
@@ -359 +360 @@
     }
 
-    if (offset+fExtractWinLast >= num)
-    {
-        *fLog << "ExtractWindow [" << fExtractWinFirst+offset << "," << fExtractWinLast+offset;
+    // Now check lower bound for check window
+    if (fCheckWinFirst>fCheckWinLast)
+    {
+        *fLog << err << "CheckWindow first slice " << fCheckWinFirst;
+        *fLog << " greater than last slice " << fCheckWinLast;
+        *fLog << "... reset to 0." << endl;
+
+        fCheckWinFirst = 0;
+    }
+
+    // check upper bound for extaction window
+    if (fExtractWinLast+offset >= num)
+    {
+        *fLog << inf << "ExtractWindow [" << fExtractWinFirst+offset << "," << fExtractWinLast+offset;
         *fLog << "] out of range [0," << num-1 << "]... ";
         *fLog << "reset upper edge." << endl;
@@ -368 +380 @@
     }
 
+    // Now check lower bound for check window
+    if (fExtractWinFirst>fExtractWinLast)
+    {
+        *fLog << err << "ExtractionWindow first slice " << fExtractWinFirst+offset;
+        *fLog << " greater than last slice " << fExtractWinLast+offset;
+        *fLog << "... reset to 0." << endl;
+
+        fExtractWinFirst = 0;
+    }
+
+    // Calculate window size for extraction window
     fExtractWinSize = fExtractWinLast-fExtractWinFirst+1;
 
+    // Check if use tries to do a fundamental pedestal extraction
+    // with an odd number of slices
     if (fExtractor || TMath::Even(fExtractWinSize))
         return;
 
+    // Make sure the number of extracted slices is even
     fExtractWinLast += offset+fExtractWinLast==num-1 ? -1 : +1;
 
-    *fLog << "ExtractionWindow odd... set to [";
+    *fLog << inf << "ExtractionWindow odd... set to [";
     *fLog << fExtractWinFirst+offset << "," << fExtractWinLast+offset << "]" << endl;