Changeset 4896 for trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc (modified) (3 diffs)

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);          
 
           /*