-add mc boolean for aod analysis

diff --git a/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_JPsi.C b/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_JPsi.C
index fed36507ed408522c3c15052d26b04c9a12c1de0..3bc97d14cf37b3c44a16bdfe788810126d0d93b9 100644 (file)
--- a/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_JPsi.C
+++ b/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_JPsi.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTask_jbook_JPsi(){
+AliAnalysisTask *AddTask_jbook_JPsi(Bool_t isMC=kFALSE){
   //get the current analysis manager
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -7,7 +7,8 @@ AliAnalysisTask *AddTask_jbook_JPsi(){
   }
 
   //Do we have an MC handler?
-  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
+  Bool_t hasMC=isMC;
+    //(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
   //Do we have an AOD handler?
   Bool_t isAOD=(mgr->GetInputEventHandler()->IsA()==AliAODInputHandler::Class() ? kTRUE : kFALSE);
   
@@ -30,7 +31,7 @@ AliAnalysisTask *AddTask_jbook_JPsi(){
 
   //add dielectron analysis with different cuts to the task
   for (Int_t i=0; i<5; ++i){ //nDie defined in config file
-    AliDielectron *jpsi=ConfigJpsi_jb_PbPb(i);
+    AliDielectron *jpsi=ConfigJpsi_jb_PbPb(i,hasMC);
     if (jpsi ) task->AddDielectron(jpsi);
     if (jpsi ) printf("add: %s\n",jpsi->GetName());
   }

diff --git a/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_v2.C b/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_v2.C
index ca5fe25e5732730a8598cf63e0e07096ceade82d..55fdc2cbe92778bd082eaa058e73c8f64f53f2cc 100644 (file)
--- a/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_v2.C
+++ b/PWGDQ/dielectron/macrosJPSI/AddTask_jbook_v2.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTask_jbook_v2(){
+AliAnalysisTask *AddTask_jbook_v2(Bool_t isMC=kFALSE){
   //get the current analysis manager
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -7,7 +7,8 @@ AliAnalysisTask *AddTask_jbook_v2(){
   }
 
   //Do we have an MC handler?
-  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
+  Bool_t hasMC=isMC;
+    //(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
   //Do we have an AOD handler?
   Bool_t isAOD=(mgr->GetInputEventHandler()->IsA()==AliAODInputHandler::Class() ? kTRUE : kFALSE);
   
@@ -30,7 +31,7 @@ AliAnalysisTask *AddTask_jbook_v2(){
 
   //add dielectron analysis with different cuts to the task
   for (Int_t i=16; i<nDie; ++i){ //nDie defined in config file
-    AliDielectron *jpsi=ConfigJpsi_jb_PbPb(i);
+    AliDielectron *jpsi=ConfigJpsi_jb_PbPb(i,hasMC);
     if (jpsi ) task->AddDielectron(jpsi);
     if (jpsi ) printf("add: %s\n",jpsi->GetName());
   }

diff --git a/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_jb_PbPb.C b/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_jb_PbPb.C
index ecd9d34c8fc48347246588f7a30df3251364c239..58ec2734781008d04699a43d4ceff6ebe08f444d 100644 (file)
--- a/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_jb_PbPb.C
+++ b/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_jb_PbPb.C
@@ -14,14 +14,17 @@ enum { kTPC=0, kTOF, kTRD, krec, kTOFTRD, kTOFTRD2, kITScls, kITSamy, kDCA, kChi
 TObjArray *arrNames=names.Tokenize(";");
 const Int_t nDie=arrNames->GetEntries();
 
-AliDielectron* ConfigJpsi_jb_PbPb(Int_t cutDefinition)
+Bool_t hasMC=kFALSE;
+
+AliDielectron* ConfigJpsi_jb_PbPb(Int_t cutDefinition, Bool_t isMC=kFALSE)
 {
   //
   // Setup the instance of AliDielectron
   //
   
   // MC event handler?
-  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);    
+  hasMC=isMC;
+    //(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);    
 
   //ESD handler?
   Bool_t isESD=(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()->IsA()==AliESDInputHandler::Class());
@@ -206,7 +209,7 @@ void SetupTrackCuts(AliDielectron *die, Int_t cutDefinition)
   cuts->AddCut(trkCuts);
   
   //Do we have an MC handler?
-  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
+  //  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
   
   /* vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv PID CUTS vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv */
   AliDielectronPID *pid = new AliDielectronPID("PID","PID");
@@ -364,7 +367,7 @@ void InitHistograms(AliDielectron *die, Int_t cutDefinition)
   //
   // Initialise the histograms
   //
-  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
+  //  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
   
   //Setup histogram Manager
   AliDielectronHistos *histos=new AliDielectronHistos(die->GetName(),die->GetTitle());
@@ -683,7 +686,7 @@ void InitCF(AliDielectron* die, Int_t cutDefinition)
   //
   // Setup the CF Manager if needed
   //
-  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);  
+  //  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);  
   
   AliDielectronCF *cf=new AliDielectronCF(die->GetName(),die->GetTitle());
   
@@ -757,7 +760,7 @@ void InitCF(AliDielectron* die, Int_t cutDefinition)
 
 void AddMCSignals(AliDielectron *die){
   //Do we have an MC handler?
-  Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
+  //Bool_t hasMC=(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()!=0x0);
   if (!hasMC) return;
   
   AliDielectronSignalMC* inclusiveJpsi = new AliDielectronSignalMC("inclusiveJpsi","Inclusive J/psi");