Netparticle code update (Jochen Thaeder <jochen@thaeder.de>)

[u/mrichter/AliRoot.git] / PWGCF / EBYE / NetParticle / AliAnalysisNetParticleHelper.cxx

diff --git a/PWGCF/EBYE/NetParticle/AliAnalysisNetParticleHelper.cxx b/PWGCF/EBYE/NetParticle/AliAnalysisNetParticleHelper.cxx
index f7530c71934dc9635dbcfb87d551919592dd7fc8..f2b169baeda587c581ccc249069b327000f4f534 100644 (file)
--- a/PWGCF/EBYE/NetParticle/AliAnalysisNetParticleHelper.cxx
+++ b/PWGCF/EBYE/NetParticle/AliAnalysisNetParticleHelper.cxx
@@ -5,7 +5,6 @@
 #include "TSystem.h" 
 #include "TFile.h" 
 #include "TPRegexp.h"
-#include "TDatabasePDG.h"
 
 #include "AliStack.h"
 #include "AliMCEvent.h"
@@ -150,8 +149,8 @@ AliAnalysisNetParticleHelper::~AliAnalysisNetParticleHelper() {
 //________________________________________________________________________
 void AliAnalysisNetParticleHelper::SetParticleSpecies(AliPID::EParticleType pid) {
   // -- Set particle species (ID, Name, Title, Title LATEX)
-  
-  if ( Int_t(pid) < 0 || Int_t(pid) >= AliPID::kSPECIES) {
+
+  if ( Int_t(pid) < 0 || Int_t(pid) >= AliPID::kSPECIES) {  
     AliWarning("Particle ID not in AliPID::kSPECIES --> Set to protons");
     pid = AliPID::kProton;
   }  
@@ -288,24 +287,20 @@ Int_t AliAnalysisNetParticleHelper::SetupEvent(AliESDInputHandler *esdHandler, A
   if(esdHandler){
     fInputEventHandler = static_cast<AliInputEventHandler*>(esdHandler);
     fESD               = dynamic_cast<AliESDEvent*>(fInputEventHandler->GetEvent());
-    
     if (!fESD) {
       AliError("ESD event handler not available");
       return -1;
     }
-
   }
 
   // -- Get AOD objects
   else if(aodHandler){
     fInputEventHandler = static_cast<AliInputEventHandler*>(aodHandler);
     fAOD               = dynamic_cast<AliAODEvent*>(fInputEventHandler->GetEvent());
-
     if (!fAOD) {
       AliError("AOD event handler not available");
       return -1;
     }
-
   }
 
   // -- Get Common objects
@@ -331,7 +326,7 @@ Int_t AliAnalysisNetParticleHelper::SetupEvent(AliESDInputHandler *esdHandler, A
     AliError("Centrality not available");
     return -1;
   }
-  
+
   Int_t centBin = centrality->GetCentralityClass10("V0M");
   if (centBin == 0)
     fCentralityBin = centrality->GetCentralityClass5("V0M");
@@ -491,14 +486,10 @@ Bool_t AliAnalysisNetParticleHelper::IsParticleAcceptedBasicCharged(AliAODMCPart
   if (!particle) 
     return kFALSE;
 
-  // -- check if PDF code exists
-  if (!(TDatabasePDG::Instance()->GetParticle(particle->PdgCode()))) 
-    return kFALSE;
-    
   // -- check if charged
-  if ((TDatabasePDG::Instance()->GetParticle(particle->PdgCode()))->Charge() == 0.0) 
+  if (particle->Charge() == 0.0) 
     return kFALSE;
-      
+  
   // -- check if physical primary
   if(!particle->IsPhysicalPrimary()) 
     return kFALSE;
@@ -534,20 +525,17 @@ Bool_t AliAnalysisNetParticleHelper::IsParticleAcceptedBasicNeutral(AliAODMCPart
   if (!particle) 
     return kFALSE;
 
-  // -- check if PDF code exists
-  if (!(TDatabasePDG::Instance()->GetParticle(particle->PdgCode()))) 
-    return kFALSE;
-    
   // -- check if charged
-  if ((TDatabasePDG::Instance()->GetParticle(particle->PdgCode()))->Charge() != 0.0) 
+  if (particle->Charge() != 0.0) 
     return kFALSE;
-      
+  
   // -- check if physical primary
   if(!particle->IsPhysicalPrimary()) 
     return kFALSE;
         
   return kTRUE;
 }
+
 //________________________________________________________________________
 Bool_t AliAnalysisNetParticleHelper::IsParticleAcceptedRapidity(TParticle *particle, Double_t &yP) {
   // -- Check if particle is accepted
@@ -580,6 +568,38 @@ Bool_t AliAnalysisNetParticleHelper::IsParticleAcceptedRapidity(TParticle *parti
   return kTRUE;
 }
 
+//________________________________________________________________________
+Bool_t AliAnalysisNetParticleHelper::IsParticleAcceptedRapidity(AliAODMCParticle *particle, Double_t &yP) {
+  // -- Check if AOD particle is accepted
+  // > in rapidity
+  // > if no pid : 
+  // >   use yP as input for the pseudo-rapdity_MAX to be checked
+  // > return 0 if not accepted
+
+  if (!fUsePID) {
+    Bool_t isAccepted = kFALSE;
+    if (TMath::Abs(particle->Eta()) < yP)
+      isAccepted = kTRUE;
+    yP = particle->Eta();
+    return isAccepted;
+  }
+
+  Double_t mP = AliPID::ParticleMass(fParticleSpecies);
+
+  // -- Calculate rapidities and kinematics
+  Double_t p  = particle->P();
+  Double_t pz = particle->Pz();
+
+  Double_t eP = TMath::Sqrt(p*p + mP*mP);
+  yP          = 0.5 * TMath::Log((eP + pz) / (eP - pz));  
+
+  // -- Check Rapidity window
+  if (TMath::Abs(yP) > fRapidityMax)
+    return kFALSE;
+  
+  return kTRUE;
+}
+
 //_____________________________________________________________________________
 Bool_t AliAnalysisNetParticleHelper::IsParticleFindable(Int_t label) {
   // -- Check if MC particle is findable tracks
@@ -717,7 +737,7 @@ Bool_t AliAnalysisNetParticleHelper::IsTrackAcceptedPID(AliVTrack *track, Double
     
     // Has no TOF PID availible
     else { 
-      if (track->Pt() > fMinPtForTOFRequired) 
+      if (track->Pt() >= fMinPtForTOFRequired) 
        isAcceptedTOF = kFALSE;
       else
        isAcceptedTOF = kTRUE;