Changeset 2135 for trunk/MagicSoft/Mars/manalysis

Timestamp:

05/23/03 17:30:31 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCerPhotAnal.cc (modified) (2 diffs)
• MCerPhotCalc.cc (modified) (2 diffs)
• MCerPhotEvt.cc (modified) (1 diff)
• MCerPhotEvt.h (modified) (2 diffs)
• MMcPedestalNSBAdd.cc (modified) (1 diff)
• MPedestalCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc

@@ -118 +118 @@
 Bool_t MCerPhotAnal::Process()
 {
-    fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
+    //fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
 
     MRawEvtPixelIter pixel(fRawEvt);
@@ -201 +201 @@
     }
 
+    fCerPhotEvt->FixSize();
     fCerPhotEvt->SetReadyToSave();
 

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -164 +164 @@
 Bool_t MCerPhotCalc::Process()
 {
-    fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
+    //fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
 
     MRawEvtPixelIter pixel(fRawEvt);
@@ -212 +212 @@
     }
 
+    fCerPhotEvt->FixSize();
     fCerPhotEvt->SetReadyToSave();
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -75 +75 @@
 {
     fNumPixels = 0;
-    fPixels->Delete();
+    //fPixels->Delete();
+}
+
+void MCerPhotEvt::FixSize()
+{
+    if (fPixels->GetEntriesFast() == (Int_t)fNumPixels)
+        return;
+
+    fPixels->ExpandCreateFast(fNumPixels);
 }
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -23 +23 @@
 
     UInt_t GetNumPixels() const { return fNumPixels; }
-    void   InitSize(UInt_t num) { fPixels->Expand(num); }
+    //void   InitSize(UInt_t num) { fPixels->Expand(num); }
 
     void   AddPixel(Int_t id, Float_t nph, Float_t er)
@@ -29 +29 @@
         new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, er);
     }
+
+    void FixSize();
 
     //Bool_t  AddEvent(const MCerPhotEvt &evt);

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

@@ -209 +209 @@
     fPedCam->InitSize(num);
 
-    const Float_t size0 = (*fGeom)[0].GetR() * (*fGeom)[0].GetR();
-
     for (int i=0; i<num; i++)
     {
-        MPedestalPix   &pix     = (*fPedCam)[i];
-        const MGeomPix &pixgeom = (*fGeom)[i];
+        MPedestalPix &pix    = (*fPedCam)[i];
 
         const Float_t pedrms = pix.GetSigma();
-        const Float_t size   = pixgeom.GetR()*pixgeom.GetR()/size0;
-
+        const Float_t ratio  = fGeom->GetPixRatio(i);
         const Float_t ampl   = fFadc->GetAmplitud();
 
-        pix.SetSigma(sqrt(pedrms*pedrms + dnsbpix*ampl*ampl*size));
+        pix.SetSigma(sqrt(pedrms*pedrms + dnsbpix*ampl*ampl*ratio));
     }
 

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -82 +82 @@
 Int_t MPedestalCam::GetSize() const
 {
-    return fArray->GetEntries();
+    return fArray->GetEntriesFast();
 }