From 5c4489e244e9eb403ffd5a757edb8080c44c004c Mon Sep 17 00:00:00 2001 From: kleinb Date: Thu, 26 Jan 2012 10:18:03 +0000 Subject: [PATCH] name changes from PWG4 to PWGJE --- ...G4Train.C => AddTaskESDFilterPWGJETrain.C} | 14 +-- PWGJE/macros/AddTaskFastEmbedding.C | 2 +- PWGJE/macros/AddTaskFragmentationFunction.C | 2 +- PWGJE/macros/AddTaskJetBackgroundSubtract.C | 4 +- PWGJE/macros/AddTaskJetChem.C | 4 +- PWGJE/macros/AddTaskJetCluster.C | 90 +++++++++---------- PWGJE/macros/AddTaskJetCore.C | 2 +- PWGJE/macros/AddTaskJetCorrections.C | 2 +- PWGJE/macros/AddTaskJetServices.C | 20 ++--- PWGJE/macros/AddTaskJetSpectrum2.C | 64 ++++++------- PWGJE/macros/AddTaskJets.C | 2 +- PWGJE/macros/AddTaskJetsFinder.C | 2 +- PWGJE/macros/AddTaskPWG4HighPtQAMC.C | 20 ++--- PWGJE/macros/AddTaskPWG4HighPtSpectra.C | 22 ++--- PWGJE/macros/AddTaskPWG4HighPtTrackQA.C | 36 ++++---- ...TrainPWG4Jets.C => AnalysisTrainPWGJets.C} | 2 +- ...TrackCutsPWG4.C => CreateTrackCutsPWGJE.C} | 4 +- 17 files changed, 146 insertions(+), 146 deletions(-) rename PWGJE/macros/{AddTaskESDFilterPWG4Train.C => AddTaskESDFilterPWGJETrain.C} (96%) rename PWGJE/macros/{AnalysisTrainPWG4Jets.C => AnalysisTrainPWGJets.C} (99%) rename PWGJE/macros/{CreateTrackCutsPWG4.C => CreateTrackCutsPWGJE.C} (98%) diff --git a/PWGJE/macros/AddTaskESDFilterPWG4Train.C b/PWGJE/macros/AddTaskESDFilterPWGJETrain.C similarity index 96% rename from PWGJE/macros/AddTaskESDFilterPWG4Train.C rename to PWGJE/macros/AddTaskESDFilterPWGJETrain.C index 43e38f57883..bd7d72b348a 100644 --- a/PWGJE/macros/AddTaskESDFilterPWG4Train.C +++ b/PWGJE/macros/AddTaskESDFilterPWGJETrain.C @@ -5,7 +5,7 @@ Bool_t AddTrackCutsLHC11h(AliAnalysisTaskESDfilter* esdFilter); Bool_t enableTPCOnlyAODTracks = kTRUE; -AliAnalysisTaskESDfilter *AddTaskESDFilterPWG4Train(Bool_t useKineFilter=kTRUE, +AliAnalysisTaskESDfilter *AddTaskESDFilterPWGJETrain(Bool_t useKineFilter=kTRUE, Bool_t writeMuonAOD=kFALSE, Bool_t writeDimuonAOD=kFALSE, Bool_t usePhysicsSelection=kFALSE, @@ -159,8 +159,8 @@ Bool_t AddTrackCutsLHC10h(AliAnalysisTaskESDfilter* esdfilter){ // ITSrefit and use only primaries... // ITS cuts for new jet analysis - gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/CreateTrackCutsPWG4.C"); - AliESDtrackCuts* esdTrackCutsHG0 = CreateTrackCutsPWG4(10001006); + gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/CreateTrackCutsPWGJE.C"); + AliESDtrackCuts* esdTrackCutsHG0 = CreateTrackCutsPWGJE(10001006); // throw out tracks with too low number of clusters in // the first pass (be consistent with TPC only tracks) @@ -172,16 +172,16 @@ Bool_t AddTrackCutsLHC10h(AliAnalysisTaskESDfilter* esdfilter){ // the complement to the one with SPD requirement - AliESDtrackCuts* esdTrackCutsHG1 = CreateTrackCutsPWG4(10011006); + AliESDtrackCuts* esdTrackCutsHG1 = CreateTrackCutsPWGJE(10011006); // the tracks that must not be taken pass this cut and // non HGC1 and HG - AliESDtrackCuts* esdTrackCutsHG2 = CreateTrackCutsPWG4(10021006); + AliESDtrackCuts* esdTrackCutsHG2 = CreateTrackCutsPWGJE(10021006); // standard cuts also used in R_AA analysis - AliESDtrackCuts* esdTrackCutsH2 = CreateTrackCutsPWG4(1000); + AliESDtrackCuts* esdTrackCutsH2 = CreateTrackCutsPWGJE(1000); - AliESDtrackCuts* esdTrackCutsGCOnly = CreateTrackCutsPWG4(10041006); + AliESDtrackCuts* esdTrackCutsGCOnly = CreateTrackCutsPWGJE(10041006); // TPC only tracks AliESDtrackCuts* esdTrackCutsTPCCOnly = AliESDtrackCuts::GetStandardTPCOnlyTrackCuts(); diff --git a/PWGJE/macros/AddTaskFastEmbedding.C b/PWGJE/macros/AddTaskFastEmbedding.C index fa3c4edaeb1..1e45fd5ac5b 100644 --- a/PWGJE/macros/AddTaskFastEmbedding.C +++ b/PWGJE/macros/AddTaskFastEmbedding.C @@ -55,7 +55,7 @@ AliAnalysisTaskFastEmbedding* AddTaskFastEmbedding(){ // ## create the output containers ## AliAnalysisDataContainer *coutputFastEmbedding = mgr->CreateContainer( "fastembedding", TList::Class(), AliAnalysisManager::kOutputContainer, - Form("%s:PWG4_FastEmbedding", AliAnalysisManager::GetCommonFileName())); + Form("%s:PWGJE_FastEmbedding", AliAnalysisManager::GetCommonFileName())); mgr->ConnectInput (task, 0, mgr->GetCommonInputContainer()); mgr->ConnectOutput(task, 0, mgr->GetCommonOutputContainer()); diff --git a/PWGJE/macros/AddTaskFragmentationFunction.C b/PWGJE/macros/AddTaskFragmentationFunction.C index a9a55000e6a..f2fee87975c 100644 --- a/PWGJE/macros/AddTaskFragmentationFunction.C +++ b/PWGJE/macros/AddTaskFragmentationFunction.C @@ -305,7 +305,7 @@ AliAnalysisTaskFragmentationFunction *AddTaskFragmentationFunction( Form("fracfunc_%s_%s_%s_%s_cl%d", branchRecJets.Data(), branchGenJets.Data(), typeTracks.Data(), typeJets.Data(), eventClass), TList::Class(), AliAnalysisManager::kOutputContainer, - Form("%s:PWG4_FragmentationFunction_%s_%s_%s_%s_cl%d", + Form("%s:PWGJE_FragmentationFunction_%s_%s_%s_%s_cl%d", AliAnalysisManager::GetCommonFileName(), branchRecJets.Data(), branchGenJets. Data(), typeTracks.Data(), typeJets.Data(), eventClass)); mgr->ConnectInput (task, 0, mgr->GetCommonInputContainer()); diff --git a/PWGJE/macros/AddTaskJetBackgroundSubtract.C b/PWGJE/macros/AddTaskJetBackgroundSubtract.C index 83822f39544..1a15bfdc5d9 100644 --- a/PWGJE/macros/AddTaskJetBackgroundSubtract.C +++ b/PWGJE/macros/AddTaskJetBackgroundSubtract.C @@ -41,10 +41,10 @@ AliAnalysisTaskJetBackgroundSubtract *AddTaskJetBackgroundSubtract(TString sJetB AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput = mgr->CreateContainer( - Form("pwgJetSubtract_%s",cAdd.Data()), + Form("pwgjeJetSubtract_%s",cAdd.Data()), TList::Class(), AliAnalysisManager::kOutputContainer, - Form("%s:PWG4_JetSubtract_%s",AliAnalysisManager::GetCommonFileName(),cAdd.Data())); + Form("%s:PWGJE_JetSubtract_%s",AliAnalysisManager::GetCommonFileName(),cAdd.Data())); mgr->ConnectInput(task,0,cinput ); mgr->ConnectOutput(task,1,coutput); diff --git a/PWGJE/macros/AddTaskJetChem.C b/PWGJE/macros/AddTaskJetChem.C index b9772df2cfc..364832c778b 100644 --- a/PWGJE/macros/AddTaskJetChem.C +++ b/PWGJE/macros/AddTaskJetChem.C @@ -78,12 +78,12 @@ AliAnalysisTaskJetChem *AddTask(const char* recJetsBranch,Int_t eventClass, Int_ if(K0type == AliAnalysisTaskJetChem::kOffldEdx) strK0type = "OffldEdx"; if(K0type == AliAnalysisTaskJetChem::kOfflPrim) strK0type = "OfflPrim"; - TString listName(Form("PWG4_JetChem_%s_%s_cl%d",branchRecJets.Data(),strK0type.Data(),eventClass)); + TString listName(Form("PWGJE_JetChem_%s_%s_cl%d",branchRecJets.Data(),strK0type.Data(),eventClass)); AliAnalysisDataContainer *coutput_FragFunc = mgr->CreateContainer(listName, TList::Class(), AliAnalysisManager::kOutputContainer, - Form("%s:PWG4_JetChem",AliAnalysisManager::GetCommonFileName())); + Form("%s:PWGJE_JetChem",AliAnalysisManager::GetCommonFileName())); mgr->ConnectInput (task, 0, mgr->GetCommonInputContainer()); mgr->ConnectOutput (task, 1, coutput_FragFunc); diff --git a/PWGJE/macros/AddTaskJetCluster.C b/PWGJE/macros/AddTaskJetCluster.C index 87554e91849..149a1d31952 100644 --- a/PWGJE/macros/AddTaskJetCluster.C +++ b/PWGJE/macros/AddTaskJetCluster.C @@ -74,66 +74,66 @@ AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filte cAdd += Form("_Cut%05d",(int)(1000.*kPtTrackCut)); cAdd += Form("_Skip%02d",nSkip); Printf("%s %E",cAdd.Data(),kPtTrackCut); - AliAnalysisTaskJetCluster* pwg4clus = new AliAnalysisTaskJetCluster(Form("JetCluster%s_%s%s",bRec,jf,cAdd.Data())); + AliAnalysisTaskJetCluster* clus = new AliAnalysisTaskJetCluster(Form("JetCluster%s_%s%s",bRec,jf,cAdd.Data())); // or a config file - // pwg4clus->SetAnalysisType(AliAnalysisTaskJetCluster::kAnaMC); - // if(iAODanalysis)pwg4clus->SetAODInput(kTRUE); - // pwg4clus->SetDebugLevel(11); - pwg4clus->SetFilterMask(filterMask); - // pwg4clus->SetUseGlobalSelection(kTRUE); - pwg4clus->SetVtxCuts(kVertexWindow,1); + // clus->SetAnalysisType(AliAnalysisTaskJetCluster::kAnaMC); + // if(iAODanalysis)clus->SetAODInput(kTRUE); + // clus->SetDebugLevel(11); + clus->SetFilterMask(filterMask); + // clus->SetUseGlobalSelection(kTRUE); + clus->SetVtxCuts(kVertexWindow,1); if(type == "AOD"){ // Assume all jet are produced already - pwg4clus->SetAODTrackInput(kTRUE); - pwg4clus->SetAODMCInput(kTRUE); + clus->SetAODTrackInput(kTRUE); + clus->SetAODMCInput(kTRUE); } if(typeRec.Contains("AODMC2b")){// work down from the top AODMC2b -> AODMC2 -> AODMC -> AOD - pwg4clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCChargedAcceptance); - pwg4clus->SetTrackPtCut(kPtTrackCut); - pwg4clus->SetTrackEtaWindow(kTrackEtaWindow); + clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCChargedAcceptance); + clus->SetTrackPtCut(kPtTrackCut); + clus->SetTrackEtaWindow(kTrackEtaWindow); } else if (typeRec.Contains("AODMC2")){ - pwg4clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCCharged); - pwg4clus->SetTrackPtCut(kPtTrackCut); - pwg4clus->SetTrackEtaWindow(5); + clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCCharged); + clus->SetTrackPtCut(kPtTrackCut); + clus->SetTrackEtaWindow(5); } else if (typeRec.Contains("AODMC")){ - pwg4clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCAll); - pwg4clus->SetTrackPtCut(kPtTrackCut); - pwg4clus->SetTrackEtaWindow(5); + clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCAll); + clus->SetTrackPtCut(kPtTrackCut); + clus->SetTrackEtaWindow(5); } else if (typeRec.Contains("AODextraonly")) { - pwg4clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODextraonly); - pwg4clus->SetTrackPtCut(kPtTrackCut); - pwg4clus->SetTrackEtaWindow(kTrackEtaWindow); + clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODextraonly); + clus->SetTrackPtCut(kPtTrackCut); + clus->SetTrackEtaWindow(kTrackEtaWindow); } else if (typeRec.Contains("AODextra")) { cout << "AliAnalysisTaskJetCluster::kTrackAODextra: " << AliAnalysisTaskJetCluster::kTrackAODextra << endl; - pwg4clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODextra); - pwg4clus->SetTrackPtCut(kPtTrackCut); - pwg4clus->SetTrackEtaWindow(kTrackEtaWindow); + clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODextra); + clus->SetTrackPtCut(kPtTrackCut); + clus->SetTrackEtaWindow(kTrackEtaWindow); } else if (typeRec.Contains("AOD")) { - pwg4clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAOD); - pwg4clus->SetTrackPtCut(kPtTrackCut); - pwg4clus->SetTrackEtaWindow(kTrackEtaWindow); + clus->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAOD); + clus->SetTrackPtCut(kPtTrackCut); + clus->SetTrackEtaWindow(kTrackEtaWindow); } - pwg4clus->SetRparam(radius); - pwg4clus->SetGhostArea(0.005); - pwg4clus->SetGhostEtamax(kTrackEtaWindow); + clus->SetRparam(radius); + clus->SetGhostArea(0.005); + clus->SetGhostEtamax(kTrackEtaWindow); switch (jf) { case "ANTIKT": - pwg4clus->SetAlgorithm(2); // antikt from fastjet/JetDefinition.hh + clus->SetAlgorithm(2); // antikt from fastjet/JetDefinition.hh break; case "CA": - pwg4clus->SetAlgorithm(1); // CA from fastjet/JetDefinition.hh + clus->SetAlgorithm(1); // CA from fastjet/JetDefinition.hh break; case "KT": - pwg4clus->SetAlgorithm(0); // kt from fastjet/JetDefinition.hh + clus->SetAlgorithm(0); // kt from fastjet/JetDefinition.hh break; default: ::Error("AddTaskJetCluster", "Wrong jet finder selected\n"); @@ -142,26 +142,26 @@ AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filte if(kWriteAOD){ - if(outputFile.Length())pwg4clus->SetJetOutputFile(outputFile); - pwg4clus->SetJetOutputBranch(Form("clusters%s_%s%s",bRec,jf,cAdd.Data())); - pwg4clus->SetJetOutputMinPt(0); // store only jets / clusters above a certain threshold + if(outputFile.Length())clus->SetJetOutputFile(outputFile); + clus->SetJetOutputBranch(Form("clusters%s_%s%s",bRec,jf,cAdd.Data())); + clus->SetJetOutputMinPt(0); // store only jets / clusters above a certain threshold } - pwg4clus->SetNSkipLeadingRan(nSkip); - pwg4clus->SetNSkipLeadingCone(nSkipCone); + clus->SetNSkipLeadingRan(nSkip); + clus->SetNSkipLeadingCone(nSkipCone); - if(iPhysicsSelectionFlag)pwg4clus->SelectCollisionCandidates(iPhysicsSelectionFlag); + if(iPhysicsSelectionFlag)clus->SelectCollisionCandidates(iPhysicsSelectionFlag); - mgr->AddTask(pwg4clus); + mgr->AddTask(clus); // Create ONLY the output containers for the data produced by the task. // Get and connect other common input/output containers via the manager as below //============================================================================== - AliAnalysisDataContainer *coutput1_Spec = mgr->CreateContainer(Form("pwg4cluster_%s_%s_%s%s",bRec,bGen,jf,cAdd.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_cluster_%s_%s_%s%s",AliAnalysisManager::GetCommonFileName(),bRec,bGen,jf,cAdd.Data())); + AliAnalysisDataContainer *coutput1_Spec = mgr->CreateContainer(Form("cluster_%s_%s_%s%s",bRec,bGen,jf,cAdd.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_cluster_%s_%s_%s%s",AliAnalysisManager::GetCommonFileName(),bRec,bGen,jf,cAdd.Data())); - mgr->ConnectInput (pwg4clus, 0, mgr->GetCommonInputContainer()); - mgr->ConnectOutput (pwg4clus, 0, mgr->GetCommonOutputContainer()); - mgr->ConnectOutput (pwg4clus, 1, coutput1_Spec ); + mgr->ConnectInput (clus, 0, mgr->GetCommonInputContainer()); + mgr->ConnectOutput (clus, 0, mgr->GetCommonOutputContainer()); + mgr->ConnectOutput (clus, 1, coutput1_Spec ); - return pwg4clus; + return clus; } diff --git a/PWGJE/macros/AddTaskJetCore.C b/PWGJE/macros/AddTaskJetCore.C index 4333ace9b21..62fa4dbe44b 100644 --- a/PWGJE/macros/AddTaskJetCore.C +++ b/PWGJE/macros/AddTaskJetCore.C @@ -42,7 +42,7 @@ AliAnalysisTaskJetCore* AddTaskJetCore(const char* bRec1,const char* bRec2, UInt mgr->AddTask(task); - AliAnalysisDataContainer *coutputJetCore = mgr->CreateContainer(Form("pwg4jetcore_%s_%s",bRec1,bRec2), TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_jetcore_%s_%s",AliAnalysisManager::GetCommonFileName(),bRec1,bRec2)); + AliAnalysisDataContainer *coutputJetCore = mgr->CreateContainer(Form("pwgjejetcore_%s_%s",bRec1,bRec2), TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_jetcore_%s_%s",AliAnalysisManager::GetCommonFileName(),bRec1,bRec2)); diff --git a/PWGJE/macros/AddTaskJetCorrections.C b/PWGJE/macros/AddTaskJetCorrections.C index a1df90f3c54..f925b65a1ad 100644 --- a/PWGJE/macros/AddTaskJetCorrections.C +++ b/PWGJE/macros/AddTaskJetCorrections.C @@ -53,7 +53,7 @@ AliAnalysisTaskJetCorrections * AddTaskJetCorrections(AliAnalysisManager* mgr ,A AliAnalysisDataContainer * coutpu0 = mgr->CreateContainer("coutpu0", TTree::Class(), AliAnalysisManager::kExchangeContainer); - AliAnalysisDataContainer *coutput1_jetCorr = mgr->CreateContainer("jetCorr", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_jetCorr",AliAnalysisManager::GetCommonFileName())); + AliAnalysisDataContainer *coutput1_jetCorr = mgr->CreateContainer("jetCorr", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_jetCorr",AliAnalysisManager::GetCommonFileName())); mgr->ConnectInput (jetCorr, 0, cinput); mgr->ConnectOutput (jetCorr, 0, coutpu0); diff --git a/PWGJE/macros/AddTaskJetServices.C b/PWGJE/macros/AddTaskJetServices.C index 6b5bed179f7..4faa8c5c331 100644 --- a/PWGJE/macros/AddTaskJetServices.C +++ b/PWGJE/macros/AddTaskJetServices.C @@ -20,34 +20,34 @@ AliAnalysisTaskJetServices *AddTaskJetServices(TString v0CalibFile = "") // Create the task and configure it. //=========================================================================== - AliAnalysisTaskJetServices* pwg4serv = new AliAnalysisTaskJetServices("JetServices"); + AliAnalysisTaskJetServices* serv = new AliAnalysisTaskJetServices("JetServices"); if(v0CalibFile.Length()){ TFile *fV0 = TFile::Open(v0CalibFile.Data()); if(fV0){ TDirectory *dir = (TDirectory*)fV0->Get("PWG4_services"); - TList *list = (TList*)dir->Get("pwg4serv"); + TList *list = (TList*)dir->Get("serv"); TProfile *xa = (TProfile*)list->FindObject("fp1RPXA"); TProfile *ya = (TProfile*)list->FindObject("fp1RPYA"); TProfile *xc = (TProfile*)list->FindObject("fp1RPXC"); TProfile *yc = (TProfile*)list->FindObject("fp1RPYC"); - pwg4serv->SetV0Centroids(xa,ya,xc,yc); + serv->SetV0Centroids(xa,ya,xc,yc); } } if(type == "AOD"){ - pwg4serv->SetAODInput(kTRUE); + serv->SetAODInput(kTRUE); } - mgr->AddTask(pwg4serv); + mgr->AddTask(serv); // Create ONLY the output containers for the data produced by the task. // Get and connect other common input/output containers via the manager as below //============================================================================== - AliAnalysisDataContainer *coutput1_Serv = mgr->CreateContainer("pwg4serv", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_services",AliAnalysisManager::GetCommonFileName())); + AliAnalysisDataContainer *coutput1_Serv = mgr->CreateContainer("pwgje_services", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_services",AliAnalysisManager::GetCommonFileName())); - mgr->ConnectInput (pwg4serv, 0, mgr->GetCommonInputContainer()); - mgr->ConnectOutput (pwg4serv, 0, mgr->GetCommonOutputContainer()); - mgr->ConnectOutput (pwg4serv, 1, coutput1_Serv ); + mgr->ConnectInput (serv, 0, mgr->GetCommonInputContainer()); + mgr->ConnectOutput (serv, 0, mgr->GetCommonOutputContainer()); + mgr->ConnectOutput (serv, 1, coutput1_Serv ); - return pwg4serv; + return serv; } diff --git a/PWGJE/macros/AddTaskJetSpectrum2.C b/PWGJE/macros/AddTaskJetSpectrum2.C index 11ad5e88e6d..1a77053547c 100644 --- a/PWGJE/macros/AddTaskJetSpectrum2.C +++ b/PWGJE/macros/AddTaskJetSpectrum2.C @@ -73,8 +73,8 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG // Create the task and configure it. //=========================================================================== - AliAnalysisTaskJetSpectrum2* pwg4spec = new AliAnalysisTaskJetSpectrum2(Form("JetSpectrum2%s-%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl)); - if(iCl)pwg4spec->SetEventClass(iCl); + AliAnalysisTaskJetSpectrum2* jetspec = new AliAnalysisTaskJetSpectrum2(Form("JetSpectrum2%s-%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl)); + if(iCl)jetspec->SetEventClass(iCl); // add the filter mask for non default jets branches TString cAdd(""); @@ -82,78 +82,78 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG - pwg4spec->SetBranchGen(bGen); - // if(typeGen.Contains("JETSAOD")&&!typeGen.Contains("MC"))pwg4spec->SetBranchGen(Form("%s%s",bGen,cAdd.Data())); + jetspec->SetBranchGen(bGen); + // if(typeGen.Contains("JETSAOD")&&!typeGen.Contains("MC"))jetspec->SetBranchGen(Form("%s%s",bGen,cAdd.Data())); - pwg4spec->SetBranchRec(bRec); - // if(typeRec.Contains("JETSAOD")&&!typeRec.Contains("MC")) pwg4spec->SetBranchRec(Form("%s%s",bRec,cAdd.Data())); + jetspec->SetBranchRec(bRec); + // if(typeRec.Contains("JETSAOD")&&!typeRec.Contains("MC")) jetspec->SetBranchRec(Form("%s%s",bRec,cAdd.Data())); - pwg4spec->SetFilterMask(filterMask); - pwg4spec->SetUseGlobalSelection(kTRUE); - pwg4spec->SetMinJetPt(5.); - pwg4spec->SetJetEtaWindow(0.4); + jetspec->SetFilterMask(filterMask); + jetspec->SetUseGlobalSelection(kTRUE); + jetspec->SetMinJetPt(5.); + jetspec->SetJetEtaWindow(0.4); if(type == "AOD"){ // Assume all jets are not yet produced - // pwg4spec->SetAODJetInput(kTRUE); - pwg4spec->SetAODTrackInput(kTRUE); - pwg4spec->SetAODMCInput(kTRUE); + // jetspec->SetAODJetInput(kTRUE); + jetspec->SetAODTrackInput(kTRUE); + jetspec->SetAODMCInput(kTRUE); } else{ if(mgr->GetMCtruthEventHandler()){ - pwg4spec-> SetAnalysisType(AliAnalysisTaskJetSpectrum2::kAnaMCESD); + jetspec-> SetAnalysisType(AliAnalysisTaskJetSpectrum2::kAnaMCESD); } } if(typeRec.Contains("AODMC2b")){// work down from the top AODMC2b -> AODMC2 -> AODMC -> AOD - pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance); + jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance); } else if (typeRec.Contains("AODMC2")){ - pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged); + jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged); } else if (typeRec.Contains("AODMC")){ - pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll); + jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll); } else { // catch akk use AOD - pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAOD); + jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAOD); } if(typeGen.Contains("AODMC2b")){// work down from the top AODMC2b -> AODMC2 -> AODMC -> AOD - pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance); + jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance); } else if (typeGen.Contains("AODMC2")){ - pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged); + jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged); } else if (typeGen.Contains("AODMC")){ - pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll); + jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll); } else if (typeGen.Length()>0){ // catch all use AOD - pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAOD); + jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAOD); } - if(iPhysicsSelectionFlag)pwg4spec->SelectCollisionCandidates(iPhysicsSelectionFlag); - if(iEventSelectionMask)pwg4spec->SetEventSelectionMask(iEventSelectionMask); + if(iPhysicsSelectionFlag)jetspec->SelectCollisionCandidates(iPhysicsSelectionFlag); + if(iEventSelectionMask)jetspec->SetEventSelectionMask(iEventSelectionMask); - // pwg4spec->SetDebugLevel(10); + // jetspec->SetDebugLevel(10); // to fetch the AOD from the AOD extension ouput - if(strlen(nonStdFile))pwg4spec->SetNonStdFile(nonStdFile); - mgr->AddTask(pwg4spec); + if(strlen(nonStdFile))jetspec->SetNonStdFile(nonStdFile); + mgr->AddTask(jetspec); // Create ONLY the output containers for the data produced by the task. // Get and connect other common input/output containers via the manager as below //============================================================================== - AliAnalysisDataContainer *coutput1_Spec = mgr->CreateContainer(Form("pwg4spec2_%s_%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl),TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_spec2_%s_%s_%010d_Class%02d",AliAnalysisManager::GetCommonFileName(),bRec,bGen,iEventSelectionMask,iCl)); + AliAnalysisDataContainer *coutput1_Spec = mgr->CreateContainer(Form("pwgje_spec2_%s_%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl),TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_spec2_%s_%s_%010d_Class%02d",AliAnalysisManager::GetCommonFileName(),bRec,bGen,iEventSelectionMask,iCl)); - mgr->ConnectInput (pwg4spec, 0, mgr->GetCommonInputContainer()); - mgr->ConnectOutput (pwg4spec, 0, mgr->GetCommonOutputContainer()); - mgr->ConnectOutput (pwg4spec, 1, coutput1_Spec ); + mgr->ConnectInput (jetspec, 0, mgr->GetCommonInputContainer()); + mgr->ConnectOutput (jetspec, 0, mgr->GetCommonOutputContainer()); + mgr->ConnectOutput (jetspec, 1, coutput1_Spec ); - return pwg4spec; + return jetspec; } void SetAODInput(AliAnalysisTaskJetSpectrum2 *taskJetSpectrum){ diff --git a/PWGJE/macros/AddTaskJets.C b/PWGJE/macros/AddTaskJets.C index a4f909a33c0..dfe077bb775 100644 --- a/PWGJE/macros/AddTaskJets.C +++ b/PWGJE/macros/AddTaskJets.C @@ -171,7 +171,7 @@ AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf, Float_t radius,UInt_t f cAdd.Data()), TList::Class(), AliAnalysisManager::kOutputContainer, - Form("%s:PWG4_jethist_%s_%s%s",AliAnalysisManager::GetCommonFileName(), + Form("%s:PWGJE_jethist_%s_%s%s",AliAnalysisManager::GetCommonFileName(), c_jr.Data(), c_jf.Data(), cAdd.Data())); diff --git a/PWGJE/macros/AddTaskJetsFinder.C b/PWGJE/macros/AddTaskJetsFinder.C index c784e27abe5..50437152c47 100644 --- a/PWGJE/macros/AddTaskJetsFinder.C +++ b/PWGJE/macros/AddTaskJetsFinder.C @@ -181,7 +181,7 @@ AliAnalysisTaskJetsFinder *AddTaskJetsFinder(AliAnalysisDataContainer* contname, if (! cin_jet_cont) { ::Error("AddTaskJetFinder", "This task needs an Exchange container"); return NULL;} AliAnalysisDataContainer *cout_jet = mgr->CreateContainer(Form("jethist_%s_%s%s",c_jr.Data(),c_jf.Data(),cAdd.Data()), TList::Class(), - AliAnalysisManager::kOutputContainer, Form("%s:PWG4_jethist_%s_%s%s", + AliAnalysisManager::kOutputContainer, Form("%s:PWGJE_jethist_%s_%s%s", AliAnalysisManager::GetCommonFileName(),c_jr.Data(),c_jf.Data(),cAdd.Data())); // Create ONLY the output containers for the data produced by the task. diff --git a/PWGJE/macros/AddTaskPWG4HighPtQAMC.C b/PWGJE/macros/AddTaskPWG4HighPtQAMC.C index f82b038bf65..5a83eea5e09 100644 --- a/PWGJE/macros/AddTaskPWG4HighPtQAMC.C +++ b/PWGJE/macros/AddTaskPWG4HighPtQAMC.C @@ -21,7 +21,7 @@ AliPWG4HighPtQAMC* AddTaskPWG4HighPtQAMC(char *prodType = "LHC10e14", Int_t trac // 2: TPConly constrained tracks //Load common track cut class - gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/CreateTrackCutsPWG4.C"); + gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/CreateTrackCutsPWGJE.C"); // A. Get the pointer to the existing analysis manager via the static access method. //============================================================================== @@ -52,31 +52,31 @@ AliPWG4HighPtQAMC* AddTaskPWG4HighPtQAMC(char *prodType = "LHC10e14", Int_t trac //Set track cuts for global tracks if(trackType==0 && cuts==0) { // tight global tracks - RAA analysis - trackCuts = CreateTrackCutsPWG4(1000); + trackCuts = CreateTrackCutsPWGJE(1000); } if(trackType==0 && cuts==1) { //Cuts global tracks with ITSrefit requirement and SPDrequirement for jet analysis - trackCuts = CreateTrackCutsPWG4(10001006); + trackCuts = CreateTrackCutsPWGJE(10001006); } if(trackType==0 && cuts==2) { //Cuts global tracks with ITSrefit requirement but without SPD - trackCuts = CreateTrackCutsPWG4(10011006); + trackCuts = CreateTrackCutsPWGJE(10011006); } if(trackType==7 && cuts==0) { // tight global tracks - trackCuts = CreateTrackCutsPWG4(10041006); - trackCutsReject = CreateTrackCutsPWG4(1006); + trackCuts = CreateTrackCutsPWGJE(10041006); + trackCutsReject = CreateTrackCutsPWGJE(1006); trackCutsReject->SetEtaRange(-0.9,0.9); trackCutsReject->SetPtRange(0.15, 1e10); } if(trackType==7 && cuts==1) { // tight global tracks - trackCuts = CreateTrackCutsPWG4(10011006); + trackCuts = CreateTrackCutsPWGJE(10011006); } if(trackType==7 && cuts==2) { // no requirements on SPD and ITSrefit failed - trackCuts = CreateTrackCutsPWG4(10041006); //no ITSrefit requirement filter 256 - trackCutsReject = CreateTrackCutsPWG4(10001006); //ITSrefit requirement filter 16 + trackCuts = CreateTrackCutsPWGJE(10041006); //no ITSrefit requirement filter 256 + trackCutsReject = CreateTrackCutsPWGJE(10001006); //ITSrefit requirement filter 16 trackCutsReject->SetEtaRange(-0.9,0.9); trackCutsReject->SetPtRange(0.15, 1e10); } @@ -84,7 +84,7 @@ AliPWG4HighPtQAMC* AddTaskPWG4HighPtQAMC(char *prodType = "LHC10e14", Int_t trac //Set track cuts for TPConly tracks if(trackType==1 || trackType==2) { //Set track cuts for TPConly tracks - trackCuts = CreateTrackCutsPWG4(2001); + trackCuts = CreateTrackCutsPWGJE(2001); } trackCuts->SetEtaRange(-0.9,0.9); trackCuts->SetPtRange(0.15, 1e10); diff --git a/PWGJE/macros/AddTaskPWG4HighPtSpectra.C b/PWGJE/macros/AddTaskPWG4HighPtSpectra.C index 8a533f8c7e1..1c962e780d1 100644 --- a/PWGJE/macros/AddTaskPWG4HighPtSpectra.C +++ b/PWGJE/macros/AddTaskPWG4HighPtSpectra.C @@ -56,7 +56,7 @@ AliPWG4HighPtSpectra* AddTaskPWG4HighPtSpectra(char *prodType = "LHC10e14", Bool // Creates HighPtSpectra analysis task and adds it to the analysis manager. //Load common track cut class - gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/CreateTrackCutsPWG4.C"); + gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/CreateTrackCutsPWGJE.C"); // A. Get the pointer to the existing analysis manager via the static access method. //============================================================================== @@ -173,42 +173,42 @@ AliPWG4HighPtSpectra* AddTaskPWG4HighPtSpectra(char *prodType = "LHC10e14", Bool //Set track cuts for global tracks if(trackType==0 && cuts==0) { // tight global tracks - RAA analysis - trackCuts = CreateTrackCutsPWG4(1000); + trackCuts = CreateTrackCutsPWGJE(1000); } if(trackType==0 && cuts==1) { //Cuts global tracks with ITSrefit requirement and SPDrequirement for jet analysis - trackCuts = CreateTrackCutsPWG4(10001006); + trackCuts = CreateTrackCutsPWGJE(10001006); } if(trackType==0 && cuts==2) { //Cuts global tracks with ITSrefit requirement but without SPD - trackCuts = CreateTrackCutsPWG4(10011006); + trackCuts = CreateTrackCutsPWGJE(10011006); } if(trackType==7 && cuts==0) { // no requirements on SPD and ITSrefit failed - trackCuts = CreateTrackCutsPWG4(10041006); //no ITSrefit requirement - trackCutsReject = CreateTrackCutsPWG4(1006); //ITSrefit requirement + trackCuts = CreateTrackCutsPWGJE(10041006); //no ITSrefit requirement + trackCutsReject = CreateTrackCutsPWGJE(1006); //ITSrefit requirement trackCutsReject->SetEtaRange(etamin,etamax); trackCutsReject->SetPtRange(0.15, 1e10); } if(trackType==7 && cuts==1) { //Cuts global tracks with ITSrefit requirement but without SPD - trackCuts = CreateTrackCutsPWG4(10011006); + trackCuts = CreateTrackCutsPWGJE(10011006); } if(trackType==7 && cuts==2) { // no requirements on SPD and ITSrefit failed - trackCuts = CreateTrackCutsPWG4(10041006); //no ITSrefit requirement filter 256 - trackCutsReject = CreateTrackCutsPWG4(10001006); //ITSrefit requirement filter 16 + trackCuts = CreateTrackCutsPWGJE(10041006); //no ITSrefit requirement filter 256 + trackCutsReject = CreateTrackCutsPWGJE(10001006); //ITSrefit requirement filter 16 trackCutsReject->SetEtaRange(etamin,etamax); trackCutsReject->SetPtRange(0.15, 1e10); } if(trackType==1 && cuts==0) { //Set track cuts for TPConly tracks - trackCuts = CreateTrackCutsPWG4(2001); + trackCuts = CreateTrackCutsPWGJE(2001); } if(trackType==2 && cuts==0) { // Set track cuts for TPConly constrained tracks - trackCuts = CreateTrackCutsPWG4(2001); + trackCuts = CreateTrackCutsPWGJE(2001); } trackCuts->SetEtaRange(etamin,etamax); trackCuts->SetPtRange(0.15, 1e10); diff --git a/PWGJE/macros/AddTaskPWG4HighPtTrackQA.C b/PWGJE/macros/AddTaskPWG4HighPtTrackQA.C index 0fa1f4edc6f..9015340a2b5 100644 --- a/PWGJE/macros/AddTaskPWG4HighPtTrackQA.C +++ b/PWGJE/macros/AddTaskPWG4HighPtTrackQA.C @@ -150,7 +150,7 @@ AliPWG4HighPtTrackQA* AddTaskPWG4HighPtTrackQA(char *prodType = "LHC10e14",Bool_ */ //Load common track cut class - gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/CreateTrackCutsPWG4.C"); + gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/CreateTrackCutsPWGJE.C"); // Creates HighPtTrackQA analysis task and adds it to the analysis manager. @@ -183,68 +183,68 @@ AliPWG4HighPtTrackQA* AddTaskPWG4HighPtTrackQA(char *prodType = "LHC10e14",Bool_ //Set track cuts for global tracks if(trackType==0 && cuts==0) { // tight global tracks - RAA analysis - trackCuts = CreateTrackCutsPWG4(1000); + trackCuts = CreateTrackCutsPWGJE(1000); } if(trackType==0 && cuts==1) { //Cuts global tracks with ITSrefit requirement and SPDrequirement for jet analysis - trackCuts = CreateTrackCutsPWG4(10001006); + trackCuts = CreateTrackCutsPWGJE(10001006); } if(trackType==0 && cuts==2) { //Cuts global tracks with ITSrefit requirement but without SPD - trackCuts = CreateTrackCutsPWG4(10011006); + trackCuts = CreateTrackCutsPWGJE(10011006); } if(trackType==7 && cuts==0) { // tight global tracks - trackCuts = CreateTrackCutsPWG4(10041006); - trackCutsReject = CreateTrackCutsPWG4(1006); + trackCuts = CreateTrackCutsPWGJE(10041006); + trackCutsReject = CreateTrackCutsPWGJE(1006); trackCutsReject->SetEtaRange(-0.9,0.9); trackCutsReject->SetPtRange(0.15, 1e10); } if(trackType==7 && cuts==1) { // tight global tracks - trackCuts = CreateTrackCutsPWG4(10011006); + trackCuts = CreateTrackCutsPWGJE(10011006); } if(trackType==7 && cuts==2) { // no requirements on SPD and ITSrefit failed - trackCuts = CreateTrackCutsPWG4(10041006); //no ITSrefit requirement filter 256 - trackCutsReject = CreateTrackCutsPWG4(10001006); //ITSrefit requirement filter 16 + trackCuts = CreateTrackCutsPWGJE(10041006); //no ITSrefit requirement filter 256 + trackCutsReject = CreateTrackCutsPWGJE(10001006); //ITSrefit requirement filter 16 trackCutsReject->SetEtaRange(-0.9,0.9); trackCutsReject->SetPtRange(0.15, 1e10); } if(trackType==1 && cuts==0) { //Set track cuts for TPConly tracks - trackCuts = CreateTrackCutsPWG4(2001); + trackCuts = CreateTrackCutsPWGJE(2001); } if(trackType==1 && cuts==1) { //Set track cuts for TPConly tracks - trackCuts = CreateTrackCutsPWG4(10032001); + trackCuts = CreateTrackCutsPWGJE(10032001); } if(trackType==2 && cuts==0) { // Set track cuts for TPConly constrained tracks - trackCuts = CreateTrackCutsPWG4(2001); + trackCuts = CreateTrackCutsPWGJE(2001); } if(trackType==2 && cuts==1) { //Set track cuts for TPConly constrained tracks - trackCuts = CreateTrackCutsPWG4(10032001); + trackCuts = CreateTrackCutsPWGJE(10032001); } if(trackType==4 && cuts==0) { // Set track cuts for TPConly constrained tracks - trackCuts = CreateTrackCutsPWG4(2001); + trackCuts = CreateTrackCutsPWGJE(2001); } if(trackType==4 && cuts==1) { // Set track cuts for TPConly constrained tracks - trackCuts = CreateTrackCutsPWG4(10032001); + trackCuts = CreateTrackCutsPWGJE(10032001); } if(trackType==5 || trackType==6) { // tight global tracks - trackCuts = CreateTrackCutsPWG4(1003); + trackCuts = CreateTrackCutsPWGJE(1003); - trackCutsReject = CreateTrackCutsPWG4(10021003); + trackCutsReject = CreateTrackCutsPWGJE(10021003); - trackCutsTPConly = CreateTrackCutsPWG4(2002); + trackCutsTPConly = CreateTrackCutsPWGJE(2002); trackCutsReject->SetEtaRange(-0.9,0.9); trackCutsReject->SetPtRange(0.15, 1e10); diff --git a/PWGJE/macros/AnalysisTrainPWG4Jets.C b/PWGJE/macros/AnalysisTrainPWGJets.C similarity index 99% rename from PWGJE/macros/AnalysisTrainPWG4Jets.C rename to PWGJE/macros/AnalysisTrainPWGJets.C index 2bc6a7a185d..01ef4ca1376 100644 --- a/PWGJE/macros/AnalysisTrainPWG4Jets.C +++ b/PWGJE/macros/AnalysisTrainPWGJets.C @@ -224,7 +224,7 @@ class AliAnalysisAlien; class AliAnalysisManager; //______________________________________________________________________________ -void AnalysisTrainPWG4Jets(const char *analysis_mode="local", +void AnalysisTrainPWGJets(const char *analysis_mode="local", const char *plugin_mode="", const char *config_file="",Int_t iOffset = 0,Int_t iTotal = 0) { diff --git a/PWGJE/macros/CreateTrackCutsPWG4.C b/PWGJE/macros/CreateTrackCutsPWGJE.C similarity index 98% rename from PWGJE/macros/CreateTrackCutsPWG4.C rename to PWGJE/macros/CreateTrackCutsPWGJE.C index 79dce2f63d2..354b80b96e5 100644 --- a/PWGJE/macros/CreateTrackCutsPWG4.C +++ b/PWGJE/macros/CreateTrackCutsPWGJE.C @@ -1,7 +1,7 @@ -AliESDtrackCuts *CreateTrackCutsPWG4(Int_t cutMode) { +AliESDtrackCuts *CreateTrackCutsPWGJE(Int_t cutMode) { // - // Macro to create track cuts for PWG4 Jet analysis + // Macro to create track cuts for PWG Jet analysis // User can select a specific set by indicating cutMode // cutMode has 8 digits: first 4 digits additional cuts, last 4 digits standard cuts // additional cuts are variations of standard cuts (used for hybrid track selection and QA) -- 2.43.0