From: kleinb Date: Wed, 20 Oct 2010 13:26:57 +0000 (+0000) Subject: Change selection bit pattern to the same conventions as used in ANALYSIS/macros/... X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=3456f527243764882c765da62e3e36d81a0c232d;p=u%2Fmrichter%2FAliRoot.git Change selection bit pattern to the same conventions as used in ANALYSIS/macros/, use tight DCA for jet analysis --- diff --git a/PWG4/macros/AddTaskESDFilterPWG4Train.C b/PWG4/macros/AddTaskESDFilterPWG4Train.C index f6f95b5f1d0..a4ad5a03ad9 100644 --- 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 1520e26c0be..df74653c734 100644 --- 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 e6c62f8c8aa..eebd010a6a9 100644 --- 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); +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); -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){ +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){ AliAnalysisTaskJetSpectrum2 *js = 0; TString cBack = ""; diff --git a/PWG4/macros/AddTaskJets.C b/PWG4/macros/AddTaskJets.C index 62f2e91c3be..a9a69413f38 100644 --- 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)); TString cAdd = ""; - if(filterMask==16){ + if(filterMask==32){ // this is the standard mask do not add anything // should be changed after current train over all data is finished // now needed for merging @@ -393,7 +393,7 @@ AliJetReader *CreateJetReader(Char_t *jr,UInt_t filterMask){ AliJetAODReaderHeader *jrh = new AliJetAODReaderHeader(); jrh->SetComment("AOD Reader"); jrh->SetPtCut(0.15); // set low p_T cut of to 150 MeV - jrh->SetTestFilterMask(16); // Change this one for a different set of cuts + jrh->SetTestFilterMask(32); // Change this one for a different set of cuts if(filterMask>0)jrh->SetTestFilterMask(filterMask); // Define reader and set its header er = new AliJetAODReader();