Changeset 5839 for trunk/MagicSoft/Mars

Timestamp:

01/14/05 14:02:00 (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

@@ -27 +27 @@
        me.
 
+   * mpedestal/MPedCalcFromLoGain.cc
+     - fixed one warning output which was not a real warning.
 
 
@@ -67 +69 @@
    * msignal/MExtractTimeFastSpline.cc:
      - fixed delete --> delete[]
-
 
 

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -231 +231 @@
 Bool_t MPedCalcFromLoGain::ReInit(MParList *pList)
 {
-    const UShort_t hisamples = fRunHeader->GetNumSamplesHiGain();
-    const UShort_t losamples = fRunHeader->GetNumSamplesLoGain();
-  
-    fSlices.Set(hisamples+losamples);
-  
-    UShort_t lastavailable   = hisamples+losamples-1;
-  
-    if (fExtractor)
-        lastavailable = losamples-1;
-  
-    // If the size is not yet set, set the size
-    if (fSumx.GetSize()==0)
-    {
-        const Int_t npixels  = fPedestalsOut->GetSize();
-        fNumEventsUsed.Set(npixels);
-        fTotalCounter.Set(npixels);
-    }
-  
-    if (fExtractWinLast > lastavailable) //changed to override check
-    {
-        const UShort_t diff = fExtractWinLast - lastavailable;
-        *fLog << warn << GetDescriptor();
-        *fLog << " - WARNING: Selected Extract Window ranges out of range...adjusting to last available slice ";
-        *fLog << lastavailable << endl;
-  
-        fExtractWinLast -= diff;
-        fExtractWinSize -= diff;
-    }
-  
-    lastavailable = hisamples + losamples -1;
-  
-    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;
-  
-        fCheckWinLast = lastavailable;
-    }
-  
-    return MExtractPedestal::ReInit(pList);
+
+  const UShort_t hisamples = fRunHeader->GetNumSamplesHiGain();
+  const UShort_t losamples = fRunHeader->GetNumSamplesLoGain();
+  
+  fSlices.Set(hisamples+losamples);
+  
+  UShort_t lastavailable   = hisamples+losamples-1;
+
+  if (fExtractor)
+    fExtractWinLast = fExtractWinFirst + fExtractor->GetWindowSizeHiGain() - 1;
+  
+  // If the size is not yet set, set the size
+  if (fSumx.GetSize()==0)
+    {
+      const Int_t npixels  = fPedestalsOut->GetSize();
+      fNumEventsUsed.Set(npixels);
+      fTotalCounter.Set(npixels);
+    }
+  
+  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;
+      
+      fCheckWinLast = lastavailable;
+    }
+  
+  if (fExtractWinLast > lastavailable) 
+    {
+      if (fExtractor)
+        {
+          *fLog << err << GetDescriptor();
+          *fLog << " - ERROR: Selected Last Extraction Window: " 
+                << fExtractWinFirst + fExtractor->GetWindowSizeHiGain()-1 
+                << "ranges out of range: " << lastavailable-1 << endl;
+          return kFALSE;
+        }
+      else
+        {
+          const UShort_t diff = fExtractWinLast - lastavailable;
+          *fLog << warn << GetDescriptor();
+          *fLog << " - WARNING: Selected Extract Window ranges out of range...adjusting to last available slice ";
+          *fLog << lastavailable << endl;
+          
+          fExtractWinLast -= diff;
+          fExtractWinSize -= diff;
+        }
+    }
+  
+  return MExtractPedestal::ReInit(pList);
 }