Particle mass access updated: Evi Ganoti, University of Athens (pganoti@phys.uoa.gr)

diff --git a/PWG2/KINK/AliAnalysisKinkESDMC.cxx b/PWG2/KINK/AliAnalysisKinkESDMC.cxx
index e843467ae31f4cdfa16f43ec022492fd5be1ea51..7953c7ccce7f90b6e72fec8b04f84b8999f9c9a7 100644 (file)
--- a/PWG2/KINK/AliAnalysisKinkESDMC.cxx
+++ b/PWG2/KINK/AliAnalysisKinkESDMC.cxx
@@ -94,11 +94,6 @@ void AliAnalysisKinkESDMC::ConnectInputData(Option_t *)
   if (!tree) {
     Printf("ERROR: Could not read chain from input slot 0");
   } else {
-    // Disable all branches, we want to process only MC
-    tree->SetBranchStatus("*", kTRUE);
-   // tree->SetBranchStatus("fTracks.*", kTRUE);
-   tree->SetBranchStatus("*Calo*", kFALSE);
-   tree->SetBranchStatus("FMD", kFALSE);
 
     AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
 

diff --git a/PWG2/KINK/AliAnalysisKinkESDMC.h b/PWG2/KINK/AliAnalysisKinkESDMC.h
index 0035183681b46787b358bfcde32e24fc61bcc0e2..b04799d23333847bcf82ddac72547fe6113ee093 100644 (file)
--- a/PWG2/KINK/AliAnalysisKinkESDMC.h
+++ b/PWG2/KINK/AliAnalysisKinkESDMC.h
@@ -22,7 +22,6 @@ class TH1F;
 class TH2F;
 class TH1D;
 class TH2D;
-class AliPID;
 
 #include "AliAnalysisTaskSE.h"
 

diff --git a/PWG2/KINK/AliResonanceKinkLikeSign.cxx b/PWG2/KINK/AliResonanceKinkLikeSign.cxx
index 2a014b1e5112085622cc061317e557a75cc1ff50..fd96483de231787bae02d383d79466c46fee128e 100644 (file)
--- a/PWG2/KINK/AliResonanceKinkLikeSign.cxx
+++ b/PWG2/KINK/AliResonanceKinkLikeSign.cxx
@@ -23,6 +23,8 @@
 #include "TVector3.h"
 #include "TF1.h"
 #include "TH1D.h"
+#include <TDatabasePDG.h>
+#include <TParticlePDG.h>
 #include "TLorentzVector.h"
 #include "AliAnalysisTaskSE.h"
 #include "AliAnalysisManager.h"
@@ -64,10 +66,7 @@ void AliResonanceKinkLikeSign::ConnectInputData(Option_t *)
   if (!tree) {
     Printf("ERROR: Could not read chain from input slot 0");
   } else {
-    // Disable all branches, we want to process only MC
-    tree->SetBranchStatus("*",kTRUE );
-    tree->SetBranchStatus("*Calo*", kFALSE);
-
+  
     AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
 
     if (!esdH) {
@@ -113,8 +112,8 @@ void AliResonanceKinkLikeSign::Exec(Option_t *)
   // Main loop
   // Called for each event
  
-   Float_t daughter1Mass=AliPID::ParticleMass(AliPID::kKaon);
-   Float_t daughter2Mass=AliPID::ParticleMass(AliPID::kPion);
+   Double_t daughter1Mass=TDatabasePDG::Instance()->GetParticle(kKPlus)->Mass();
+   Double_t daughter2Mass=TDatabasePDG::Instance()->GetParticle(kPiPlus)->Mass();
 
   if (!fESD) {
     Printf("ERROR: fESD not available");

diff --git a/PWG2/KINK/AliResonanceKinkLikeSign.h b/PWG2/KINK/AliResonanceKinkLikeSign.h
index 3355b4ee63e2fe696ce20cc36ce68f336cbddf2f..ceb3cb2e1ae11f5e538e69c8faeeea2503679607 100644 (file)
--- a/PWG2/KINK/AliResonanceKinkLikeSign.h
+++ b/PWG2/KINK/AliResonanceKinkLikeSign.h
@@ -13,7 +13,6 @@
 class TF1;
 class TTree;
 class AliESDEvent;
-class AliPID;
 class AliAnalysisTaskSE;
 
 class AliResonanceKinkLikeSign : public AliAnalysisTaskSE {

diff --git a/PWG2/KINK/AliResonanceKinkPID.cxx b/PWG2/KINK/AliResonanceKinkPID.cxx
index b9743cfffd7ae2e172763a8d179a4a8189460458..c5e1637badcbda06373d6fe841d5dc8b6e3ddb35 100644 (file)
--- a/PWG2/KINK/AliResonanceKinkPID.cxx
+++ b/PWG2/KINK/AliResonanceKinkPID.cxx
@@ -25,6 +25,8 @@
 #include "TH2D.h"
 #include "TParticle.h"
 #include <TVector3.h>
+#include <TDatabasePDG.h>
+#include <TParticlePDG.h>
 #include "TF1.h"
 #include "AliAnalysisTaskSE.h"
 #include "AliAnalysisManager.h"
@@ -75,9 +77,6 @@ void AliResonanceKinkPID::ConnectInputData(Option_t *)
   if (!tree) {
     Printf("ERROR: Could not read chain from input slot 0");
   } else {
-    // Disable all branches, we want to process only MC
-    tree->SetBranchStatus("*",kTRUE );
-    tree->SetBranchStatus("*Calo*", kFALSE);
 
     AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
 
@@ -165,9 +164,9 @@ void AliResonanceKinkPID::Exec(Option_t *)
    Int_t daughter1=kdaughterKaon;
    Int_t daughter2=kdaughterPion;
    
-   Float_t daughter1Mass=AliPID::ParticleMass(AliPID::kKaon);
-   Float_t daughter2Mass=AliPID::ParticleMass(AliPID::kPion);
-
+   Double_t daughter1Mass=TDatabasePDG::Instance()->GetParticle(kKPlus)->Mass();
+   Double_t daughter2Mass=TDatabasePDG::Instance()->GetParticle(kPiPlus)->Mass();
+   
    AliMCEventHandler* eventHandler = dynamic_cast<AliMCEventHandler*> (AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler());
    if (!eventHandler) {
     Printf("ERROR: Could not retrieve MC event handler");

diff --git a/PWG2/KINK/AliResonanceKinkPID.h b/PWG2/KINK/AliResonanceKinkPID.h
index aaafa85f868dd38026c7adfd1212c5243aaef69a..4dae3f7bcd0e1466e7c21e868804b1a6f7b8e84a 100644 (file)
--- a/PWG2/KINK/AliResonanceKinkPID.h
+++ b/PWG2/KINK/AliResonanceKinkPID.h
@@ -14,7 +14,7 @@ class TF1;
 class TString;
 class TTree;
 class AliESDEvent;
-class AliPID;
+class AliESDtrack;
 
 class AliResonanceKinkPID : public AliAnalysisTaskSE {
  public: