- update list of libraries with those for the EMCAL jet framework

[u/mrichter/AliRoot.git] / PWGJE / AliPWG4HighPtSpectra.cxx

diff --git a/PWGJE/AliPWG4HighPtSpectra.cxx b/PWGJE/AliPWG4HighPtSpectra.cxx
index 8e29f6b4f43dcf6d87a8e36204af58c00504af90..ec6a5c8fd563b779395aebaa1473ab1c1af9eb06 100644 (file)
--- a/PWGJE/AliPWG4HighPtSpectra.cxx
+++ b/PWGJE/AliPWG4HighPtSpectra.cxx
@@ -422,7 +422,9 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
       AliAODTrack *aodtrack = fAOD->GetTrack(iTrack);
       if(!aodtrack)
         continue;
-      if( !aodtrack->TestFilterBit(fFilterMask) )
+      if((!aodtrack->TestFilterBit(fFilterMask)) || 
+         ((!fCFManagerPos->CheckParticleCuts(kStepReconstructed,aodtrack)) && (aodtrack->Charge()>0.)) ||
+         ((!fCFManagerNeg->CheckParticleCuts(kStepReconstructed,aodtrack)) && (aodtrack->Charge()<0))    )
         continue;
       else {
         track = static_cast<AliVTrack*>(aodtrack);
@@ -433,12 +435,8 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
       containerInputRec[2] = track->Eta();
       containerInputRec[3] = track->GetTPCNcls();
 
-      if(track->Charge()>0.) {
-        fCFManagerPos->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
-      }
-      if(track->Charge()<0.) {
-        fCFManagerNeg->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
-      }
+      if(track->Charge()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
+      if(track->Charge()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
 
       if(fArrayMCAOD) {
         Int_t label = TMath::Abs(track->GetLabel());
@@ -462,24 +460,16 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
 
        //Container with primaries
        if(particle->IsPhysicalPrimary()) {
-         if(particle->Charge()>0.) {
-           fCFManagerPos->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
-          }
-         if(particle->Charge()<0.) {
-           fCFManagerNeg->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
-          }
+         if(particle->Charge()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
+         if(particle->Charge()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
          //Fill pT resolution plots for primaries
          //fPtRelUncertainty1PtPrim->Fill(containerInputRec[0],containerInputRec[0]*TMath::Sqrt(track->GetSigma1Pt2())); //This has not been implemented in AOD analysis, since they are also produced by the AddTaskPWG4HighPtTrackQA.C macro
        }
 
        //Container with secondaries
        if (!particle->IsPhysicalPrimary() ) {
-         if(particle->Charge()>0.) {
-           fCFManagerPos->GetParticleContainer()->Fill(containerInputRecMC,kStepSecondaries);
-         }
-         if(particle->Charge()<0.) {
-           fCFManagerNeg->GetParticleContainer()->Fill(containerInputRecMC,kStepSecondaries);
-         }
+         if(particle->Charge()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputRecMC,kStepSecondaries);
+         if(particle->Charge()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputRecMC,kStepSecondaries);
          //Fill pT resolution plots for primaries
          //fPtRelUncertainty1PtSec->Fill(containerInputRec[0],containerInputRec[0]*TMath::Sqrt(track->GetSigma1Pt2())); //This has not been implemented in AOD analysis, since they are also produced by the AddTaskPWG4HighPtTrackQA.C macro
        }
@@ -489,6 +479,7 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
     //Fill MC containers if particles are findable
     if(fArrayMCAOD) {
       int noPart = fArrayMCAOD->GetEntriesFast();
+
       for(int iPart = 1; iPart<noPart; iPart++) {
        AliAODMCParticle *mcPart = (AliAODMCParticle*) fArrayMCAOD->At(iPart);
         if(!mcPart) continue;
@@ -513,12 +504,8 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
          containerInputMC[3] = 159.;
          
          if(mcPart->IsPhysicalPrimary()) {
-           if(mcPart->Charge()>0. && fCFManagerPos->CheckParticleCuts(kStepMCAcceptance,mcPart)) {
-              fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepMCAcceptance);
-            }
-           if(mcPart->Charge()<0. && fCFManagerNeg->CheckParticleCuts(kStepMCAcceptance,mcPart)) {
-              fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepMCAcceptance);
-            }
+           if(mcPart->Charge()>0. && fCFManagerPos->CheckParticleCuts(kStepMCAcceptance,mcPart)) fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepMCAcceptance);
+           if(mcPart->Charge()<0. && fCFManagerNeg->CheckParticleCuts(kStepMCAcceptance,mcPart)) fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepMCAcceptance);
          }
         }
       }
@@ -666,24 +653,16 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
 
        //Container with primaries
        if(fStack->IsPhysicalPrimary(label)) {
-         if(particle->GetPDG()->Charge()>0.) {
-           fCFManagerPos->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
-         }
-         if(particle->GetPDG()->Charge()<0.) {
-           fCFManagerNeg->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
-         }
+         if(particle->GetPDG()->Charge()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
+         if(particle->GetPDG()->Charge()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputRecMC,kStepReconstructedMC);
          //Fill pT resolution plots for primaries
          fPtRelUncertainty1PtPrim->Fill(containerInputRec[0],containerInputRec[0]*TMath::Sqrt(track->GetSigma1Pt2()));
        }
 
        //Container with secondaries
        if (!fStack->IsPhysicalPrimary(label) ) {
-         if(particle->GetPDG()->Charge()>0.) {
-           fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepSecondaries);
-         }
-         if(particle->GetPDG()->Charge()<0.) {
-           fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepSecondaries);
-         }
+         if(particle->GetPDG()->Charge()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepSecondaries);
+         if(particle->GetPDG()->Charge()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepSecondaries);
          //Fill pT resolution plots for primaries
          fPtRelUncertainty1PtSec->Fill(containerInputRec[0],containerInputRec[0]*TMath::Sqrt(track->GetSigma1Pt2()));
        }