Changeset 5342 for trunk/MagicSoft

Timestamp:

11/05/04 00:26:32 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (1 diff)
• mpedestal/MPedCalcFromLoGain.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -39 +39 @@
      - Removed obsolete check of old MC files, which needed the removed
        data member MMcRunHeader.fTelesTheta.
+
+ 2004/11/04: Markus Gaug
+
+   * mjobs/MJPedestal.cc
+     - adapted to changes in MPedCalcFromLoGain
 
  2004/11/04: Nepomuk Otte

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -665 +665 @@
     {
       if (IsUseData())
-        pedlogain.SetWindowSize(12,(Int_t)fExtractor->GetNumHiGainSamples());          
+        pedlogain.SetExtractWindow(15,(Int_t)fExtractor->GetNumHiGainSamples());          
       else
         {

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -262 +262 @@
 // - if a window is odd
 // 
- 
 void MPedCalcFromLoGain::SetExtractWindow(Int_t windowf, Int_t windows)
 {
@@ -274 +273 @@
   Int_t odd  = windows & 0x1;
  
-
   if (odd||(windows==0)){
     *fLog << warn << GetDescriptor() << ": Extract window size has to be even and larger 0, adjust!"<< endl;
@@ -284 +282 @@
   fExtractWinLast = fExtractWinFirst+fExtractWinSize-1;
 
- 
+//
+//  NO RANGE CHECK IMPLEMENTED, YET
+//
+/*
+    const Byte_t availhirange = (fHiGainLast-fHiGainFirst+1) & ~1;
+    const Byte_t availlorange = (fLoGainLast-fLoGainFirst+1) & ~1;
+  
+    if (fWindowSizeHiGain > availhirange)
+    {
+        *fLog << warn;
+        *fLog << GetDescriptor() << ": HiGain window " << (int)fWindowSizeHiGain;
+        *fLog << " out of range [" << (int)fHiGainFirst;
+        *fLog << "," << (int)fHiGainLast << "]" << endl;
+        *fLog << "Will set window size to " << (int)availhirange << endl;
+        fWindowSizeHiGain = availhirange;
+    }
+    
+    if (fWindowSizeLoGain > availlorange)
+    {
+        *fLog << warn;
+        *fLog << GetDescriptor() << ": LoGain window " << (int)fWindowSizeLoGain;
+        *fLog << " out of range [" << (int)fLoGainFirst;
+        *fLog << "," << (int)fLoGainLast << "]" << endl;
+        *fLog << "Will set window size to " << (int)availlorange << endl;
+        fWindowSizeLoGain = availlorange;
+    }
+*/
 }