update macros
authorcbaumann <cbaumann@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 17 Sep 2012 13:33:02 +0000 (13:33 +0000)
committercbaumann <cbaumann@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 17 Sep 2012 13:33:02 +0000 (13:33 +0000)
PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011Cent.C
PWGDQ/dielectron/macrosLMEE/LMEECutLib.C

index c9a22ca..c616e69 100644 (file)
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011Cent(Bool_t runRejection=kFALSE, Bool_t setMC=kFALSE,Bool_t enableCF=kFALSE, Bool_t switchToPhiV=kFALSE,Bool_t switchToOA=kTRUE){
+AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011Cent(Bool_t runRejection=kFALSE, Bool_t setMC=kFALSE,Bool_t enableCF=kFALSE, Bool_t switchToPhiV=kTRUE,Bool_t switchToOA=kFALSE){
   //get the current analysis manager
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -58,6 +58,7 @@ AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011Cent(Bool_t runRejection=kFALSE, B
          lowmass9->SetUseKF(kFALSE);
          task->AddDielectron(lowmass9);
          printf("add: %s\n",lowmass9->GetName()); }
+
        else if (switchToOA) {
 
    AliDielectron *lowmass12=ConfigLMEEPbPb2011(12,hasMC,enableCF);
index 385f196..0ad9768 100644 (file)
@@ -270,29 +270,38 @@ class LMEECutLib {
 
 
        AliAnalysisCuts* GetPairCuts2(Int_t cutSet, Bool_t togglePC /*=kFALSE*/)  {  
-         AliDielectronVarCuts* pairCuts=0x0;
+         AliAnalysisCuts* pairCuts=0x0;
          switch (cutSet) {
                case kPbPb2011TPCorTOF  :
                case kpp2010TPCandTOF :
-                 pairCuts = new AliDielectronVarCuts("InvMass","InvMass > 150 MeV");
-                 pairCuts->AddCut(AliDielectronVarManager::kM,0.15,100.,kTRUE);
+                 AliDielectronVarCuts* pairCutsV= new AliDielectronVarCuts("InvMass","InvMass > 150 MeV");
+                 pairCutsV->AddCut(AliDielectronVarManager::kM,0.15,100.,kTRUE);
+                 pairCuts = pairCutsV;
                  break;
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPCandTOFwide :
                case kpp2010TPCorTOF  :
                  if (!togglePC) {
                  
-                 pairCuts =new AliDielectronCutGroup("pairCutsCG","pairCutsCG",AliDielectronCutGroup::kAND);
+                 AliDielectronCutGroup* pairCutsCG2 =new AliDielectronCutGroup("pairCutsCG2","pairCutsCG2",AliDielectronCutGroup::kCompOR);
+                 AliDielectronCutGroup* pairCutsCG =new AliDielectronCutGroup("pairCutsCG","pairCutsCG",AliDielectronCutGroup::kCompAND);
                  pairCutsPhiv =new AliDielectronVarCuts("Phiv Cuts","Phiv<2.0rad");
-                 pairCutsPhiv->AddCut(AliDielectronVarManager::kPhivPair, 2.0, TMath::ACos(-1.0), kTRUE); //exclude
+                 //pairCutsPhiv->AddCut(AliDielectronVarManager::kPhivPair, 2.0, TMath::ACos(-1.0), kTRUE); //exclude //acos(-1) == \pi
+                 pairCutsPhiv->AddCut(AliDielectronVarManager::kPhivPair, 0.0, 2.0); //exclude //acos(-1) == \pi
                  pairCutsInvM =new AliDielectronVarCuts("InvM Cuts","InvM<0.3");
-                 pairCutsInvM->AddCut(AliDielectronVarManager::kInvMPair, 0.0, 0.3,kTRUE); //exclude
-                 pairCuts->AddCut(pairCutsPhiv);
-                 pairCuts->AddCut(pairCutsInvM);
+                 pairCutsInvM->AddCut(AliDielectronVarManager::kM, 0.0, 0.3); //exclude
+                 pairCutsInvMgood =new AliDielectronVarCuts("InvM Cuts good","InvM>0.3");
+                 pairCutsInvMgood->AddCut(AliDielectronVarManager::kM, 0.3, 99999.); //exclude
+                 pairCutsCG->AddCut(pairCutsPhiv);
+                 pairCutsCG->AddCut(pairCutsInvM);
+                 pairCutsCG2->AddCut(pairCutsInvMgood);
+                 pairCutsCG2->AddCut(pairCutsCG);
+                 pairCuts = pairCutsCG2;
                  }
                  else {
-                       pairCuts =new AliDielectronVarCuts("OpeningAngle","Opening angle > .035rad");
-                       pairCuts->AddCut(AliDielectronVarManager::kOpeningAngle, 0. , 0.035,kTRUE); //Logic inverted with pre-cut
+                       AliDielectronVarCuts* pairCutsV =new AliDielectronVarCuts("OpeningAngle","Opening angle > .035rad");
+                       pairCutsV->AddCut(AliDielectronVarManager::kOpeningAngle, 0. , 0.035,kTRUE); //Logic inverted with pre-cut
+                       pairCuts = pairCutsV;
                  }
                  break;
                default: cout << "No Pair Cuts defined " << endl;