Changeset 8490 for trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

Timestamp:

05/11/07 11:25:46 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.37 2007-03-04 12:00:30 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.38 2007-05-11 10:25:45 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -26 +26 @@
 !   Author(s): Nepomuk Otte 10/2004 <mailto:otte@mppmu.mpg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2006
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -145 +145 @@
 #include "MRawEvtPixelIter.h"
 
-#include "MPedestalPix.h"
 #include "MPedestalCam.h"
-
-#include "MGeomPix.h"
-#include "MGeomCam.h"
-
-#include "MExtractPedestal.h"
-#include "MPedestalSubtractedEvt.h"
 
 ClassImp(MPedCalcFromLoGain);
@@ -177 +170 @@
     SetPedestalUpdate(kTRUE);
     SetNumDump();
-}
-
-// --------------------------------------------------------------------------
-//
-// Call MExtractPedestl::ResetArrays aand reset fNumAventsUsed and
-// fTotalCounter
-//
-void MPedCalcFromLoGain::ResetArrays()
-{
-    MExtractPedestal::ResetArrays();
-
-    fNumEventsUsed.Reset();
-    fTotalCounter.Reset();
 }
 
@@ -203 +183 @@
 Bool_t MPedCalcFromLoGain::ReInit(MParList *pList)
 {
-    // If the size is not yet set, set the size
-    if (fSumx.GetSize()==0)
-    {
-        const Int_t npixels = fPedestalsOut->GetSize();
-        fNumEventsUsed.Set(npixels);
-        fTotalCounter.Set(npixels);
-    }
-
     if (!MExtractPedestal::ReInit(pList))
         return kFALSE;
@@ -232 +204 @@
     const Int_t nlo = fRunHeader->GetNumSamplesLoGain();
 
+    const Int_t offset = nlo>0?nhi:0;
+
     // Real Process
     MRawEvtPixelIter pixel(fRawEvt);
     while (pixel.Next())
     {
+        if (!CalcPixel(pixel, offset))
+            continue;
+
         const UInt_t idx = pixel.GetPixelId();
-
-        if (!CheckVariation(idx))
-            continue;
-
-        //extract pedestal
-        UInt_t ab[2];
-        const Float_t sum = fExtractor ?
-            CalcExtractor(pixel, nlo>0?nhi:0) :
-            CalcSums(pixel, nlo>0?nhi:0, ab[0], ab[1]);
-
-        const UInt_t aidx   = (*fGeom)[idx].GetAidx();
-        const UInt_t sector = (*fGeom)[idx].GetSector();
-
-        const Float_t sqrsum = sum*sum;
-
-        fSumx[idx]           += sum;
-        fSumx2[idx]          += sqrsum;
-        fAreaSumx[aidx]      += sum;
-        fAreaSumx2[aidx]     += sqrsum;
-        fSectorSumx[sector]  += sum;
-        fSectorSumx2[sector] += sqrsum;
-
-        if (fIntermediateStorage)
-            (*fPedestalsInter)[idx].Set(sum, 0, 0, fNumEventsUsed[idx]);
-
-        fNumEventsUsed[idx]   ++;
-        fAreaFilled   [aidx]  ++;
-        fSectorFilled [sector]++;
-
-        if (!fExtractor && pixel.IsABFlagValid())
-        {
-            fSumAB0[idx]        += ab[0];
-            fSumAB1[idx]        += ab[1];
-            fAreaSumAB0[aidx]   += ab[0];
-            fAreaSumAB1[aidx]   += ab[1];
-            fSectorSumAB0[aidx] += ab[0];
-            fSectorSumAB1[aidx] += ab[1];
-        }
-
         if (!fPedestalUpdate || (UInt_t)fNumEventsUsed[idx]<fNumEventsDump)
             continue;
 
-        CalcPixResults(fNumEventsDump, idx);
-        fTotalCounter[idx]++;
+        CalcPixResults(idx);
 
         fNumEventsUsed[idx]=0;
@@ -289 +226 @@
     }
 
-    if (!(GetNumExecutions() % fNumAreasDump))
+    if (fNumAreasDump>0 && !(GetNumExecutions() % fNumAreasDump))
+    {
         CalcAreaResult();
-
-    if (!(GetNumExecutions() % fNumSectorsDump))
+        fAreaFilled.Reset();
+    }
+
+    if (fNumSectorsDump>0 && !(GetNumExecutions() % fNumSectorsDump))
+    {
         CalcSectorResult();
+        fSectorFilled.Reset();
+    }
 
     if (fPedestalUpdate)
@@ -299 +242 @@
 
   return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Loop over the sector indices to get the averaged pedestal per sector
-//
-void MPedCalcFromLoGain::CalcSectorResult()
-{
-    for (UInt_t sector=0; sector<fSectorFilled.GetSize(); sector++)
-        if (fSectorValid[sector]>0)
-            CalcSectorResults(fSectorFilled[sector], fSectorValid[sector], sector);
-}
-
-// --------------------------------------------------------------------------
-//
-// Loop over the (two) area indices to get the averaged pedestal per aidx
-//
-void MPedCalcFromLoGain::CalcAreaResult()
-{
-    for (UInt_t aidx=0; aidx<fAreaFilled.GetSize(); aidx++)
-        if (fAreaValid[aidx]>0)
-            CalcAreaResults(fAreaFilled[aidx], fAreaValid[aidx], aidx);
-
 }
 
@@ -336 +256 @@
     *fLog << flush << inf << "Calculating Pedestals..." << flush;
 
-    const Int_t npix = fGeom->GetNumPixels();
-    for (Int_t idx=0; idx<npix; idx++)
-    {
-        const ULong_t n = fNumEventsUsed[idx];
-        if (n>1)
-        {
-            CalcPixResults(n, idx);
-            fTotalCounter[idx]++;
-        }
-    }
-
+    CalcPixResult();
     CalcAreaResult();
     CalcSectorResult();