reduce binning of fhAmpId to comply with train restrictions, increase other previousl...

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

diff --git a/JETAN/AliJetESDReader.cxx b/JETAN/AliJetESDReader.cxx
index 6db1134a34143de090efc4bf7b1590f72a040349..d60df728f94b6ac764d36a8e1e80a64ce53a5c81 100755 (executable)
--- a/JETAN/AliJetESDReader.cxx
+++ b/JETAN/AliJetESDReader.cxx
@@ -47,6 +47,7 @@
 #include "AliJetDummyGeo.h"
 #include "AliJetESDFillUnitArrayTracks.h"
 #include "AliJetESDFillUnitArrayEMCalDigits.h"
+#include "AliJetHadronCorrectionv1.h"
 #include "AliJetUnitArray.h"
 #include "AliAnalysisTask.h"
 
@@ -55,9 +56,6 @@ ClassImp(AliJetESDReader)
 AliJetESDReader::AliJetESDReader():
   AliJetReader(),  
   fGeom(0),
-  fChain(0x0),
-  fTree(0x0),
-  fESD(0x0),
   fHadCorr(0x0),
   fTpcGrid(0x0),
   fEmcalGrid(0x0),
@@ -66,9 +64,7 @@ AliJetESDReader::AliJetESDReader():
   fGrid2(0),
   fGrid3(0),
   fGrid4(0),
-  fPtCut(0),
   fApplyElectronCorrection(kFALSE),
-  fEFlag(kFALSE),
   fApplyMIPCorrection(kTRUE),
   fApplyFractionHadronicCorrection(kFALSE),
   fFractionHadronicCorrection(0.3),
@@ -81,7 +77,6 @@ AliJetESDReader::AliJetESDReader():
   fDZ(0),
   fNeta(0),
   fNphi(0),
-  fArrayInitialised(0),
   fRefArray(0x0),
   fProcId(kFALSE)
 {
@@ -216,7 +211,7 @@ void AliJetESDReader::SetFractionHadronicCorrection(Double_t val)
 
 
 //____________________________________________________________________________
-void AliJetESDReader::SetInputEvent(TObject* esd, TObject* /*aod*/, TObject* /*mc*/) {
+void AliJetESDReader::SetInputEvent(const TObject* esd, const TObject* /*aod*/, const TObject* /*mc*/) {
     // Connect the tree
      fESD   = (AliESDEvent*) esd;
 }
@@ -334,7 +329,7 @@ void AliJetESDReader::CreateTasks(TChain* tree)
   fFillUAFromEMCalDigits->SetEMCalGrid(fEmcalGrid);
   fFillUAFromEMCalDigits->SetApplyFractionHadronicCorrection(fApplyFractionHadronicCorrection);
   fFillUAFromEMCalDigits->SetFractionHadronicCorrection(fFractionHadronicCorrection);
-  fFillUAFromEMCalDigits->SetApplyElectronCorrection(fApplyElectronCorrection);
+   fFillUAFromEMCalDigits->SetApplyElectronCorrection(fApplyElectronCorrection);
   // Add the task to global task
   fFillUnitArray->Add(fFillUAFromTracks);
   fFillUnitArray->Add(fFillUAFromEMCalDigits);
@@ -435,7 +430,7 @@ void AliJetESDReader::InitParameters()
 {
   // Initialise parameters
   fOpt = fReaderHeader->GetDetector();
-  fHadCorr        = 0;          // For hadron correction
+  //  fHadCorr        = 0;          // For hadron correction
   if(fEFlag==kFALSE){
     if(fOpt==0 || fOpt==1)  
       fECorrection    = 0;        // For electron correction