including switch to set on/off iso-track core removal, cleaning and bug fix

[u/mrichter/AliRoot.git] / PWGDQ / dielectron / AliAnalysisTaskReducedTree.cxx

diff --git a/PWGDQ/dielectron/AliAnalysisTaskReducedTree.cxx b/PWGDQ/dielectron/AliAnalysisTaskReducedTree.cxx
index 398a2e43121f045ea8af7417aeef6b491fe0563d..685ee9b061d86a633e6b9f9879c1bc5b012af0e5 100644 (file)
--- a/PWGDQ/dielectron/AliAnalysisTaskReducedTree.cxx
+++ b/PWGDQ/dielectron/AliAnalysisTaskReducedTree.cxx
@@ -35,8 +35,8 @@
 #include <AliESDHeader.h>
 #include <AliAODHeader.h>
 #include <AliAODTrack.h>
-#include <AliAODForwardMult.h>
-#include <AliForwardUtil.h>
+//#include <AliAODForwardMult.h>
+//#include <AliForwardUtil.h>
 #include <AliTriggerAnalysis.h>
 #include <AliESDtrackCuts.h>
 #include <AliVZDC.h>
@@ -214,12 +214,11 @@ void AliAnalysisTaskReducedTree::UserCreateOutputObjects()
 }
 
 //_________________________________________________________________________________
-void AliAnalysisTaskReducedTree::UserExec(Option_t *option)
+void AliAnalysisTaskReducedTree::UserExec(Option_t *)
 {
   //
   // Main loop. Called for every event
-  //  
-  option = option;
+  //
   AliAnalysisManager *man=AliAnalysisManager::GetAnalysisManager();
   Bool_t isESD=man->GetInputEventHandler()->IsA()==AliESDInputHandler::Class();
   Bool_t isAOD=man->GetInputEventHandler()->IsA()==AliAODInputHandler::Class();
@@ -941,8 +940,8 @@ void AliAnalysisTaskReducedTree::FillDielectronPairInfo(AliDielectron* die, Shor
       // !!! hardcoded flag for dielectron id 
       reducedParticle->fCandidateId  = (iDie==0 ? AliReducedPair::kJpsiToEE : AliReducedPair::kPhiToKK);
       reducedParticle->fPairType     = (Char_t)values[AliDielectronVarManager::kPairType];
-      reducedParticle->fLegIds[0]    = (UShort_t)(static_cast<AliVTrack*>(pair->GetFirstDaughter()))->GetID();
-      reducedParticle->fLegIds[1]    = (UShort_t)(static_cast<AliVTrack*>(pair->GetSecondDaughter()))->GetID();
+      reducedParticle->fLegIds[0]    = (UShort_t)(static_cast<AliVTrack*>(pair->GetFirstDaughterP()))->GetID();
+      reducedParticle->fLegIds[1]    = (UShort_t)(static_cast<AliVTrack*>(pair->GetSecondDaughterP()))->GetID();
       reducedParticle->fMass[0]      = values[AliDielectronVarManager::kM];
       reducedParticle->fMass[1]      = -999.;
       reducedParticle->fMass[2]      = -999.;