Changeset 8296 for trunk

Timestamp:

02/03/07 20:04:00 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpedestal/MExtractPedestal.cc (modified) (6 diffs)
• mpedestal/MExtractPedestal.h (modified) (1 diff)
• mpedestal/MPedCalcFromLoGain.cc (modified) (3 diffs)
• mpedestal/MPedCalcPedRun.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
    * callisto_DecJan04.rc:
      - set fall- and rise-time for spline artificially to 0.5
+
+   * mhbase/MFillH.cc:
+     - added comments
+
+   * mpedestal/MExtractPedestal.[h,cc], 
+     mpedestal/MPedCalcFromLoGain.cc, mpedestal/MPedCalcPedRun.cc:
+     - fixed the range check.In case of the lo-gain extraction
+       the range could infact leak out of the fadc slices
 
 

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.24 2007-01-26 21:10:14 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.25 2007-02-03 20:03:35 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -268 +268 @@
 Bool_t MExtractPedestal::SetExtractWindow(UShort_t windowf, UShort_t windows)
 {
-
-  Bool_t rc = kTRUE;
-
-  const Int_t odd  = TMath::Odd(windows);
-  
-  if (odd && !fExtractor)
-  {
-      *fLog << warn << GetDescriptor();
-      *fLog << " - WARNING: Window size in SetExtractWindow has to be even... ";
-      *fLog << " lowering from " << windows << " to ";
-      windows -= 1;
-      *fLog << windows << "!" << endl;
-      rc = kFALSE;
-  }
-
-  if (windows==0)
-  {
-      *fLog << warn << GetDescriptor();
-      *fLog << " - WARNING: Window size in SetExtractWindow has to be > 0... adjusting to 2!" << endl;
-      windows = 2;
-      rc = kFALSE;
-  }
-
-  fExtractWinSize  = windows;
-  fExtractWinFirst = windowf;
-  fExtractWinLast  = fExtractWinFirst+fExtractWinSize-1;
-
-  return rc;
+    Bool_t rc = kTRUE;
+
+    if (windows==0)
+    {
+        *fLog << warn << GetDescriptor();
+        *fLog << " - WARNING: Window size in SetExtractWindow has to be > 0... adjusting to 2!" << endl;
+        windows = 2;
+        rc = kFALSE;
+    }
+
+    fExtractWinSize  = windows;
+    fExtractWinFirst = windowf;
+    fExtractWinLast  = fExtractWinFirst+fExtractWinSize-1;
+
+    return rc;
 }
 
@@ -329 +316 @@
 // Check (and if neccesary: correct) the extraction and check ranges.
 //
-void MExtractPedestal::CheckExtractionWindow()
+void MExtractPedestal::CheckExtractionWindow(UInt_t offset)
 {
     // fSignal->GetNumSamples() not yet initialized!!!
@@ -336 +323 @@
     if (fCheckWinLast >= num)
     {
-        *fLog << warn << endl;
-        *fLog << "Selected CheckWindow [" << fCheckWinFirst << "," << fCheckWinLast;
-        *fLog << "] ranges out of range [0," << num-1 << "]." << endl;
-        *fLog << "Resetting upper edge." << endl;
-
-        fCheckWinLast = num;
-    }
-
-    if (fExtractWinLast >= num)
-    {
-        *fLog << warn << endl;
-        *fLog << "Selected ExtractWindow [" << fExtractWinFirst << "," << fExtractWinLast;
-        *fLog << "] ranges out of range [0," << num-1 << "]." << endl;
-        *fLog << "Resetting upper edge." << endl;
-
-        fExtractWinLast = num;
+        *fLog << inf;
+        *fLog << "CheckWindow [" << fCheckWinFirst+offset << "," << fCheckWinLast+offset;
+        *fLog << "] out of range [0," << num-1 << "]... ";
+        *fLog << "reset upper edge." << endl;
+
+        fCheckWinLast = num-1;
+    }
+
+    if (offset+fExtractWinLast >= num)
+    {
+        *fLog << inf;
+        *fLog << "ExtractWindow [" << fExtractWinFirst+offset << "," << fExtractWinLast+offset;
+        *fLog << "] out of range [0," << num-1 << "]... ";
+        *fLog << "reset upper edge." << endl;
+
+        fExtractWinLast = num-offset-1;
     }
 
@@ -359 +346 @@
         return;
 
-    fExtractWinLast += fExtractWinLast==num-1 ? -1 : +1;
-
-    *fLog << warn << endl;
-    *fLog << "ExtractionWindow odd...";
-    *fLog << "New extraction window [" << fExtractWinFirst << "," << fExtractWinLast << "]" << endl;
+    fExtractWinLast += offset+fExtractWinLast==num-1 ? -1 : +1;
+
+    *fLog << inf;
+    *fLog << "ExtractionWindow odd... set to [";
+    *fLog << fExtractWinFirst+offset << "," << fExtractWinLast+offset << "]" << endl;
 
     fExtractWinSize = fExtractWinLast-fExtractWinFirst+1;
@@ -582 +569 @@
     }
 
-    CheckExtractionWindow();
+    //CheckExtractionWindow();
 
     return kTRUE;

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

@@ -101 +101 @@
   Bool_t  CheckVariation(UInt_t idx) const;
 
-  void CheckExtractionWindow();
+  void CheckExtractionWindow(UInt_t offset=0);
 
 public:

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.34 2006-10-24 07:58:13 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.35 2007-02-03 20:03:35 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -158 +158 @@
 using namespace std;
 
-const UShort_t MPedCalcFromLoGain::fgExtractWinFirst = 17;
-const UShort_t MPedCalcFromLoGain::fgExtractWinSize  =  6;
+const UShort_t MPedCalcFromLoGain::fgExtractWinFirst =  17;
+const UShort_t MPedCalcFromLoGain::fgExtractWinSize  =   6;
 const UInt_t   MPedCalcFromLoGain::fgNumDump         = 500;
 
@@ -213 +213 @@
     if (!MExtractPedestal::ReInit(pList))
         return kFALSE;
+
+    CheckExtractionWindow(fRunHeader->GetNumSamplesHiGain());
 
     return kTRUE;

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.49 2006-10-24 07:58:13 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.50 2007-02-03 20:03:35 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -205 +205 @@
         return kFALSE;
 
+    CheckExtractionWindow();
+
     //
     // If this is the first ped run, the next run (call to ReInit)