Changeset 8364 for trunk/MagicSoft/Mars/msignal/MSignalCalc.cc

Timestamp:

03/04/07 14:01:14 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MSignalCalc.cc (modified) (15 diffs)

trunk/MagicSoft/Mars/msignal/MSignalCalc.cc

@@ -46 +46 @@
 
 #include "MRawRunHeader.h"
-#include "MRawEvtData.h"       // MRawEvtData::GetNumPixels
 #include "MSignalCam.h"
 #include "MPedestalPix.h"
 #include "MPedestalCam.h"
 #include "MRawEvtPixelIter.h"
+#include "MPedestalSubtractedEvt.h"
 
 ClassImp(MSignalCalc);
@@ -66 +66 @@
     fName  = name  ? name  : "MSignalCalc";
     fTitle = title ? title : "Task to calculate Cerenkov photons from raw data";
-
-    AddToBranchList("MRawEvtData.fHiGainPixId");
-    AddToBranchList("MRawEvtData.fLoGainPixId");
-    AddToBranchList("MRawEvtData.fHiGainFadcSamples");
-    AddToBranchList("MRawEvtData.fLoGainFadcSamples");
 }
 
@@ -95 +90 @@
     }
 
-    fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
+    fRawEvt = (MPedestalSubtractedEvt*)pList->FindObject("MPedestalSubtractedEvt");
     if (!fRawEvt)
     {
-        *fLog << dbginf << "MRawEvtData not found... aborting." << endl;
+        *fLog << dbginf << "MPedestalSubtractedEvt not found... aborting." << endl;
         return kFALSE;
     }
@@ -130 +125 @@
 // pixel in the MSignalCam container.
 //
+#include <TSystem.h>
 Int_t MSignalCalc::Process()
 {
-    MRawEvtPixelIter pixel(fRawEvt);
-
-    while (pixel.Next())
+    const Int_t npix = fRawEvt->GetNumPixels();
+    const Int_t nhi  = fRunHeader->GetNumSamplesHiGain();
+    const Int_t nlo  = fRunHeader->GetNumSamplesLoGain();
+
+    for (int i=0; i<npix; i++)
     {
-        Byte_t *ptr   = pixel.GetHiGainSamples();
-        Byte_t *max   = ptr+pixel.GetIdxMaxHiGainSample();
-        Byte_t *end   = ptr+fRunHeader->GetNumSamplesHiGain();
+        Byte_t *raw = fRawEvt->GetSamplesRaw(i);
+
+        Byte_t *ptr   = raw;
+        Byte_t *max   = ptr+fRawEvt->GetMax(i, 0, nhi);
+        Byte_t *end   = ptr+nhi;
         Byte_t *first = max-fBefore;
         Byte_t *last  = max+fAfter;
@@ -144 +144 @@
         ULong_t sumb  = 0;   // sum background
         ULong_t sqb   = 0;   // sum sqares background
-        ULong_t sumsb = 0;   // sum signal+background
+        //ULong_t sumsb = 0;   // sum signal+background
         ULong_t sqsb  = 0;   // sum sqares signal+background
 
@@ -168 +168 @@
             else
             {
-                sumsb += *ptr;
+                //sumsb += *ptr;
                 sqsb  += *ptr* *ptr;
                 nsb++;
@@ -175 +175 @@
         }
 
-        if (sat==0 && ishi)
+        if (nlo>0 && sat==0 && ishi)
         {
             // Area: x9
-            ptr = pixel.GetLoGainSamples();
-            end = ptr+fRunHeader->GetNumSamplesLoGain();
+            ptr = raw+nhi;
+            end = ptr+nlo;
 
             sumb = 0;   // sum background
@@ -187 +187 @@
             while (ptr<end)
             {
-                // Background already calced from hi-gains!
+                // Background already caced from hi-gains!
                 sumb += *ptr;
                 sqb  += *ptr* *ptr;
@@ -195 +195 @@
         }
 
-        if (sat>1 && !ishi)
+        if (nlo>0 && sat>1 && !ishi)
         {
             // Area: x9
-            ptr = pixel.GetLoGainSamples();
-            max = ptr+pixel.GetIdxMaxLoGainSample();
+            ptr = raw+nhi;
+            max = ptr+fRawEvt->GetMax(i, nhi, nhi+nlo);
 
             if (*max>250)
@@ -207 +207 @@
             }
 
-            end   = ptr+fRunHeader->GetNumSamplesLoGain();
+            end   = ptr+nlo;
             first = max-fBefore;
             last  = max+fAfter;
 
-            sumsb = 0;   // sum signal+background
-            sqsb  = 0;   // sum sqares signal+background
-            //sumb  = 0;   // sum background
+            //sumsb = 0;   // sum signal+background
+            //sqsb  = 0;   // sum sqares signal+background
+            sumb  = 0;   // sum background
             //sqb   = 0;   // sum sqares background
 
@@ -230 +230 @@
                 else
                 {
-                    sumsb += *ptr;
+                    //sumsb += *ptr;
                     sqsb  += *ptr* *ptr;
                     nsb++;
@@ -238 +238 @@
         }
 
-        Float_t b  = (float)sumb/nb;       // background
-        Float_t sb = (float)sumsb/nsb;     // signal+background
-
-        Float_t msb  = (float)sqb/nb;      // mean square background
+        Float_t b  = nb==0 ? 0 : (float)sumb/nb;       // background
+        //Float_t sb = (float)sumsb/nsb;     // signal+background
+
+        Float_t msb  = nb==0 ? 0 : (float)sqb/nb;      // mean square background
         //Float_t mssb = (float)sqsb/nsb;    // mean square signal+background
 
@@ -247 +247 @@
         //Float_t sigsb = sqrt(mssb-sb*sb);  // sigma signal+background
 
-        Float_t s   = sb-b;                // signal
+        //Float_t s   = sb-b;                // signal
         //Float_t sqs = sqsb-nsb*b;          // sum squares signal
 
@@ -253 +253 @@
         //Float_t sigs = sqrt(mss-s*s);      // sigma signal
 
-        if (sat>1)
-            s *= 11.3;
-
-        Int_t idx = pixel.GetPixelId();
+        //if (sat>1)
+        //    s *= 11.3;
+
         //fCerPhotEvt->AddPixel(idx, s, sigs);
 
@@ -262 +261 @@
         // MMcPedestalCopy and MMcPedestalNSBAdd
         if (fPedestals)
-            (*fPedestals)[idx].Set(b, sigb);
+            (*fPedestals)[i].Set(b, sigb);
     }