changes to AOD task

diff --git a/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011AOD.C b/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011AOD.C
index c6ce94b1692362c75d53c2c68fafe66412b0a593..bba29af8a32bf86f0287f26f390b3ada75b828b1 100644 (file)
--- a/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011AOD.C
+++ b/PWGDQ/dielectron/macrosLMEE/AddTask_cbaumann_LMEEPbPb2011AOD.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011AOD(Bool_t runAll=kFALSE,Bool_t setMC=kFALSE,Bool_t getFromAlien=kFALSE){
+AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011AOD(Bool_t runAll=kFALSE,Bool_t setMC=kFALSE,Bool_t getFromAlien=kFALSE, Bool_t PIDbaseline=kFALSE){
 
   Bool_t bESDANA=kFALSE; //Autodetect via InputHandler
   //get the current analysis manager
@@ -75,6 +75,12 @@ AliAnalysisTask *AddTask_cbaumann_LMEEPbPb2011AOD(Bool_t runAll=kFALSE,Bool_t se
   task->AddDielectron(lowmass6);
   printf("add: %s\n",lowmass6->GetName());
 
+if (PIDbaseline) {
+       AliDielectron *lowmass7=ConfigLMEEPbPb2011AOD(7,hasMC,bESDANA);
+       task->AddDielectron(lowmass7);
+       printf("add: %s\n",lowmass7->GetName());
+}
+
   mgr->AddTask(task);
 
   //create output container

diff --git a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011AOD.C b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011AOD.C
index fc2de9f1ef7ab1fe91024130eb7679aa6342ac2f..99c1b32887bcec582b368e19687c1208e8100cc0 100644 (file)
--- a/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011AOD.C
+++ b/PWGDQ/dielectron/macrosLMEE/ConfigLMEEPbPb2011AOD.C
@@ -4,7 +4,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;TPCTOFCentnoTOF");
+TString names=("noPairing;TPCTOFCentnoRej;TPCTOFSemiCentnoRej;TPCTOFPerinoRej;TPCTOFCent;TPCTOFSemiCent;TPCTOFCentnoTOF;NoPIDNoPairing");
 TObjArray *arrNames=names.Tokenize(";");
 const Int_t nDie=arrNames->GetEntries();
 
@@ -74,6 +74,11 @@ AliDielectron* ConfigLMEEPbPb2011AOD(Int_t cutDefinition, Bool_t hasMC=kFALSE, B
        selectedCentrality = LMEECutLib::kPbPb2011Central;
        rejectionStep = kFALSE;
   }
+  else if (cutDefinition==7) {
+       selectedPID = LMEECutLib::kPbPb2011NoPID;
+       selectedCentrality = LMEECutLib::kPbPb2011Central;
+       rejectionStep = kFALSE;
+  }
   else Semi{
        cout << " =============================== " << endl;
        cout << " ==== INVALID CONFIGURATION ==== " << endl;
@@ -89,6 +94,10 @@ AliDielectron* ConfigLMEEPbPb2011AOD(Int_t cutDefinition, Bool_t hasMC=kFALSE, B
   //switch off KF PArticle:
   die->SetUseKF(kFALSE);
 
+  if (selectedPID == LMEECutLib::kPbPb2011NoPID) {
+         die->SetNoPairing();
+   }
+
        if (rejectionStep) {
                die->GetTrackFilter().AddCuts(LMCL->GetPIDCutsPre(selectedPID) );
                die->GetPairPreFilterLegs().AddCuts(LMCL->GetPIDCutsAna(selectedPID) );

diff --git a/PWGDQ/dielectron/macrosLMEE/LMEECutLibAOD.C b/PWGDQ/dielectron/macrosLMEE/LMEECutLibAOD.C
index 88bea63df0e7493b5164a4cdc4a0206f1a92cbba..a2581831edba276a46454e8a25910ff3b9ba27bb 100644 (file)
--- a/PWGDQ/dielectron/macrosLMEE/LMEECutLibAOD.C
+++ b/PWGDQ/dielectron/macrosLMEE/LMEECutLibAOD.C
@@ -2,6 +2,7 @@ class LMEECutLib {
 
   public:
        static  enum LMMECutSet {
+               kPbPb2011NoPID,
                kPbPb2011TPCandTOF,
                kPbPb2011TPC, //TOF required, more relaxed cut on TPC
                kPbPb2011TPCandTOFwide, //TOF required, more relaxed cut on TPC
@@ -43,6 +44,7 @@ class LMEECutLib {
        AliDielectronEventCuts* GetEventCuts(Int_t cutSet) {
          AliDielectronEventCuts* eventCuts = 0x0;
          switch (cutSet) {
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPC :
                case kPbPb2011TPCandTOFwide :
@@ -87,6 +89,7 @@ class LMEECutLib {
        AliDielectronTrackRotator* GetTrackRotator(Int_t cutSet) {
          AliDielectronTrackRotator* trackRotator = 0x0;
          switch (cutSet) {
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPC :
                case kPbPb2011TPCandTOFwide :
@@ -116,6 +119,7 @@ class LMEECutLib {
                  mixingHandler->SetMixType(AliDielectronMixingHandler::kAll);
                  break;
 */
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPC :
                case kPbPb2011TPCandTOFwide :
@@ -208,6 +212,11 @@ class LMEECutLib {
          pMin->AddCut(AliDielectronVarManager::kPt,.2,5.);
 
          switch (cutSet) {
+               case kPbPb2011NoPID:
+                 AliDielectronCutGroup* cgSecondTrackFilterNoPID = new AliDielectronCutGroup("cgNoPID","cgNoPID",AliDielectronCutGroup::kCompAND);
+                 cgSecondTrackFilterNoPID->AddCut(pTPC);
+                 anaCuts= cgSecondTrackFilterNoPID;
+                 break;
                case kPbPb2011TPCandTOF :
                  AliDielectronCutGroup* cgSecondTrackFilterPIDTPC1 = new AliDielectronCutGroup("cgPIDTPC1","cgPIDTPC1",AliDielectronCutGroup::kCompAND);
                  cgSecondTrackFilterPIDTPC1->AddCut(pTPC);
@@ -259,6 +268,7 @@ class LMEECutLib {
        AliAnalysisCuts* GetPIDCutsPre(Int_t cutSet) {
          AliAnalysisCuts* anaCuts=0x0;
          switch (cutSet) {
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPC :
                case kPbPb2011TPCandTOFwide :
@@ -299,6 +309,7 @@ class LMEECutLib {
                   pairCutsV->AddCut(AliDielectronVarManager::kM,0.15,100.,kTRUE);
                   pairCuts = pairCutsV;
                   break;
+               case kPbPb2011NoPID:
                 case kPbPb2011TPCandTOF :
                 case kPbPb2011TPC :
                 case kPbPb2011TPCandTOFwide :
@@ -339,6 +350,7 @@ class LMEECutLib {
                  pairCuts = new AliDielectronVarCuts("InvMass","InvMass > 150 MeV");
                  pairCuts->AddCut(AliDielectronVarManager::kM,0.15,100.,kTRUE);
                  break;
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPC :
                case kPbPb2011TPCandTOFwide :
@@ -354,6 +366,7 @@ class LMEECutLib {
        AliAnalysisCuts* GetESDTrackCutsAna(Int_t cutSet) {
          AliESDtrackCuts* esdTrackCutsH = 0x0;
          switch (cutSet) {
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPC :
                case kPbPb2011TPCandTOFwide :
@@ -387,6 +400,7 @@ class LMEECutLib {
        AliAnalysisCuts* GetTrackCutsAna(Int_t cutSet) {
          AliDielectronCutGroup* trackCuts=0x0;
          switch (cutSet) {
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPC :
                case kPbPb2011TPCandTOFwide :
@@ -424,6 +438,7 @@ class LMEECutLib {
        AliAnalysisCuts* GetTrackCutsPre(Int_t cutSet) {
          AliESDtrackCuts* trackCuts=0x0;
          switch (cutSet) {
+               case kPbPb2011NoPID:
                case kPbPb2011TPCandTOF :
                case kPbPb2011TPCorTOF  :
                case kpp2010TPCandTOF :