Changeset 4896 for trunk/MagicSoft/Mars

Timestamp:

09/09/04 16:55:42 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractBlindPixel.cc (modified) (3 diffs)
• msignal/MExtractFixedWindow.cc (modified) (4 diffs)
• msignal/MExtractFixedWindow.h (modified) (1 diff)
• msignal/MExtractPINDiode.cc (modified) (2 diffs)
• msignal/MExtractTimeHighestIntegral.cc (modified) (2 diffs)
• msignal/MExtractor.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/09: Markus Gaug
+
+   * msignal/MExtractor.cc
+   * msignal/MExtractTimeHighestIntegral.cc
+   * msignal/MExtractSlidingWindow.cc
+   * msignal/MExtractPINDiode.cc
+   * msignal/MExtractFixedWindow.cc
+   * msignal/MExtractBlindPixel.cc
+   * msignal/MExtractAmplitudeSpline.cc
+     - removed some possible bugs in the case that no LoGain is 
+       available at all.
+
 
  2004/09/09: Thomas Bretz

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -260 +260 @@
   }
 
-  const Int_t firstdesired   = (Int_t)fHiGainFirst;
-  Int_t lastavailable  = (Int_t)fRunHeader->GetNumSamplesHiGain()-1;
-  
-  if (firstdesired > lastavailable)
-  {
-      const Int_t diff = firstdesired - lastavailable;
-      *fLog << endl;
-      *fLog << warn << "First Hi Gain slice " << (int)fHiGainFirst << " out of range [0,";
-      *fLog << lastavailable << "]... start at slice " << diff << " of the Lo Gain " << endl;
-      
-      fHiLoFirst   = diff;
-    }
-
-  const Int_t lastdesired   = (Int_t)fHiGainLast;
-  
+  const Int_t higainsamples = fRunHeader->GetNumSamplesHiGain();
+  const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain();
+  Int_t lastavailable       =  higainsamples-1;
+
+  if (logainsamples)
+    {
+      //
+      // If the signal is searched entirely in the low-gain range, have 
+      // to skip the higain completely. This is steered by the variable fHiLoFirst
+      // 
+      const Int_t firstdesired   = (Int_t)fHiGainFirst;
+  
+      if (firstdesired > lastavailable)
+        {
+          const Int_t diff = firstdesired - lastavailable;
+          *fLog << endl;
+          *fLog << warn << "First Hi Gain slice " << (int)fHiGainFirst << " out of range [0,";
+          *fLog << lastavailable << "]... start at slice " << diff << " of the Lo Gain " << endl;
+          
+          fHiLoFirst   = diff;
+        }
+    }
+  
+  const Int_t lastdesired = (Int_t)fHiGainLast;
+
   if (lastdesired > lastavailable)
     {
-      Int_t diff = lastdesired - lastavailable;
-      lastavailable += (Int_t)fRunHeader->GetNumSamplesLoGain()-1;
+      Int_t diff     = lastdesired - lastavailable;
+      lastavailable += logainsamples ? logainsamples-1 : 0;
       
       if (lastdesired > lastavailable)
@@ -285 +295 @@
           *fLog << "Last Hi Gain slice " << (int)fHiGainLast << " out of range [0,";
           *fLog << lastavailable << "]... reduce upper limit by " << diff << endl;
-          diff = (Int_t)fRunHeader->GetNumSamplesLoGain();
-        }
-
-      fHiGainLast = (Int_t)fRunHeader->GetNumSamplesHiGain() - 1;
-      fHiLoLast = diff;
+          diff = logainsamples;
+        }
+
+      fHiGainLast = higainsamples - 1;
+      fHiLoLast   = logainsamples ? diff : 0;
     }
 
@@ -669 +679 @@
 
           sum = 0;
-          FindSignalFilter(pixel.GetLoGainSamples(), sum, sat);          
+          if (pixel.HasLoGain())
+            FindSignalFilter(pixel.GetLoGainSamples(), sum, sat);          
 
           /*

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc

@@ -99 +99 @@
 
   const Byte_t windowhi = hilast-hifirst+1;
-  const Byte_t windowlo = lolast-lofirst+1;
-  
   const Byte_t whieven = windowhi & ~1;
-  const Byte_t wloeven = windowlo & ~1;
 
   if (whieven != windowhi)
@@ -112 +109 @@
     }
   
-  if (wloeven != windowlo)
-    {
-      *fLog << warn << GetDescriptor() 
-            << Form("%s%2i%s%2i",": Lo Gain window size has to be even, set last slice from "
-                    ,(int)lolast," to ",(int)(lolast-1)) << endl;
-      lolast -= 1;
-    }
-  
   if (whieven<2) 
     {
@@ -128 +117 @@
     }
   
-  if (wloeven<2) 
-    {
-      *fLog << warn << GetDescriptor() 
+
+  if (lolast != 0)
+    {
+      const Byte_t windowlo = lolast-lofirst+1;
+      const Byte_t wloeven = windowlo & ~1;
+
+      if (wloeven != windowlo)
+        {
+          *fLog << warn << GetDescriptor() 
+                << Form("%s%2i%s%2i",": Lo Gain window size has to be even, set last slice from "
+                        ,(int)lolast," to ",(int)(lolast-1)) << endl;
+          lolast -= 1;
+        }
+      
+      if (wloeven<2) 
+        {
+          *fLog << warn << GetDescriptor() 
             << Form("%s%2i%s%2i",": Lo Gain window is smaller than 2 FADC sampes, set last slice from" 
                     ,(int)lolast," to ",(int)(lofirst+1)) << endl;
-      lolast = lofirst+1;        
-    }
-
+          lolast = lofirst+1;        
+        }
+    }
 
   MExtractor::SetRange(hifirst,hilast,lofirst,lolast);
 
   fNumHiGainSamples = (Float_t)(fHiGainLast-fHiGainFirst+1);
-  fNumLoGainSamples = (Float_t)(fLoGainLast-fLoGainFirst+1);  
+  if (fLoGainLast != 0)
+    fNumLoGainSamples = (Float_t)(fLoGainLast-fLoGainFirst+1);  
+  else
+    fNumLoGainSamples = 0.;
 
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);
@@ -166 +172 @@
   *fLog << inf << GetDescriptor() << ": Taking " << fNumHiGainSamples
         << " HiGain samples from slice " << (Int_t)fHiGainFirst
-        << " to " << (Int_t)(fHiGainLast+fHiLoLast) << "incl" << endl;
+        << " to " << (Int_t)(fHiGainLast+fHiLoLast) << " incl" << endl;
   *fLog << inf << GetDescriptor() << ": Taking " << fNumLoGainSamples
         << " LoGain samples from slice " << (Int_t)fLoGainFirst
-        << " to " << (Int_t)fLoGainLast << "incl" << endl;
+        << " to " << (Int_t)fLoGainLast << " incl" << endl;
   return kTRUE;
   

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.h

@@ -27 +27 @@
   
   Bool_t ReInit(MParList *pList);
-
+  
 public:
 

trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc

@@ -128 +128 @@
   MExtractor::SetRange(hifirst,hilast,lofirst,lolast);
 
-
   fNumHiGainSamples = (Float_t)(fHiGainLast-fHiGainFirst+1);
-  fNumLoGainSamples = (Float_t)(fLoGainLast-fLoGainFirst+1);  
+  fNumLoGainSamples = (fLoGainLast == 0) ? 0. : (Float_t)(fLoGainLast-fLoGainFirst+1);  
 
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);
   fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);  
   
-  fNumSamples = fHiGainLast-fHiGainFirst+1+fLoGainLast-fLoGainFirst+1;
+  fNumSamples = (fLoGainLast == 0) 
+    ? fHiGainLast-fHiGainFirst+1 
+    : fHiGainLast-fHiGainFirst+1+fLoGainLast-fLoGainFirst+1;
   fSqrtSamples = TMath::Sqrt((Float_t)fNumSamples);
   
@@ -260 +261 @@
   
   FindSignalandVarianceHiGain(pixel.GetHiGainSamples()+fHiGainFirst,sum,sum2,sat);
-  FindSignalandVarianceLoGain(pixel.GetLoGainSamples()+fLoGainFirst,sum,sum2,sat);
+  if (pixel.HasLoGain())
+    FindSignalandVarianceLoGain(pixel.GetLoGainSamples()+fLoGainFirst,sum,sum2,sat);
 
   const Float_t var = ((Float_t)sum2 - (Float_t)sum*sum/fNumSamples)/(fNumSamples-1);

trunk/MagicSoft/Mars/msignal/MExtractTimeHighestIntegral.cc

@@ -79 +79 @@
   MExtractor::SetRange(hifirst,hilast,lofirst,lolast);
 
-
   Int_t range = fHiGainLast - fHiGainFirst + 1;
   
@@ -92 +91 @@
     }
   
-  range = fLoGainLast - fLoGainFirst + 1;
-
-  if (range < 2)
-    {
-      *fLog << warn << GetDescriptor()
-            << Form("%s%2i%s%2i%s",": Lo-Gain Extraction range [",(int)fLoGainFirst,","
-                    ,fLoGainLast,"] too small, ") << endl;
-      *fLog << warn << GetDescriptor()
-            << " will move logher limit to obtain 4 slices " << endl;
-      SetRange(fHiGainFirst, fHiGainLast,fLoGainFirst,fLoGainLast+4-range);
-    }
-
+  if (fLoGainLast != 0)
+    {
+      range = fLoGainLast - fLoGainFirst + 1;
+      
+      if (range < 2)
+        {
+          *fLog << warn << GetDescriptor()
+                << Form("%s%2i%s%2i%s",": Lo-Gain Extraction range [",(int)fLoGainFirst,","
+                        ,fLoGainLast,"] too small, ") << endl;
+          *fLog << warn << GetDescriptor()
+                << " will move lower limit to obtain 4 slices " << endl;
+          SetRange(fHiGainFirst, fHiGainLast,fLoGainFirst,fLoGainLast+4-range);
+        }
+    }
 
   SetWindowSize(fHiGainWindowSize,fLoGainWindowSize);
 
   fNumHiGainSamples = fHiGainLast-fHiGainFirst+1;
-  fNumLoGainSamples = fLoGainLast-fLoGainFirst+1;
+  fNumLoGainSamples = fLoGainLast ? fLoGainLast-fLoGainFirst+1 : 0;
   
 }

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -191 +191 @@
 Bool_t MExtractor::ReInit(MParList *pList)
 {
-    Int_t lastdesired   = (Int_t)(fLoGainLast);
-    Int_t lastavailable = (Int_t)fRunHeader->GetNumSamplesLoGain()-1;
-
-    if (lastavailable < 0)
+
+  const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain();
+
+  Int_t lastdesired;
+  Int_t lastavailable;
+
+  if (logainsamples)
+    {
+
+      lastdesired   = (Int_t)(fLoGainLast);
+      lastavailable = logainsamples-1;
+      
+      if (lastavailable < 0)
         *fLog << warn << GetDescriptor() << " - WARNING: Number of available Low-Gain Slices is smaller than or equal zero!" << endl;
-
+      
     if (lastdesired > lastavailable)
-    {
+      {
         const Int_t diff = lastdesired - lastavailable;
-
+        
         *fLog << endl;
         *fLog << warn << GetDescriptor() << ": Selected Lo Gain FADC Window [";
@@ -207 +216 @@
         *fLog << GetDescriptor() << ": Will reduce the upper edge to " << (int)(fLoGainLast - diff) << endl;
         SetRange(fHiGainFirst, fHiGainLast, fLoGainFirst, fLoGainLast-diff);
-    }
-
-    lastdesired   = (Int_t)fHiGainLast;
-    lastavailable = (Int_t)fRunHeader->GetNumSamplesHiGain()-1;
-
-    if (lastavailable < 0)
-    {
-        *fLog << err << GetDescriptor();
-        *fLog << " - ERROR: Number of available High-Gain Slices is smaller than or equal zero!" << endl;
-        return kFALSE;
-    }
-
+      }
+    }
+  else
+    SetRange(fHiGainFirst, fHiGainLast, 0,0);      
+  
+  const Int_t higainsamples = fRunHeader->GetNumSamplesHiGain();
+
+  if (higainsamples <= 0)
+    {
+      *fLog << err << GetDescriptor();
+      *fLog << " - ERROR: Number of available High-Gain Slices is smaller than or equal zero!" << endl;
+      return kFALSE;
+    }
+
+  lastdesired   = (Int_t)fHiGainLast;
+  lastavailable = higainsamples-1;
+  
   if (lastdesired > lastavailable)
-  {
+    {
       const Int_t diff = lastdesired - lastavailable;
-
+      
       *fLog << endl;
       *fLog << warn << GetDescriptor() << ": Selected Hi Gain FADC Window [";
@@ -230 +244 @@
       *fLog << Form("%2i", diff) << " samples from the Low-Gain for the High-Gain extraction";
       *fLog << endl;
-
+      
       fHiGainLast -= diff;
       fHiLoLast    = diff;
-  }
-
+    }
+  
   return kTRUE;
 }