X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=JETAN%2FAliJetReader.cxx;h=88a3a4c50e0a75beee2117620f07aeb1367413ca;hb=a4c1f5dddd5d9eb37e95a711fb10b2ae2d2626c9;hp=db62f0f3c382c8056aea122b9aebadb056b6f7f7;hpb=ee7de0dd4cd0478eb8d46cf642ff78304ecf8f51;p=u%2Fmrichter%2FAliRoot.git

diff --git a/JETAN/AliJetReader.cxx b/JETAN/AliJetReader.cxx
index db62f0f3c38..88a3a4c50e0 100755
--- a/JETAN/AliJetReader.cxx
+++ b/JETAN/AliJetReader.cxx
@@ -29,8 +29,8 @@
 #include "AliJetReaderHeader.h"
 #include "AliESDEvent.h"
 #include "AliHeader.h"
-#include "AliJetFillUnitArrayTracks.h" 
-#include "AliJetFillUnitArrayEMCalDigits.h"
+#include "AliJetESDFillUnitArrayTracks.h" 
+#include "AliJetESDFillUnitArrayEMCalDigits.h"
 #include "AliJetUnitArray.h"
 #include "AliJetHadronCorrectionv1.h"
 
@@ -41,21 +41,25 @@ ClassImp(AliJetReader)
 AliJetReader::AliJetReader():
   // Constructor
   fChain(0), 
-  fMomentumArray(new TClonesArray("TLorentzVector",2000)),
+  fTree(0), 
+  fMomentumArray(new TClonesArray("TLorentzVector",4000)),
   fArrayMC(0),
   fFillUnitArray(new TTask("fillUnitArray","Fill unit array jet finder")),
   fESD(0),
   fReaderHeader(0),
+  fAliHeader(0),
   fSignalFlag(0),
   fCutFlag(0),
   fUnitArray(new TClonesArray("AliJetUnitArray",60000)),
-  fRefArray(new TRefArray()),
-  fUnitArrayNoCuts(new TClonesArray("AliJetUnitArray",60000)),
   fArrayInitialised(0),
-  fFillUAFromTracks(new AliJetFillUnitArrayTracks()), 
-  fFillUAFromEMCalDigits(new AliJetFillUnitArrayEMCalDigits())
-  //  fHadronCorrector(0),
-  //  fHCorrection(0)
+  fFillUAFromTracks(new AliJetESDFillUnitArrayTracks()), 
+  fFillUAFromEMCalDigits(new AliJetESDFillUnitArrayEMCalDigits()),
+  fNumCandidate(0),
+  fNumCandidateCut(0),
+  fHadronCorrector(0),
+  fHCorrection(0),
+  fECorrection(0),
+  fEFlag(kFALSE)
 {
   // Default constructor
   fSignalFlag = TArrayI();
@@ -77,16 +81,13 @@ AliJetReader::~AliJetReader()
       delete fUnitArray;
   }
   
-  if (fUnitArrayNoCuts) {
-    fUnitArrayNoCuts->Delete();
-    delete fUnitArrayNoCuts;
-  }
-
   if (fFillUnitArray) {
-    fFillUnitArray->Delete();
     delete fFillUnitArray;
   }
-  delete fArrayMC;
+  if (fArrayMC) {
+      fArrayMC->Delete();
+      delete fArrayMC;
+  }
   
 }
 
@@ -94,7 +95,6 @@ AliJetReader::~AliJetReader()
 ////////////////////////////////////////////////////////////////////////
 
 void AliJetReader::ClearArray()
-
 {
   if (fMomentumArray)  fMomentumArray->Clear();
   if (fFillUnitArray)  fFillUnitArray->Clear();