Changeset 4899 for trunk/MagicSoft/Mars/msignal

Timestamp:

09/09/04 17:19:26 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MArrivalTimePix.h (modified) (1 diff)
• MExtractAmplitudeSpline.cc (modified) (4 diffs)
• MExtractBlindPixel.cc (modified) (1 diff)
• MExtractFixedWindowSpline.cc (modified) (4 diffs)
• MExtractSlidingWindow.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h

@@ -38 +38 @@
     Byte_t GetNumLoGainSaturated()      const { return fNumLoGainSaturated; }
 
-    Bool_t IsLoGainUsed() const { return fNumHiGainSaturated > 0; }
-    Bool_t IsValid() const;   
+    Bool_t IsLoGainUsed()               const { return fNumHiGainSaturated > 0; }
+    Bool_t IsValid()                    const;   
 
     ClassDef(MArrivalTimePix, 1)        // Storage Container for ArrivalTime information of one pixel

trunk/MagicSoft/Mars/msignal/MExtractAmplitudeSpline.cc

@@ -121 +121 @@
 
   fNumHiGainSamples = 2.;
-  fNumLoGainSamples = 2.;
+  fNumLoGainSamples = lolast == 0 ? 0. : 2.;
 
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);
@@ -166 +166 @@
   Int_t range = fHiGainLast - fHiGainFirst + 1 + fHiLoLast;
 
-  fHiGainSignal = new Float_t[range];
+  fHiGainSignal      = new Float_t[range];
   memset(fHiGainSignal,0,range*sizeof(Float_t));
   fHiGainFirstDeriv  = new Float_t[range];
@@ -181 +181 @@
         << endl;
 
-  range = fLoGainLast - fLoGainFirst + 1;
+  range = fLoGainLast ? fLoGainLast - fLoGainFirst + 1 : 0;
 
   fLoGainSignal = new Float_t[range];
@@ -189 +189 @@
   fLoGainSecondDeriv = new Float_t[range];
   memset(fLoGainSecondDeriv,0,range*sizeof(Float_t));
-
+  
   *fLog << endl;
   *fLog << inf << GetDescriptor() << ": Using for Low-Gain Extraction " << range

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -181 +181 @@
 
   fNumHiGainSamples = (Float_t)(fHiGainLast-fHiGainFirst+1);
-  fNumLoGainSamples = (Float_t)(fLoGainLast-fLoGainFirst+1);  
+  if (lolast)
+    fNumLoGainSamples = (Float_t)(fLoGainLast-fLoGainFirst+1);
+  else
+    fNumLoGainSamples = 0.;
 
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowSpline.cc

@@ -111 +111 @@
 
   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)
@@ -124 +121 @@
     }
   
-  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) 
     {
@@ -139 +128 @@
       hilast = hifirst+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;        
-    }
-
+
+  const Byte_t windowlo = lolast-lofirst+1;
+  const Byte_t wloeven = windowlo & ~1;
+
+  if (lolast != 0)
+    {
+      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;        
+        }
+    }
+  
 
   MExtractor::SetRange(hifirst,hilast,lofirst,lolast);
@@ -157 +161 @@
   //
   fNumHiGainSamples = (Float_t)(fHiGainLast-fHiGainFirst);
-  fNumLoGainSamples = (Float_t)(fLoGainLast-fLoGainFirst);  
+  if (fLoGainLast != 0)
+    fNumLoGainSamples = (Float_t)(fLoGainLast-fLoGainFirst);  
+  else
+    fNumLoGainSamples = 0.;
 
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);

trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.cc

@@ -129 +129 @@
                               fLoGainFirst, fLoGainLast, fNumLoGainSamples);
 
+
+  *fLog << endl;
+  *fLog << inf << GetDescriptor() << ": Taking " << fNumHiGainSamples
+        << " HiGain samples from a window starting with slice " << (Int_t)fHiGainFirst
+        << " to " << (Int_t)(fHiGainLast+fHiLoLast) << " incl" << endl;
+  *fLog << inf << GetDescriptor() << ": Taking " << fNumLoGainSamples
+        << " LoGain samples from a window starting with slice " << (Int_t)fLoGainFirst
+        << " to " << (Int_t)fLoGainLast << " incl" << endl;
+
   return kTRUE;
   
@@ -161 +170 @@
     
   const Byte_t availhirange = (fHiGainLast-fHiGainFirst+1) & ~1;
-  const Byte_t availlorange = (fLoGainLast-fLoGainFirst+1) & ~1;
 
   if (fWindowSizeHiGain > availhirange)
@@ -173 +181 @@
     }
   
-  if (fWindowSizeLoGain > availlorange)
-    {
-      *fLog << warn << GetDescriptor() 
-            << Form("%s%2i%s%2i%s%2i%s",": Lo Gain window size: ",(int)fWindowSizeLoGain,
-                    " is bigger than available range: [",(int)fLoGainFirst,",",(int)fLoGainLast,"]") << endl;
-      *fLog << warn << GetDescriptor() 
-            << ": Will set window size to: " << (int)availlorange << endl;
-      fWindowSizeLoGain = availlorange;
-    }
-  
   if (fWindowSizeHiGain<2) 
     {
@@ -189 +187 @@
     }
   
-  if (fWindowSizeLoGain<2) 
-    {
-      fWindowSizeLoGain = 2;
-      *fLog << warn << GetDescriptor() << ": Lo Gain window size set to two samples" << endl;
-    }
-    
+  if (fLoGainLast != 0 && fWindowSizeLoGain != 0)
+    {
+      const Byte_t availlorange = (fLoGainLast-fLoGainFirst+1) & ~1;
+      
+      if (fWindowSizeLoGain > availlorange)
+        {
+          *fLog << warn << GetDescriptor() 
+                << Form("%s%2i%s%2i%s%2i%s",": Lo Gain window size: ",(int)fWindowSizeLoGain,
+                        " is bigger than available range: [",(int)fLoGainFirst,",",(int)fLoGainLast,"]") << endl;
+          *fLog << warn << GetDescriptor() 
+                << ": Will set window size to: " << (int)availlorange << endl;
+          fWindowSizeLoGain = availlorange;
+        }
+      
+      if (fWindowSizeLoGain<2) 
+        {
+          fWindowSizeLoGain = 2;
+          *fLog << warn << GetDescriptor() << ": Lo Gain window size set to two samples" << endl;
+        }
+    }
+  
   fNumHiGainSamples = (Float_t)fWindowSizeHiGain;
   fNumLoGainSamples = (Float_t)fWindowSizeLoGain;