Corrected bug in cluster selection with PID

diff --git a/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx b/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx
index 259a6da965b6c3262d39f9c288f432645026d886..28df77acc12713d3685b5537e95c88331e2a7dac 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx
+++ b/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx
@@ -468,8 +468,8 @@ void  AliAnaParticleHadronCorrelation::MakeNeutralCorrelationFillAOD(AliAODPWG4P
     //Cluster selection, not charged, with photon or pi0 id and in fidutial cut
     Int_t pdg=0;
     if(!SelectCluster(calo, vertex, gammai, pdg)) continue ;
     //Cluster selection, not charged, with photon or pi0 id and in fidutial cut
     Int_t pdg=0;
     if(!SelectCluster(calo, vertex, gammai, pdg)) continue ;

-    
-    if(GetDebug() > 2)
+
+       if(GetDebug() > 2)

       printf("AliAnaParticleHadronCorrelation::MakeNeutralCorrelationFillAOD() - Neutral cluster in %s: pt %f, phi %f, phi trigger %f. Cuts:  delta phi min %2.2f,  max %2.2f, pT min %2.2f \n",
             detector.Data(), gammai.Pt(),gammai.Phi(),phiTrig,fDeltaPhiMinCut, fDeltaPhiMaxCut, GetMinPt());
     
       printf("AliAnaParticleHadronCorrelation::MakeNeutralCorrelationFillAOD() - Neutral cluster in %s: pt %f, phi %f, phi trigger %f. Cuts:  delta phi min %2.2f,  max %2.2f, pT min %2.2f \n",
             detector.Data(), gammai.Pt(),gammai.Phi(),phiTrig,fDeltaPhiMinCut, fDeltaPhiMaxCut, GetMinPt());
     


@@ -633,18 +633,18 @@ Bool_t  AliAnaParticleHadronCorrelation::SelectCluster(AliAODCaloCluster * calo,
   //Select cluster depending on its pid and acceptance selections
   
   //Skip matched clusters with tracks
   //Select cluster depending on its pid and acceptance selections
   
   //Skip matched clusters with tracks

-  if(calo->GetNTracksMatched() > 0) {
-    return kFALSE;} 
+  if(calo->GetNTracksMatched() > 0) return kFALSE;

   
   

+  TString detector = "";
+  if(calo->IsPHOSCluster()) detector= "PHOS";
+  else if(calo->IsEMCALCluster()) detector= "EMCAL";
+               

   //Check PID
   calo->GetMomentum(mom,vertex);//Assume that come from vertex in straight line
   pdg = AliCaloPID::kPhoton;   
   if(IsCaloPIDOn()){
     //Get most probable PID, 2 options check PID weights (in MC this option is mandatory)
     //or redo PID, recommended option for EMCal.
   //Check PID
   calo->GetMomentum(mom,vertex);//Assume that come from vertex in straight line
   pdg = AliCaloPID::kPhoton;   
   if(IsCaloPIDOn()){
     //Get most probable PID, 2 options check PID weights (in MC this option is mandatory)
     //or redo PID, recommended option for EMCal.

-    TString detector = "";
-    if(calo->IsPHOSCluster()) detector= "PHOS";
-    else if(calo->IsEMCALCluster()) detector= "EMCAL";

     
     if(!IsCaloPIDRecalculationOn() || GetReader()->GetDataType() == AliCaloTrackReader::kMC )
       pdg = GetCaloPID()->GetPdg(detector,calo->PID(),mom.E());//PID with weights
     
     if(!IsCaloPIDRecalculationOn() || GetReader()->GetDataType() == AliCaloTrackReader::kMC )
       pdg = GetCaloPID()->GetPdg(detector,calo->PID(),mom.E());//PID with weights


@@ -654,19 +654,15 @@ Bool_t  AliAnaParticleHadronCorrelation::SelectCluster(AliAODCaloCluster * calo,
     if(GetDebug() > 5) printf("AliAnaParticleHadronCorrelation::SelectCluster() - PDG of identified particle %d\n",pdg);
     
     //If it does not pass pid, skip
     if(GetDebug() > 5) printf("AliAnaParticleHadronCorrelation::SelectCluster() - PDG of identified particle %d\n",pdg);
     
     //If it does not pass pid, skip

-    if(pdg != AliCaloPID::kPhoton || pdg != AliCaloPID::kPi0) {
+    if(pdg != AliCaloPID::kPhoton && pdg != AliCaloPID::kPi0) {

       return kFALSE ;
     }
       return kFALSE ;
     }

-  }
+  }//PID on

   
   //Check acceptance selection
   if(IsFidutialCutOn()){
   
   //Check acceptance selection
   if(IsFidutialCutOn()){

-    Bool_t in = kFALSE;
-    if(calo->IsPHOSCluster())
-      in = GetFidutialCut()->IsInFidutialCut(mom,"PHOS") ;
-    else if(calo->IsEMCALCluster())
-      in = GetFidutialCut()->IsInFidutialCut(mom,"EMCAL") ;
-    if(! in ) { return kFALSE ;}
+    Bool_t in = GetFidutialCut()->IsInFidutialCut(mom,detector) ;
+    if(! in ) return kFALSE ;

   }
   
   if(GetDebug() > 5) printf("AliAnaParticleHadronCorrelation::SelectCluster() - Correlation photon selection cuts passed: pT %3.2f, pdg %d\n",mom.Pt(), pdg);
   }
   
   if(GetDebug() > 5) printf("AliAnaParticleHadronCorrelation::SelectCluster() - Correlation photon selection cuts passed: pT %3.2f, pdg %d\n",mom.Pt(), pdg);

diff --git a/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx b/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx
index fc546a4ac4a83029f233db202ed4b0b6cc8bb518..2ce67a4e4530d339af2c80dbd7771098c3a41fde 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx
+++ b/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx
@@ -1629,7 +1629,7 @@ Bool_t  AliAnaParticleJetLeadingConeCorrelation::SelectCluster(AliAODCaloCluster
     
   //  if(GetDebug() > 3) printf("AliAnaParticleJetLeadingConeCorrelation::SelectCluster() - PDG of identified particle %d\n",pdg);
     //If it does not pass pid, skip
     
   //  if(GetDebug() > 3) printf("AliAnaParticleJetLeadingConeCorrelation::SelectCluster() - PDG of identified particle %d\n",pdg);
     //If it does not pass pid, skip

-    if(pdg != AliCaloPID::kPhoton || pdg != AliCaloPID::kPi0) 
+    if(pdg != AliCaloPID::kPhoton && pdg != AliCaloPID::kPi0) 

       return kFALSE ;
   }//CaloPID
   
       return kFALSE ;
   }//CaloPID
   

diff --git a/PWG4/macros/AddTaskPartCorr.C b/PWG4/macros/AddTaskPartCorr.C
index bd30f19813008ce22972c8cc067a112bbb48ddd7..f73416975558988711490c662abdc05502fe8254 100644 (file)
--- a/PWG4/macros/AddTaskPartCorr.C
+++ b/PWG4/macros/AddTaskPartCorr.C
@@ -131,6 +131,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString data, TString calori
   anacorrhadron->SetOutputAODName("CorrelatedPi0s"+calorimeter);
   anacorrhadron->SetOutputAODClassName("AliAODPWG4ParticleCorrelation");
   anacorrhadron->SetDebug(-1);
   anacorrhadron->SetOutputAODName("CorrelatedPi0s"+calorimeter);
   anacorrhadron->SetOutputAODClassName("AliAODPWG4ParticleCorrelation");
   anacorrhadron->SetDebug(-1);

+  anacorrhadron->SwitchOffCaloPID();

   anacorrhadron->SwitchOffFidutialCut();
   anacorrhadron->SetPtCutRange(1,100);
   anacorrhadron->SetDeltaPhiCutRange(1.5,4.5);
   anacorrhadron->SwitchOffFidutialCut();
   anacorrhadron->SetPtCutRange(1,100);
   anacorrhadron->SetDeltaPhiCutRange(1.5,4.5);