Changeset 1715 for trunk/MagicSoft/Mars/manalysis

Timestamp:

01/19/03 14:52:29 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCerPhotCalc.cc (modified) (7 diffs)
• MCerPhotCalc.h (modified) (3 diffs)
• MCerPhotEvt.cc (modified) (5 diffs)
• MCerPhotEvt.h (modified) (1 diff)
• MCerPhotPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Abelardo Moralejo 7/2002  (moralejo@pd.infn.it)
-!
-!   Copyright: MAGIC Software Development, 2002
+!   Author(s): Abelardo Moralejo 7/2002  <mailto:moralejo@pd.infn.it>
+!   Author(s): Thomas Bretz 2002  <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2002-2003
 !
 !
@@ -24 +25 @@
 
 //////////////////////////////////////////////////////////////////////////////
-//                                                                          //
-//   MCerPhotCalc                                                          //
-//                                                                          //
-//   This is a task which calculates the number of photons from the FADC    //
-//   time slices. It weights the each slice according to the numbers in     //
-//   the array fWeight (default: all slices added up with weight 1). 
-//                                                                          //
-//  Input Containers:                                                       //
-//   MRawRunHeader, MRawEvtData, MPedestalCam                               //
-//                                                                          //
-//  Output Containers:                                                      //
-//   MCerPhotEvt                                                            //
-//                                                                          //
+//
+//   MCerPhotCalc
+//
+//   This is a task which calculates the number of photons from the FADC
+//   time slices. It weights the each slice according to the numbers in
+//   the array fWeight (default: all slices added up with weight 1).
+//
+//  Input Containers:
+//   MRawRunHeader, MRawEvtData, MPedestalCam
+//
+//  Output Containers:
+//   MCerPhotEvt
+//
 //////////////////////////////////////////////////////////////////////////////
-
 #include "MCerPhotCalc.h"
 
@@ -103 +103 @@
     fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
     if (!fPedestals)
-    {
-        *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
-        return kFALSE;
-    }
+        return kFALSE;
 
     fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj("MCerPhotEvt");
@@ -115 +112 @@
     fSumQuadWeights = 0.;
     for (Int_t i = 0; i < fWeight.GetSize(); i++)
-      fSumQuadWeights += fWeight[i]*fWeight[i];
+        fSumQuadWeights += fWeight[i]*fWeight[i];
 
     fSumQuadWeights = sqrt(fSumQuadWeights);
@@ -171 +168 @@
     MRawEvtPixelIter pixel(fRawEvt);
 
-    TArrayF BinSignal(fWeight.GetSize());
+    TArrayF binsignal(fWeight.GetSize());
 
     while (pixel.Next())
-      {
-        const UInt_t pixid = pixel.GetPixelId();
+    {
+        const UInt_t pixid = pixel.GetPixelId();
         const MPedestalPix &ped = (*fPedestals)[pixid];
 
@@ -187 +184 @@
         }
 
-        // Mean pedestal:
-        Double_t mean = fEnableFix ? ped.GetMean()-0.5 : ped.GetMean();
-
-        Byte_t *ptr = pixel.GetHiGainSamples();
-
-        Float_t nphot = 0.;
-        Float_t nphoterr = 0.;
-
-        // Calculate pixel signal unless it has all FADC slices empty:
-
-        if (pixel.GetSumHiGainSamples()>0)
-          {
-            for(Int_t i = 0; i<fWeight.GetSize(); i++)
-              {
-                BinSignal[i] =  (Float_t) ptr[i] - mean;
-                nphot       +=  BinSignal[i] * fWeight[i];
-              }
-            nphoterr = ped.GetSigma()* fSumQuadWeights;
-          }
+        //
+        // Mean pedestal:
+        //
+        const Double_t mean = fEnableFix ? ped.GetMean()-0.5 : ped.GetMean();
+
+        //
+        // Calculate pixel signal unless it has all FADC slices empty:
+        //
+        const Byte_t *ptr = pixel.GetHiGainSamples();
+
+        Float_t nphot = 0;
+        Float_t nphoterr = 0;
+
+        if (pixel.GetSumHiGainSamples()>0)
+        {
+            for (Int_t i=0; i<fWeight.GetSize(); i++)
+            {
+                binsignal[i] =  ptr[i] - mean;
+                nphot       +=  binsignal[i] * fWeight[i];
+            }
+            nphoterr = ped.GetSigma() * fSumQuadWeights;
+        }
 
         fCerPhotEvt->AddPixel(pixid, nphot, nphoterr);
 
         // FIXME! Handling of Lo Gains is missing!
-      }
+    }
 
     fCerPhotEvt->SetReadyToSave();
@@ -217 +217 @@
 }
 
+// --------------------------------------------------------------------------
 //
 // Set default values for the number of slices and weights:
 //
-
 void MCerPhotCalc::SetDefaultWeights()
 {
-  const Float_t dummy[15] = {1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.,};
-
-  fWeight.Set(15,dummy);
-  return;
-}
-
-
-
-
+    const Float_t dummy[15] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+    fWeight.Set(15, dummy);
+}

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h

@@ -10 +10 @@
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
+#ifndef ROOT_TArrayF
+#include <TArrayF.h>
+#endif
 
 #ifndef MARS_MTask
@@ -15 +18 @@
 #endif
 
-#include <TArrayF.h>
-
 class MRawEvtData;
 class MPedestalCam;
 class MCerPhotEvt;
 class MRawRunHeader;
-class TArrayF;
 
 class MCerPhotCalc : public MTask
@@ -44 +44 @@
     Bool_t ReInit(MParList *pList);
 
-    void   SetWeights(TArrayF w) {fWeight.Set(w.GetSize(),w.GetArray());}
+    // FIXME: The array size should be checked!
+    void   SetWeights(const TArrayF &w) { fWeight = w; }
 
     ClassDef(MCerPhotCalc, 0)   // Task to calculate cerenkov photons from raw data

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -158 +158 @@
         return -5.;
 
+    const UInt_t n = geom->GetNumPixels();
+
     Float_t minval = (*this)[0].GetNumPhotons();
 
@@ -164 +166 @@
         const MCerPhotPix &pix = (*this)[i];
 
+        const UInt_t id = pix.GetPixId();
+        if (id>=n)
+            continue;
+
         Float_t testval = pix.GetNumPhotons();
 
         if (geom)
-            testval *= geom->GetPixRatio(pix.GetPixId());
+            testval *= geom->GetPixRatio(id);
 
         if (testval < minval)
@@ -187 +193 @@
         return 50.;
 
+    const UInt_t n = geom->GetNumPixels();
+
     Float_t maxval = (*this)[0].GetNumPhotons();
 
@@ -193 +201 @@
         const MCerPhotPix &pix = (*this)[i];
 
+        const UInt_t id = pix.GetPixId();
+        if (id>=n)
+            continue;
+
         Float_t testval = pix.GetNumPhotons();
-
         if (geom)
-            testval *= geom->GetPixRatio(pix.GetPixId());
+            testval *= geom->GetPixRatio(id);
 
         if (testval > maxval)
@@ -322 +333 @@
     return NULL;
 }
+
+/*
+// --------------------------------------------------------------------------
+//
+// Use this function to sum photons in events together.
+//
+Bool_t MCerPhotEvt::AddEvent(const MCerPhotEvt &evt)
+{
+    if (evt.fNumPixels<=0)
+    {
+        *fLog << "Warning - Event to be added has no pixels." << endl;
+        return kFALSE;
+    }
+    if (fNumPixels<=0)
+    {
+        *fLog << "Warning - Event to add pixels to has no pixels." << endl;
+        return kFALSE;
+    }
+
+    for (UInt_t i=0; i<evt.fNumPixels; i++)
+    {
+        const UInt_t id = evt[i].GetPixId();
+
+        MCerPhotPix *pix2 = GetPixById(id);
+        if (!pix2)
+        {
+            *fLog << "Error - Pixel#" << dec << id << " does not exist in this event!" << endl;
+            return kFALSE;
+        }
+
+        pix2->AddNumPhotons(evt[i].GetNumPhotons());
+    }
+    return kTRUE;
+}
+*/

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -30 +30 @@
     }
 
+    //Bool_t  AddEvent(const MCerPhotEvt &evt);
 
     Bool_t  IsPixelExisting(Int_t id) const;

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

@@ -41 +41 @@
     void    Set(Float_t np, Float_t ep) { fPhot = np; fErrPhot = ep; }
 
+    void    AddNumPhotons(Float_t f)    { fPhot += f; }
+
     void    Print(Option_t *opt = NULL) const;