Updates provided by Magali Estienne

[u/mrichter/AliRoot.git] / JETAN / AliJetReader.cxx

diff --git a/JETAN/AliJetReader.cxx b/JETAN/AliJetReader.cxx
index f31d1fc958645c10bd54771d8f623eb2b884d215..88a3a4c50e0a75beee2117620f07aeb1367413ca 100755 (executable)
--- a/JETAN/AliJetReader.cxx
+++ b/JETAN/AliJetReader.cxx
@@ -22,26 +22,44 @@
 
 // root
 #include <TClonesArray.h>
+#include <TRefArray.h>
+#include "TTask.h"
 //AliRoot
 #include "AliJetReader.h"
 #include "AliJetReaderHeader.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliHeader.h"
+#include "AliJetESDFillUnitArrayTracks.h" 
+#include "AliJetESDFillUnitArrayEMCalDigits.h"
+#include "AliJetUnitArray.h"
+#include "AliJetHadronCorrectionv1.h"
 
 ClassImp(AliJetReader)
 
 ////////////////////////////////////////////////////////////////////////
 
 AliJetReader::AliJetReader():
-  fMomentumArray(new TClonesArray("TLorentzVector",2000)),
+  // Constructor
+  fChain(0), 
+  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 AliJetUnitArray[60000]),     
-  fUnitArrayNoCuts(new AliJetUnitArray[60000]),
-  fArrayInitialised(0)
+  fUnitArray(new TClonesArray("AliJetUnitArray",60000)),
+  fArrayInitialised(0),
+  fFillUAFromTracks(new AliJetESDFillUnitArrayTracks()), 
+  fFillUAFromEMCalDigits(new AliJetESDFillUnitArrayEMCalDigits()),
+  fNumCandidate(0),
+  fNumCandidateCut(0),
+  fHadronCorrector(0),
+  fHCorrection(0),
+  fECorrection(0),
+  fEFlag(kFALSE)
 {
   // Default constructor
   fSignalFlag = TArrayI();
@@ -63,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;
+  }
   
 }
 
@@ -80,7 +95,6 @@ AliJetReader::~AliJetReader()
 ////////////////////////////////////////////////////////////////////////
 
 void AliJetReader::ClearArray()
-
 {
   if (fMomentumArray)  fMomentumArray->Clear();
   if (fFillUnitArray)  fFillUnitArray->Clear();