From 44f488b61ac409ad7327ef11ace6acfa6eb4dd0f Mon Sep 17 00:00:00 2001
From: cbaumann <cbaumann@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 20 Jun 2012 08:30:00 +0000
Subject: [PATCH] fix namespace collision, add variable to CF

---
 PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C | 16 +++++++++-------
 PWGDQ/dielectron/macrosLMEE/ConfigLMEEpp2010.C   | 14 ++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C
index d40b824eb39..440b79f94c7 100644
--- a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C
+++ b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C
@@ -9,7 +9,7 @@ const Int_t nDie=arrNames->GetEntries();
 Bool_t MCenabled=kFALSE;
 
 
-AliDielectron* ConfigLMEEPbPb2011(Int_t cutDefinition, Bool_t hasMC=kFALSE)
+AliDielectron* ConfigLMEEPbPb2011(Int_t cutDefinition, Bool_t hasMC=kFALSE, Bool_t CFenable=kFALSE)
 {
 
   Int_t selectedPID=-1;
@@ -22,10 +22,6 @@ AliDielectron* ConfigLMEEPbPb2011(Int_t cutDefinition, Bool_t hasMC=kFALSE)
   //
 
   MCenabled=hasMC;
-
-  if (MCenabled)
-	  die->SetHasMC(kTRUE);
-
   // create the actual framework object
 
   TString name=Form("%02d",cutDefinition);
@@ -40,6 +36,10 @@ AliDielectron* ConfigLMEEPbPb2011(Int_t cutDefinition, Bool_t hasMC=kFALSE)
 		Form("Track cuts: %s",name.Data()));
 
 
+  if (MCenabled)
+	  die->SetHasMC(kTRUE);
+
+
   //Setup AnalysisSelection:
   if (cutDefinition==0) {
 	//not yet implemented
@@ -127,7 +127,7 @@ AliDielectron* ConfigLMEEPbPb2011(Int_t cutDefinition, Bool_t hasMC=kFALSE)
   InitHistograms(die,cutDefinition);
 
   // the last definition uses no cuts and only the QA histograms should be filled!
-  if (hasMC) {
+  if (CFenable) {
 	  InitCF(die,cutDefinition);
   }
   return die;
@@ -290,6 +290,7 @@ void InitCF(AliDielectron* die, Int_t cutDefinition)
 
   //pair variables
   cf->AddVariable(AliDielectronVarManager::kP,200,0,20);
+  cf->AddVariable(AliDielectronVarManager::kPt,200,0,20);
   cf->AddVariable(AliDielectronVarManager::kM,201,-0.01,4.01); //20Mev Steps
   cf->AddVariable(AliDielectronVarManager::kY,100,-2.,2.);
   cf->AddVariable(AliDielectronVarManager::kPairType,10,0,10);
@@ -298,7 +299,8 @@ void InitCF(AliDielectron* die, Int_t cutDefinition)
   cf->AddVariable(AliDielectronVarManager::kOpeningAngle,320,0.,3.2);
   //leg variables
   cf->AddVariable(AliDielectronVarManager::kP,200,0.,20.,kTRUE);
-    cf->AddVariable(AliDielectronVarManager::kITSsignal,1000,0.0.,1000.,kTRUE);
+  cf->AddVariable(AliDielectronVarManager::kPt,200,0.,20.,kTRUE);
+  cf->AddVariable(AliDielectronVarManager::kITSsignal,1000,0.0.,1000.,kTRUE);
   cf->AddVariable(AliDielectronVarManager::kTPCsignal,500,0.0.,500.,kTRUE);
   cf->AddVariable(AliDielectronVarManager::kY,100,-2.,2.,kTRUE);
   //only in this case write MC truth info
diff --git a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEpp2010.C b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEpp2010.C
index 3c5c5380926..058366440b1 100644
--- a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEpp2010.C
+++ b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEpp2010.C
@@ -10,7 +10,7 @@ const Int_t nDie=arrNames->GetEntries();
 Bool_t MCenabled=kFALSE;
 
 
-AliDielectron* ConfigLMEEpp2010(Int_t cutDefinition, Bool_t hasMC=kFALSE, Bool_t enableCF=kTRUE);
+AliDielectron* ConfigLMEEpp2010(Int_t cutDefinition, Bool_t hasMC=kFALSE, Bool_t CFenable=kTRUE);
 {
 
   Int_t selectedPID=-1;
@@ -23,9 +23,7 @@ AliDielectron* ConfigLMEEpp2010(Int_t cutDefinition, Bool_t hasMC=kFALSE, Bool_t
 
   MCenabled=hasMC;
 
-  if (MCenabled)
-	die->SetHasMC(kTRUE);
-  // create the actual framework object
+ // create the actual framework object
 
   TString name=Form("%02d",cutDefinition);
   if ((cutDefinition)<arrNames->GetEntriesFast()){
@@ -38,7 +36,9 @@ AliDielectron* ConfigLMEEpp2010(Int_t cutDefinition, Bool_t hasMC=kFALSE, Bool_t
 		("%s",name.Data()),
 		Form("Track cuts: %s",name.Data()));
 
-
+ if (MCenabled)
+	die->SetHasMC(kTRUE);
+  
   //Setup AnalysisSelection:
   if (cutDefinition==0) {
 	//not yet implemented
@@ -90,7 +90,7 @@ AliDielectron* ConfigLMEEpp2010(Int_t cutDefinition, Bool_t hasMC=kFALSE, Bool_t
   InitHistograms(die,cutDefinition);
 
   // the last definition uses no cuts and only the QA histograms should be filled!
-  if (enableCF) InitCF(die,cutDefinition);
+  if (CFenable) InitCF(die,cutDefinition);
 
   return die;
 }
@@ -265,6 +265,7 @@ void InitCF(AliDielectron* die, Int_t cutDefinition)
 
 	//pair variables
 	cf->AddVariable(AliDielectronVarManager::kP,200,0,20);
+	cf->AddVariable(AliDielectronVarManager::kPt,200,0,20);
 	cf->AddVariable(AliDielectronVarManager::kM,201,-0.01,4.01); //20Mev Steps
 	cf->AddVariable(AliDielectronVarManager::kY,100,-2.,2.);
 	cf->AddVariable(AliDielectronVarManager::kPairType,10,0,10);
@@ -273,6 +274,7 @@ void InitCF(AliDielectron* die, Int_t cutDefinition)
 	cf->AddVariable(AliDielectronVarManager::kOpeningAngle,320,0.,3.2);
 	//leg variables
 	cf->AddVariable(AliDielectronVarManager::kP,200,0.,20.,kTRUE);
+	cf->AddVariable(AliDielectronVarManager::kPt,200,0.,20.,kTRUE);
 	cf->AddVariable(AliDielectronVarManager::kITSsignal,1000,0.0.,1000.,kTRUE);
 	cf->AddVariable(AliDielectronVarManager::kTPCsignal,500,0.0.,500.,kTRUE);
 	cf->AddVariable(AliDielectronVarManager::kY,100,-2.,2.,kTRUE);
-- 
2.39.3