Changeset 3010 for trunk

Timestamp:

02/03/04 14:42:26 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (3 diffs)
• manalysis/MExtractSignal.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -8 +8 @@
    * mfileio/MReadTree.cc:
      - fixed handling of -1 entries in AddFile: root 3.10/02 crashed
+
+   * manalysis/MExtractSignal.[h,cc]:
+     - moved code to extract the signal from Process to
+       new member function FindSignal, I left the arrival time 
+       extraction as commented-out code in the code just as a 
+       demonstration to do this very fast.
 
 

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -122 +122 @@
 }
 
+void MExtractSignal::FindSignal(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat/*, Byte_t* &max*/) const
+{
+    Byte_t *end = ptr + size;
+
+    sum = 0;
+    sat = 0;
+    //max = ptr;
+    while (ptr<end)
+    {
+        sum += *ptr;
+
+        //if (*ptr>*max)
+        //    max = ptr;
+
+        if (*ptr++ >= fSaturationLimit)
+            sat++;
+    }
+}
+
 // --------------------------------------------------------------------------
 //
@@ -132 +151 @@
     fSignals->Clear();
 
-    UInt_t satlo=0;
+    UInt_t sat=0;
 
     while (pixel.Next())
     {
-        UShort_t satHi = 0;
-        UShort_t satLo = 0;
-
-        UInt_t sumHi   = 0;
-        UInt_t sumLo   = 0;
-
-        Byte_t maxhi   = 0;
-        Byte_t midhi   = 0;
-
-        Byte_t *ptr  = pixel.GetHiGainSamples() + fHiGainFirst;
-        Byte_t *last = ptr + fNumHiGainSamples;
-
-        while (ptr<last)
-        {
-            sumHi += *ptr;
-
-            if (*ptr > maxhi)
-            {
-                maxhi = *ptr;
-                midhi = ptr-pixel.GetHiGainSamples();
-            }
-
-            if (*ptr >= fSaturationLimit)
-                satHi++;
-
-            ptr++;
-        }
-
-        ptr  = pixel.GetLoGainSamples() + fLoGainFirst;
-        last = ptr + fNumLoGainSamples;
-
-        Byte_t maxlo  = 0;
-        Byte_t midlo  = 0;
-
-        while (ptr<last)
-        {
-            sumLo += *ptr;
-
-            if (*ptr > maxlo)
-            {
-                maxlo = *ptr;
-                midlo = ptr-pixel.GetLoGainSamples();
-            }
-
-            if (*ptr >= fSaturationLimit)
-                satLo++;
-
-            ptr++;
-        }
-
-        if (satLo)
-            satlo++;
+        Int_t sumhi, sumlo;
+        Byte_t sathi, satlo;
+        //Byte_t *maxhi, *maxlo;
+
+        FindSignal(pixel.GetHiGainSamples()+fHiGainFirst, fNumHiGainSamples, sumhi, sathi);//, maxhi);
+        FindSignal(pixel.GetLoGainSamples()+fLoGainFirst, fNumLoGainSamples, sumlo, satlo);//, maxlo);
+
+        if (satlo)
+            sat++;
 
         const Int_t pixid = pixel.GetPixelId();
@@ -197 +173 @@
         const Float_t pedrms = ped.GetPedestalRms();
 
-        pix.SetExtractedSignal(sumHi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
-                               sumLo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
-
-        pix.SetGainSaturation(satHi, satHi, satLo);
-
-      } /* while (pixel.Next()) */
-
-    if (satlo)
-        *fLog << warn << "WARNING - Lo Gain saturated in " << satlo << " pixels." << endl;
-
+        pix.SetExtractedSignal(sumhi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
+                               sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
+
+        pix.SetGainSaturation(sathi, sathi, satlo);
+
+        /*
+         const Byte_t midhi = maxhi-pixel.GetHiGainSamples();
+         const Byte_t midlo = maxlo-pixel.GetLoGainSamples();
+
+         fArrivalTime->SetTime(pixid, sathi?midlo:midhi);
+         */
+
+    } /* while (pixel.Next()) */
+
+    if (sat)
+        *fLog << warn << "WARNING - Lo Gain saturated in " << sat << " pixels." << endl;
 
     fSignals->SetReadyToSave();

trunk/MagicSoft/Mars/manalysis/MExtractSignal.h

@@ -20 +20 @@
 class MPedestalCam;
 class MExtractedSignalCam;
-class MArrivalTime;
 
 class MExtractSignal : public MTask
@@ -35 +34 @@
     MRawRunHeader       *fRunHeader;    // RunHeader information
 
-    MArrivalTime        *fArrivalTime;  // Arrival Time of FADC sample
-  
     Byte_t  fHiGainFirst;
     Byte_t  fLoGainFirst;
@@ -47 +44 @@
 
     Byte_t  fSaturationLimit;
+
+    void   FindSignal(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat/*, Byte_t* &mid*/) const;
 
     Int_t  PreProcess(MParList *pList);