Changeset 1048 for trunk/MagicSoft/Mars/manalysis

Timestamp:

11/07/01 11:50:28 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1ReadAscii.cc (modified) (1 diff)
• MCerPhotCalc.cc (modified) (3 diffs)
• MCerPhotEvt.cc (modified) (3 diffs)
• MCerPhotEvt.h (modified) (2 diffs)
• MPedestalCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

@@ -232 +232 @@
     // too the list with it's id, number of photons and error
     //
+    fNphot->InitSize(127);
+
     for (Int_t i = 0; i<127; i++ )
     {

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -45 +45 @@
 #include "MLogManip.h"
 
-#include "MRawEvtPixelIter.h"
+#include "MRawEvtData.h"       // MRawEvtData::GetNumPixels
 #include "MCerPhotEvt.h"
 #include "MPedestalPix.h"
 #include "MPedestalCam.h"
+#include "MRawEvtPixelIter.h"
 
 ClassImp(MCerPhotCalc);
@@ -65 +66 @@
     AddToBranchList("fHiGainFadcSamples");
     AddToBranchList("fLoGainFadcSamples");
-
 }
 
@@ -108 +108 @@
 Bool_t MCerPhotCalc::Process()
 {
+    fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
+
     MRawEvtPixelIter pixel(fRawEvt);
-
     while (pixel.Next())
     {
-
         const UInt_t pixid = pixel.GetPixelId();
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -47 +47 @@
     fTitle = title ? title : "(Number of Photon)-Event Information";
 
-    fPixels = new TClonesArray ("MCerPhotPix", 577);
-
-    //
-    // FIXME: is this really necessary?
-    //
-    Reset();
+    fPixels = new TClonesArray ("MCerPhotPix", 0);
 }
 
@@ -82 +77 @@
     // TClonesArray -> 'operator new with placement' should be used
 
-    fPixels->ExpandCreate(fNumPixels);
+    //    fPixels->ExpandCreate(fNumPixels);
     new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, err);
 }
@@ -93 +88 @@
 {
     fNumPixels = 0;
-//    fPixels->Delete();
+    fPixels->Delete();
 }
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -22 +22 @@
 
     UInt_t GetNumPixels() const { return fNumPixels; }
+    void   InitSize(UInt_t num) { fPixels->Expand(num); }
+
     void   AddPixel(Int_t id, Float_t nph, Float_t err);
 
@@ -31 +33 @@
     Float_t GetNumPhotonsMax() const;
 
-    MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->At(i)); }
-    MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->At(i)); }
+    MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
+    MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
 
     void Reset();

trunk/MagicSoft/Mars/manalysis/MPedestalCam.h

@@ -23 +23 @@
     ~MPedestalCam();
 
-    void InitSize(const UInt_t i) { fArray->ExpandCreateFast(i); }
+    void InitSize(const UInt_t i) { fArray->ExpandCreate(i); }
 
-    MPedestalPix &operator[](Int_t i)       { return *(MPedestalPix*)fArray->At(i); }
-    MPedestalPix &operator[](Int_t i) const { return *(MPedestalPix*)fArray->At(i); }
+    MPedestalPix &operator[](Int_t i)       { return *(MPedestalPix*)fArray->UncheckedAt(i); }
+    MPedestalPix &operator[](Int_t i) const { return *(MPedestalPix*)fArray->UncheckedAt(i); }
 
     ClassDef(MPedestalCam, 1)   // Storage Container for all pedestal information of the camera