Change selection bit pattern to the same conventions as used in ANALYSIS/macros/...

diff --git a/PWG4/macros/AddTaskESDFilterPWG4Train.C b/PWG4/macros/AddTaskESDFilterPWG4Train.C
index f6f95b5f1d0816002a1644088b4736957ae6c867..a4ad5a03ad991816edf9d5a904c9bbf8dbf38744 100644 (file)
--- a/PWG4/macros/AddTaskESDFilterPWG4Train.C
+++ b/PWG4/macros/AddTaskESDFilterPWG4Train.C
@@ -79,8 +79,21 @@ AliAnalysisTaskESDfilter *AddTaskESDFilter(Bool_t useKineFilter=kTRUE,
    // tighter cuts on primary particles for high pT tracks
    // take the standard cuts, which include already 
    // ITSrefit and use only primaries...
-   AliESDtrackCuts* esdTrackCutsH =  AliESDtrackCuts::GetStandardITSTPCTrackCuts2010(kTRUE);
-   esdTrackCutsH->SetName("StandardFromAliESDTrackCuts2010");
+
+   AliESDtrackCuts* esdTrackCutsH = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010(kFALSE); 
+   esdTrackCutsH->SetMaxDCAToVertexXY(2.4);
+   esdTrackCutsH->SetMaxDCAToVertexZ(3.2);
+   esdTrackCutsH->SetDCAToVertex2D(kTRUE);
+
+   // standard cuts with tight DCA cut
+   AliESDtrackCuts* esdTrackCutsH2 = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010();
+
+   // standard cuts with tight DCA but with requiring the first SDD cluster instead of an SPD cluster
+   // tracks selected by this cut are exclusive to those selected by the previous cut
+   AliESDtrackCuts* esdTrackCutsH3 = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010(); 
+   esdTrackCutsH3->SetClusterRequirementITS(AliESDtrackCuts::kSPD, AliESDtrackCuts::kNone);
+   esdTrackCutsH3->SetClusterRequirementITS(AliESDtrackCuts::kSDD, AliESDtrackCuts::kFirst);
+ 
 
 
    // these are needed for older MC 
@@ -100,17 +113,6 @@ AliAnalysisTaskESDfilter *AddTaskESDFilter(Bool_t useKineFilter=kTRUE,
    esdTrackCutsH1->SetName("StandardFromAliESDTrackCutsMaxRelPt");
    esdTrackCutsH1->SetMaxRel1PtUncertainty(0.4); // new 
 
-
-   AliESDtrackCuts* esdTrackCutsH2 = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010();
-   esdTrackCutsH2->SetName("StandardFromAliESDTrackCutsExtraDCA");
-   esdTrackCutsH2->SetMaxDCAToVertexZ(2);
-
-   AliESDtrackCuts* esdTrackCutsH3 = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010();
-   esdTrackCutsH2->SetName("StandardFromAliESDTrackCutsExtraDCANoITS");
-   esdTrackCutsH3->SetClusterRequirementITS(AliESDtrackCuts::kSPD, AliESDtrackCuts::kNone);
-   esdTrackCutsH3->SetClusterRequirementITS(AliESDtrackCuts::kSDD, AliESDtrackCuts::kFirst);
-   esdTrackCutsH3->SetMaxDCAToVertexZ(2);
-
    // Compose the filter
    AliAnalysisFilter* trackFilter = new AliAnalysisFilter("trackFilter");
    // 1
@@ -126,11 +128,11 @@ AliAnalysisTaskESDfilter *AddTaskESDFilter(Bool_t useKineFilter=kTRUE,
    // 16
    trackFilter->AddCuts(esdTrackCutsH);
    // 32
-   trackFilter->AddCuts(esdTrackCutsH1);
-   // 64
    trackFilter->AddCuts(esdTrackCutsH2);
+   // 64
+   trackFilter->AddCuts(esdTrackCutsH3);
    // 128
-   trackFilter->AddCuts(esdTrackCutsH2);
+   trackFilter->AddCuts(esdTrackCutsH1);
  
    // Filter with cuts on V0s
    AliESDv0Cuts*   esdV0Cuts = new AliESDv0Cuts("Standard V0 Cuts pp", "ESD V0 Cuts");

diff --git a/PWG4/macros/AddTaskFragmentationFunction.C b/PWG4/macros/AddTaskFragmentationFunction.C
index 1520e26c0bebc77c0db3896efa79769d31e8ffe0..df74653c734f136ddaec5edaabde9d72e2304c54 100644 (file)
--- a/PWG4/macros/AddTaskFragmentationFunction.C
+++ b/PWG4/macros/AddTaskFragmentationFunction.C
@@ -24,7 +24,7 @@ Or it runs on delta-AODs filled with filtered tracks and jets before.
 
 
 
-AliAnalysisTaskFragmentationFunction *AddTaskFragmentationFunction(UInt_t iFlag=1, UInt_t filterMask=16){
+AliAnalysisTaskFragmentationFunction *AddTaskFragmentationFunction(UInt_t iFlag=1, UInt_t filterMask=32){
         
         AliAnalysisTaskFragmentationFunction *ff=0;
 

diff --git a/PWG4/macros/AddTaskJetSpectrum2.C b/PWG4/macros/AddTaskJetSpectrum2.C
index e6c62f8c8aa088854c44980e48f06e0e65d307d7..eebd010a6a9682bb4ccb6518aa3d9aa5c1a369f7 100644 (file)
--- a/PWG4/macros/AddTaskJetSpectrum2.C
+++ b/PWG4/macros/AddTaskJetSpectrum2.C
@@ -1,7 +1,7 @@
-AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec = "jets",const char* bGen = "jetsAODMC_UA104",const char* bBkg="jeteventbackground_clustersAOD_KT06",UInt_t filterMask = 16, Int_t iPhysicsSelection = 1,UInt_t iEventSelectionMask = 0,Bool_t kBackground=kTRUE);\r
+AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec = "jets",const char* bGen = "jetsAODMC_UA104",const char* bBkg="jeteventbackground_clustersAOD_KT06",UInt_t filterMask = 32, Int_t iPhysicsSelection = 1,UInt_t iEventSelectionMask = 0,Bool_t kBackground=kTRUE);\r
 \r
 \r
-AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2Delta(UInt_t filterMask = 16,Bool_t kUseAODMC = kFALSE,Int_t iPhysicsSelection = 1,UInt_t iFlag = 0xfffffff, UInt_t iEventSelectionMask = 0,Bool_t kBackground = kFALSE){\r
+AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2Delta(UInt_t filterMask = 32,Bool_t kUseAODMC = kFALSE,Int_t iPhysicsSelection = 1,UInt_t iFlag = 0xfffffff, UInt_t iEventSelectionMask = 0,Bool_t kBackground = kFALSE){\r
   AliAnalysisTaskJetSpectrum2 *js = 0;\r
 \r
   TString cBack = "";\r

diff --git a/PWG4/macros/AddTaskJets.C b/PWG4/macros/AddTaskJets.C
index 62f2e91c3be58bf3f5309c5bcef19c3232a6dc1b..a9a69413f387ce00c53f0db1b76262f9aff3861e 100644 (file)
--- a/PWG4/macros/AddTaskJets.C
+++ b/PWG4/macros/AddTaskJets.C
@@ -135,7 +135,7 @@ AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf, Float_t radius,UInt_t f
    jetana = new AliAnalysisTaskJets(Form("JetAnalysis%s_%s%s",jr,jf,cRadius));\r
 \r
    TString cAdd = "";\r
-   if(filterMask==16){\r
+   if(filterMask==32){\r
      // this is the standard mask do not add anything\r
      // should be changed after current train over all data is finished \r
      // now needed for merging\r
@@ -393,7 +393,7 @@ AliJetReader *CreateJetReader(Char_t *jr,UInt_t filterMask){
     AliJetAODReaderHeader *jrh = new AliJetAODReaderHeader();\r
     jrh->SetComment("AOD Reader");\r
     jrh->SetPtCut(0.15); // set low p_T cut of to 150 MeV\r
-    jrh->SetTestFilterMask(16); // Change this one for a different set of cuts\r
+    jrh->SetTestFilterMask(32); // Change this one for a different set of cuts\r
     if(filterMask>0)jrh->SetTestFilterMask(filterMask); \r
     // Define reader and set its header\r
     er = new AliJetAODReader();\r