Changeset 8305

Timestamp:

02/04/07 15:49:50 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpedestal/MExtractPedestal.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -71 +71 @@
      - if necessary increased class version
 
+   * mpedestal/MExtractPedestal.cc:
+     - improved output
 
 

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.25 2007-02-03 20:03:35 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.26 2007-02-04 15:49:08 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -318 +318 @@
 void MExtractPedestal::CheckExtractionWindow(UInt_t offset)
 {
+    *fLog << inf;
+    *fLog << "Requested CheckWindow is [" << fCheckWinFirst << "," << fCheckWinLast << "]." <<endl;
+    *fLog << "Requested ExtractWindow is [" << fExtractWinFirst+offset << "," << fExtractWinLast+offset << "]." <<endl;
+
     // fSignal->GetNumSamples() not yet initialized!!!
     const UInt_t num = fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain();
@@ -323 +327 @@
     if (fCheckWinLast >= num)
     {
-        *fLog << inf;
-        *fLog << "CheckWindow [" << fCheckWinFirst+offset << "," << fCheckWinLast+offset;
+        *fLog << "CheckWindow [" << fCheckWinFirst << "," << fCheckWinLast;
         *fLog << "] out of range [0," << num-1 << "]... ";
         *fLog << "reset upper edge." << endl;
@@ -333 +336 @@
     if (offset+fExtractWinLast >= num)
     {
-        *fLog << inf;
         *fLog << "ExtractWindow [" << fExtractWinFirst+offset << "," << fExtractWinLast+offset;
         *fLog << "] out of range [0," << num-1 << "]... ";
@@ -348 +350 @@
     fExtractWinLast += offset+fExtractWinLast==num-1 ? -1 : +1;
 
-    *fLog << inf;
     *fLog << "ExtractionWindow odd... set to [";
     *fLog << fExtractWinFirst+offset << "," << fExtractWinLast+offset << "]" << endl;
@@ -564 +565 @@
         {
             *fLog << err << GetDescriptor();
-            *fLog << " - ERROR: Selected fExtractWinLast out of range." << endl;
+            *fLog << " - ERROR: Selected fExtractWinLast " << fExtractWinLast;
+            *fLog << " out of range (>=" << num<< ")." << endl;
             return kFALSE;
         }
@@ -608 +610 @@
 
     // If the maximum in the high gain window is smaller than
+    // FIXME: Precompiled value!
     return max-min<fMaxSignalVar && max<250;
 }