Changeset 3396 for trunk/MagicSoft/Mars/msignal

Timestamp:

03/04/04 12:11:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/msignal/MExtractSignal.cc

@@ -147 +147 @@
 Int_t MExtractSignal::Process()
 {
-
     MRawEvtPixelIter pixel(fRawEvt);
     fSignals->Clear();
@@ -156 +155 @@
     while (pixel.Next())
     {
-        Int_t sumhi, sumlo;
-        Byte_t sathi, satlo;
+        Int_t sumhi;
+        Byte_t sathi;
 
         FindSignal(pixel.GetHiGainSamples()+fHiGainFirst-1, fNumHiGainSamples, sumhi, sathi);
-        FindSignal(pixel.GetLoGainSamples()+fLoGainFirst-1, fNumLoGainSamples, sumlo, satlo);
-
-        if (satlo)
+
+        Int_t  sumlo = 0;
+        Byte_t satlo = kFALSE;
+        if (pixel.HasLoGain())
         {
-            sat++;
-            satpixels += Form(" %d", pixel.GetPixelId());
+            FindSignal(pixel.GetLoGainSamples()+fLoGainFirst-1, fNumLoGainSamples, sumlo, satlo);
+
+            if (satlo)
+            {
+                sat++;
+                satpixels += Form(" %d", pixel.GetPixelId());
+            }
         }
-        
 
         const Int_t pixid = pixel.GetPixelId();
@@ -177 +181 @@
         const Float_t pedrms = ped.GetPedestalRms();
 
-        
-        pix.SetExtractedSignal(sumhi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
+        pix.SetExtractedSignal(sumhi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
                                sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);