Changeset 8347 for trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

Timestamp:

03/01/07 23:06:34 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.29 2007-03-01 21:16:55 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.30 2007-03-01 23:04:55 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -103 +103 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MHCalibrationPulseTimeCam.h"
-#include "MHCalibrationCam.h"
-
+
+#include <TEnv.h>
+#include <TGraph.h>
+#include <TLegend.h>
+#include <TCanvas.h>
 #include <TOrdCollection.h>
-#include <TPad.h>
-#include <TVirtualPad.h>
-#include <TCanvas.h>
-#include <TStyle.h>
-#include <TF1.h>
-#include <TLatex.h>
-#include <TLegend.h>
-#include <TGraph.h>
-#include <TEnv.h>
 
 #include "MLog.h"
@@ -121 +115 @@
 #include "MParList.h"
 
+#include "MArrayD.h"
+#include "MRawRunHeader.h"
+#include "MExtractedSignalCam.h"
+#include "MPedestalSubtractedEvt.h"
+
+#include "MCalibrationPix.h"
 #include "MHCalibrationPix.h"
-
 #include "MCalibrationIntensityCam.h"
-#include "MCalibrationChargeCam.h"
-#include "MCalibrationChargePix.h"
+#include "MBadPixelsIntensityCam.h"
 
 #include "MGeomCam.h"
 #include "MGeomPix.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
-#include "MBadPixelsPix.h"
-
-#include "MRawEvtData.h"
-#include "MRawRunHeader.h"
-#include "MRawEvtPixelIter.h"
-
-#include "MExtractedSignalCam.h"
-#include "MExtractedSignalPix.h"
-
-#include "MArrayI.h"
-#include "MArrayD.h"
 
 ClassImp(MHCalibrationPulseTimeCam);
@@ -149 +135 @@
 
 const Byte_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 254;
-const Byte_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  = 100;
+const Byte_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  =  85;
 const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired = 2;
 const Int_t   MHCalibrationPulseTimeCam::fgHiGainNbins =  20;
@@ -160 +146 @@
 const TString MHCalibrationPulseTimeCam::gsHistYTitle  = "Nr. events";
 const TString MHCalibrationPulseTimeCam::fgReferenceFile = "mjobs/signalref.rc";
+
 // --------------------------------------------------------------------------
 //
@@ -298 +285 @@
 
   InitHiGainArrays(npixels,nareas,nsectors);
-
-  fSumhiarea  .Set(nareas); 
-  fSumhisector.Set(nsectors); 
 
   return kTRUE;
@@ -378 +362 @@
 Bool_t MHCalibrationPulseTimeCam::FillHists(const MParContainer *par, const Stat_t w)
 {
-
-  MRawEvtData *data = (MRawEvtData*)par;
-  if (!data)
-    {
-      *fLog << err << "No argument in MHCalibrationPulseTimeCam::Fill... abort." << endl;
-      return kFALSE;
-    }
-  
-  const UInt_t nareas   = fGeom->GetNumAreas();
-  const UInt_t nsectors = fGeom->GetNumSectors();
-
-  fSumhiarea  .Reset(); 
-  fSumhisector.Reset(); 
-  fAverageAreaNum.Reset();
-  fAverageSectorNum.Reset();
-
-  MRawEvtPixelIter pixel(data);
-  while (pixel.Next())
-    {
-      
-      const Int_t i = pixel.GetPixelId();
-
-      if (fBadPixels)
+    MPedestalSubtractedEvt *evt = (MPedestalSubtractedEvt*)par;
+    if (!evt)
+    {
+        *fLog << err << "No argument in MHCalibrationPulseTimeCam::Fill... abort." << endl;
+        return kFALSE;
+    }
+
+    const UInt_t nareas   = fGeom->GetNumAreas();
+    const UInt_t nsectors = fGeom->GetNumSectors();
+
+    MArrayD sumarea(nareas);
+    MArrayD sumsector(nsectors);
+
+    fAverageAreaNum.Reset();
+    fAverageSectorNum.Reset();
+
+    const Int_t npix = evt->GetNumPixels();
+    for (int idx=0; idx<npix; idx++)
+    {
+        if (fBadPixels)
+            if ((*fBadPixels)[idx].IsUnsuitable())
+                continue;
+
+        Float_t *beg = evt->GetSamples(idx);
+        Float_t *end = beg + evt->GetNumSamples();;
+        Float_t *max = beg;
+
+        for (Float_t *ptr=beg+1; ptr<end; ptr++)
+            if (*ptr>*max)
+                max = ptr;
+
+        if (*max<fLowerSignalLimit || *max>fSaturationLimit)
+            continue;
+
+        const Int_t maxpos = max-beg-1;
+
+        (*this)[idx].FillHist(maxpos);
+
+        const Int_t aidx   = (*fGeom)[idx].GetAidx();
+        const Int_t sector = (*fGeom)[idx].GetSector();
+
+        sumarea[aidx]     += maxpos;
+        sumsector[sector] += maxpos;
+
+        fAverageAreaNum[aidx]++;
+        fAverageSectorNum[sector]++;
+    }
+
+    for (UInt_t j=0; j<nareas; j++)
+    {
+        const Int_t npix = fAverageAreaNum[j];
+
+        if (npix > fNumPixelsRequired)
         {
-          MBadPixelsPix &bad = (*fBadPixels)[i];
-          if (bad.IsUnsuitable())
-            continue;
+            if (IsOscillations())
+                GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]/npix);
+            else
+                GetAverageHiGainArea(j).FillHist(sumarea[j]/npix);
+
         }
-
-      Byte_t *start = pixel.GetHiGainSamples();
-      Byte_t *end   = start + pixel.GetNumHiGainSamples();
-      Byte_t *p     = start;
-      Byte_t *max   = start;
-      Int_t  maxpos = 0;
-
-      while (p < end)
-        {
-          if (*p > *max)
-            {
-              max = p;
-              maxpos = p-start-1;
-            }
-          p++;
-        }
-
-      if (*max > fSaturationLimit)
-        continue;
-
-      start   = pixel.GetLoGainSamples();
-      end     = start + pixel.GetNumLoGainSamples();
-      p       = start;
-
-      while (p < end)
-        {
-          if (*p > *max)
-            {
-              max = p;
-              maxpos = p-start-1 + pixel.GetNumHiGainSamples();
-            }
-          p++;
-        }
-
-      if (*max < fLowerSignalLimit || *max > fSaturationLimit)
-        continue;
-
-      (*this)[i].FillHist(maxpos);
-        
-      const Int_t aidx   = (*fGeom)[i].GetAidx();
-      const Int_t sector = (*fGeom)[i].GetSector();
-
-      fSumhiarea[aidx]      += maxpos;
-      fSumhisector[sector]  += maxpos;
-
-      fAverageAreaNum[aidx]++;
-      fAverageSectorNum[sector]++;
-    }
-  
-  for (UInt_t j=0; j<nareas; j++)
-    {
-
-      const Int_t npix = fAverageAreaNum[j];
-
-      if (npix > fNumPixelsRequired)
-        {
-           if (IsOscillations())
-                GetAverageHiGainArea(j).FillHistAndArray(fSumhiarea[j]/npix);
-           else
-                GetAverageHiGainArea(j).FillHist(fSumhiarea[j]/npix);
-
-        }
-    }
-
-  for (UInt_t j=0; j<nsectors; j++)
-    {
-
-      const Int_t npix = fAverageSectorNum[j];
-
-      if (npix > 0)
-        {
-           if (IsOscillations())
-                GetAverageHiGainSector(j).FillHistAndArray(fSumhisector [j]/npix);
-           else
-                GetAverageHiGainSector(j).FillHist(fSumhisector [j]/npix);
-        }
-    }
-
-  return kTRUE;
+    }
+
+    for (UInt_t j=0; j<nsectors; j++)
+    {
+        const Int_t npix = fAverageSectorNum[j];
+
+        if (npix > 0)
+        {
+            if (IsOscillations())
+                GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]/npix);
+            else
+                GetAverageHiGainSector(j).FillHist(sumsector[j]/npix);
+        }
+    }
+
+    return kTRUE;
 }