From 1350e7180f6f8e844d38f4e987d19ef2dce14bdf Mon Sep 17 00:00:00 2001
From: cbaumann <cbaumann@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 12 Jul 2012 13:41:06 +0000
Subject: [PATCH] change analysis macros

---
 .../AddTask_cbaumann_LMEEPbPb2011Cent.C       | 11 +++++++--
 .../macrosLMEE/ConfigLMEEPbPb2011.C           | 23 +++++++++++++++++--
 PWGDQ/dielectron/macrosLMEE/LMEECutLib.C      | 10 ++++++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011Cent.C b/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011Cent.C
index 19224a60169..c9a22cab633 100644
--- a/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011Cent.C
+++ b/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011Cent.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011Cent(Bool_t runRejection=kFALSE, Bool_t setMC=kFALSE,Bool_t enableCF=kFALSE, Bool_t switchToPhiV=kTRUE){
+AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011Cent(Bool_t runRejection=kFALSE, Bool_t setMC=kFALSE,Bool_t enableCF=kFALSE, Bool_t switchToPhiV=kFALSE,Bool_t switchToOA=kTRUE){
   //get the current analysis manager
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -53,10 +53,17 @@ AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011Cent(Bool_t runRejection=kFALSE, B
   }
   else {
 	if (switchToPhiV) {
-	  AliDielectron *lowmass9=ConfigLMEEPbPb2011(9,hasMC,enableCF);
+
+   AliDielectron *lowmass9=ConfigLMEEPbPb2011(9,hasMC,enableCF);
 	  lowmass9->SetUseKF(kFALSE);
 	  task->AddDielectron(lowmass9);
 	  printf("add: %s\n",lowmass9->GetName()); }
+	else if (switchToOA) {
+
+   AliDielectron *lowmass12=ConfigLMEEPbPb2011(12,hasMC,enableCF);
+	  lowmass12->SetUseKF(kFALSE);
+	  task->AddDielectron(lowmass12);
+	  printf("add: %s\n",lowmass12->GetName()); }
 
 	else {
 	  AliDielectron *lowmass1=ConfigLMEEPbPb2011(1,hasMC,enableCF);
diff --git a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C
index 4ea1fb9eb2b..ea31735b287 100644
--- a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C
+++ b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011.C
@@ -2,7 +2,7 @@ void InitHistograms(AliDielectron *die, Int_t cutDefinition);
 void InitCF(AliDielectron* die, Int_t cutDefinition);
 void EnableMC();
 
-TString names=("noPairing;TPCTOFCentnoRej;TPCTOFSemiCentnoRej;TPCTOFPerinoRej;TPCTOFCent;TPCTOFSemiCent;TPCTOFPeri;TPCTOFCentnoRejTight;TPCTOFCentTight;TPCTOFCentPhiV;TPCTOFSemiCentPhiV;TPCTOFPeriPhiV");
+TString names=("noPairing;TPCTOFCentnoRej;TPCTOFSemiCentnoRej;TPCTOFPerinoRej;TPCTOFCent;TPCTOFSemiCent;TPCTOFPeri;TPCTOFCentnoRejTight;TPCTOFCentTight;TPCTOFCentPhiV;TPCTOFSemiCentPhiV;TPCTOFPeriPhiV;TPCTOFCentOA;TPCTOFSemiCentOA;TPCTOFPeriOA");
 TObjArray *arrNames=names.Tokenize(";");
 const Int_t nDie=arrNames->GetEntries();
 
@@ -102,6 +102,22 @@ AliDielectron* ConfigLMEEPbPb2011(Int_t cutDefinition, Bool_t withMC=kFALSE, Boo
 	selectedCentrality = LMEECutLib::kPbPb2011Peripheral;
 	rejectionStep = kFALSE;
   }
+//OA:
+  else if (cutDefinition==12) {
+	selectedPID = LMEECutLib::kPbPb2011TPCandTOFwide;
+	selectedCentrality = LMEECutLib::kPbPb2011Central;
+	rejectionStep = kFALSE;
+  }
+  else if (cutDefinition==13) {
+	selectedPID = LMEECutLib::kPbPb2011TPCandTOFwide;
+	selectedCentrality = LMEECutLib::kPbPb2011SemiCentral;
+	rejectionStep = kFALSE;
+  }
+  else if (cutDefinition==14) {
+	selectedPID = LMEECutLib::kPbPb2011TPCandTOFwide;
+	selectedCentrality = LMEECutLib::kPbPb2011Peripheral;
+	rejectionStep = kFALSE;
+  }
 
   else Semi{
 	cout << " =============================== " << endl;
@@ -125,7 +141,10 @@ AliDielectron* ConfigLMEEPbPb2011(Int_t cutDefinition, Bool_t withMC=kFALSE, Boo
 	else { //No Prefilter, no Pairfilter
 		die->GetTrackFilter().AddCuts( LMCL->GetPIDCutsAna(selectedPID) );
 		if ((cutDefinition >=9) &&  (cutDefinition <=11)) {
-		die->GetPairFilter().AddCuts(LMCL->GetPairCuts2(selectedPID));
+		die->GetPairFilter().AddCuts(LMCL->GetPairCuts2(selectedPID,kFALSE));
+		}
+		if ((cutDefinition >=12) &&  (cutDefinition <=14)) {
+		die->GetPairFilter().AddCuts(LMCL->GetPairCuts2(selectedPID,kTRUE));
 		}
 	}
 	//Introduce NULL-check for pp?
diff --git a/PWGDQ/dielectron/macrosLMEE/LMEECutLib.C b/PWGDQ/dielectron/macrosLMEE/LMEECutLib.C
index 48806bbec35..37c2f7befc0 100644
--- a/PWGDQ/dielectron/macrosLMEE/LMEECutLib.C
+++ b/PWGDQ/dielectron/macrosLMEE/LMEECutLib.C
@@ -32,7 +32,7 @@ class LMEECutLib {
 	AliAnalysisCuts* GetPIDCutsAna(Int_t cutSet);  
 	AliAnalysisCuts* GetPIDCutsPre(Int_t cutSet);  
 
-	AliAnalysisCuts* GetPairCuts2(Int_t cutSet);  
+	AliAnalysisCuts* GetPairCuts2(Int_t cutSet,Bool_t tooglePC=kFALSE);  
 	AliAnalysisCuts* GetPairCuts(Int_t cutSet);  
 
 	AliAnalysisCuts* GetTrackCutsAna(Int_t cutSet);  
@@ -269,7 +269,7 @@ class LMEECutLib {
 	}
 
 
-	AliAnalysisCuts* GetPairCuts2(Int_t cutSet)  {  
+	AliAnalysisCuts* GetPairCuts2(Int_t cutSet, Bool_t togglePC /*=kFALSE*/)  {  
 	  AliDielectronVarCuts* pairCuts=0x0;
 	  switch (cutSet) {
 		case kPbPb2011TPCorTOF  :
@@ -280,8 +280,14 @@ class LMEECutLib {
 		case kPbPb2011TPCandTOF :
 		case kPbPb2011TPCandTOFwide :
 		case kpp2010TPCorTOF  :
+		  if (!togglePC) {
 		  pairCuts =new AliDielectronVarCuts("Phiv Cuts","Phiv<2.0rad");
 		  pairCuts->AddCut(AliDielectronVarManager::kPhivPair, 2.0, TMath::ACos(-1.0), kTRUE); //exclude
+		  }
+		  else {
+			pairCuts =new AliDielectronVarCuts("OpeningAngle","Opening angle > .035rad");
+			pairCuts->AddCut(AliDielectronVarManager::kOpeningAngle, 0. , 0.035,kTRUE); //Logic inverted with pre-cut
+		  }
 		  break;
 		default: cout << "No Pair Cuts defined " << endl;
 	  } 
-- 
2.43.0