name changes from PWG4 to PWGJE
authorkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 26 Jan 2012 10:18:03 +0000 (10:18 +0000)
committerkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 26 Jan 2012 10:18:03 +0000 (10:18 +0000)
17 files changed:
PWGJE/macros/AddTaskESDFilterPWGJETrain.C [moved from PWGJE/macros/AddTaskESDFilterPWG4Train.C with 96% similarity]
PWGJE/macros/AddTaskFastEmbedding.C
PWGJE/macros/AddTaskFragmentationFunction.C
PWGJE/macros/AddTaskJetBackgroundSubtract.C
PWGJE/macros/AddTaskJetChem.C
PWGJE/macros/AddTaskJetCluster.C
PWGJE/macros/AddTaskJetCore.C
PWGJE/macros/AddTaskJetCorrections.C
PWGJE/macros/AddTaskJetServices.C
PWGJE/macros/AddTaskJetSpectrum2.C
PWGJE/macros/AddTaskJets.C
PWGJE/macros/AddTaskJetsFinder.C
PWGJE/macros/AddTaskPWG4HighPtQAMC.C
PWGJE/macros/AddTaskPWG4HighPtSpectra.C
PWGJE/macros/AddTaskPWG4HighPtTrackQA.C
PWGJE/macros/AnalysisTrainPWGJets.C [moved from PWGJE/macros/AnalysisTrainPWG4Jets.C with 99% similarity]
PWGJE/macros/CreateTrackCutsPWGJE.C [moved from PWGJE/macros/CreateTrackCutsPWG4.C with 98% similarity]

similarity index 96%
rename from PWGJE/macros/AddTaskESDFilterPWG4Train.C
rename to PWGJE/macros/AddTaskESDFilterPWGJETrain.C
index 43e38f57883de5ac9365b7a763aa6a1f918da24b..bd7d72b348a21ebc95c6b5b9ac5d16cd3cbb893e 100644 (file)
@@ -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();
index fa3c4edaeb196b908ce9c5eab03317bc56e9c216..1e45fd5ac5bfbf232432aa6b7711fcf9e4d076e3 100644 (file)
@@ -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());
index a9a55000e6ac629d18dfc1d58b50e77f0405e485..f2fee87975c3e6489de71d19e02a6e27db9d9071 100644 (file)
@@ -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());
index 83822f395447a5c6e67beb7fa2e32a43503a0c01..1a15bfdc5d9886591920120b36d02962fe9bc71e 100644 (file)
@@ -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);
index b9772df2cfc6b164f4415be824d46499fd3ace72..364832c778b606ce8a46232bf33998f8194c0d71 100644 (file)
@@ -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);
index 87554e9184971b7b349b051e05ef3d8f71c97932..149a1d31952ae2f9481cd57d6264b710066ff31f 100644 (file)
@@ -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;
 }
index 4333ace9b212657985e8d0c52ffc8f0eb8ee5ae3..62fa4dbe44bf0e98d6e05e2eaef6f5bca78c6735 100644 (file)
@@ -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));
 
 
 
index a1df90f3c540e087111617ee01bc59943f5db3b6..f925b65a1ade45e628c8c21a77a8fab836d6ec6c 100644 (file)
@@ -53,7 +53,7 @@ AliAnalysisTaskJetCorrections * AddTaskJetCorrections(AliAnalysisManager* mgr ,A
 \r
   AliAnalysisDataContainer * coutpu0 = mgr->CreateContainer("coutpu0", TTree::Class(),\r
                                  AliAnalysisManager::kExchangeContainer);\r
-  AliAnalysisDataContainer *coutput1_jetCorr = mgr->CreateContainer("jetCorr", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_jetCorr",AliAnalysisManager::GetCommonFileName()));\r
+  AliAnalysisDataContainer *coutput1_jetCorr = mgr->CreateContainer("jetCorr", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_jetCorr",AliAnalysisManager::GetCommonFileName()));\r
 \r
    mgr->ConnectInput  (jetCorr, 0, cinput);\r
    mgr->ConnectOutput (jetCorr, 0, coutpu0);\r
index 6b5bed179f7ca36c7fc1aedddb018f8c6a5f5f28..4faa8c5c3313ae11de75d133486e7638531cbad3 100644 (file)
@@ -20,34 +20,34 @@ AliAnalysisTaskJetServices *AddTaskJetServices(TString v0CalibFile = "")
    // Create the task and configure it.\r
    //===========================================================================\r
    \r
-   AliAnalysisTaskJetServices* pwg4serv = new  AliAnalysisTaskJetServices("JetServices");\r
+   AliAnalysisTaskJetServices* serv = new  AliAnalysisTaskJetServices("JetServices");\r
       \r
    if(v0CalibFile.Length()){\r
      TFile *fV0 = TFile::Open(v0CalibFile.Data());\r
      if(fV0){\r
        TDirectory *dir = (TDirectory*)fV0->Get("PWG4_services");\r
-       TList *list = (TList*)dir->Get("pwg4serv");\r
+       TList *list = (TList*)dir->Get("serv");\r
        TProfile *xa = (TProfile*)list->FindObject("fp1RPXA");\r
        TProfile *ya = (TProfile*)list->FindObject("fp1RPYA");\r
        TProfile *xc = (TProfile*)list->FindObject("fp1RPXC");\r
        TProfile *yc = (TProfile*)list->FindObject("fp1RPYC");\r
-       pwg4serv->SetV0Centroids(xa,ya,xc,yc);\r
+       serv->SetV0Centroids(xa,ya,xc,yc);\r
      }\r
    }\r
 \r
    if(type == "AOD"){\r
-     pwg4serv->SetAODInput(kTRUE);\r
+     serv->SetAODInput(kTRUE);\r
    }\r
-   mgr->AddTask(pwg4serv);\r
+   mgr->AddTask(serv);\r
      \r
    // Create ONLY the output containers for the data produced by the task.\r
    // Get and connect other common input/output containers via the manager as below\r
    //==============================================================================\r
-   AliAnalysisDataContainer *coutput1_Serv = mgr->CreateContainer("pwg4serv", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_services",AliAnalysisManager::GetCommonFileName()));\r
+   AliAnalysisDataContainer *coutput1_Serv = mgr->CreateContainer("pwgje_services", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_services",AliAnalysisManager::GetCommonFileName()));\r
 \r
-   mgr->ConnectInput  (pwg4serv, 0, mgr->GetCommonInputContainer());\r
-   mgr->ConnectOutput (pwg4serv, 0, mgr->GetCommonOutputContainer());\r
-   mgr->ConnectOutput (pwg4serv,  1, coutput1_Serv );\r
+   mgr->ConnectInput  (serv, 0, mgr->GetCommonInputContainer());\r
+   mgr->ConnectOutput (serv, 0, mgr->GetCommonOutputContainer());\r
+   mgr->ConnectOutput (serv,  1, coutput1_Serv );\r
    \r
-   return pwg4serv;\r
+   return serv;\r
 }\r
index 11ad5e88e6d14ae003c4f7e3f1393b2a501d43b0..1a77053547c859a858a0559002a94077abd28086 100644 (file)
@@ -73,8 +73,8 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG
    // Create the task and configure it.\r
    //===========================================================================\r
 \r
-   AliAnalysisTaskJetSpectrum2* pwg4spec = new  AliAnalysisTaskJetSpectrum2(Form("JetSpectrum2%s-%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl));\r
-   if(iCl)pwg4spec->SetEventClass(iCl);\r
+   AliAnalysisTaskJetSpectrum2* jetspec = new  AliAnalysisTaskJetSpectrum2(Form("JetSpectrum2%s-%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl));\r
+   if(iCl)jetspec->SetEventClass(iCl);\r
 \r
    // add the filter mask for non default jets branches\r
    TString cAdd("");\r
@@ -82,78 +82,78 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG
 \r
    \r
 \r
-   pwg4spec->SetBranchGen(bGen); \r
-   //  if(typeGen.Contains("JETSAOD")&&!typeGen.Contains("MC"))pwg4spec->SetBranchGen(Form("%s%s",bGen,cAdd.Data())); \r
+   jetspec->SetBranchGen(bGen); \r
+   //  if(typeGen.Contains("JETSAOD")&&!typeGen.Contains("MC"))jetspec->SetBranchGen(Form("%s%s",bGen,cAdd.Data())); \r
 \r
-   pwg4spec->SetBranchRec(bRec); \r
-   // if(typeRec.Contains("JETSAOD")&&!typeRec.Contains("MC"))     pwg4spec->SetBranchRec(Form("%s%s",bRec,cAdd.Data())); \r
+   jetspec->SetBranchRec(bRec); \r
+   // if(typeRec.Contains("JETSAOD")&&!typeRec.Contains("MC"))     jetspec->SetBranchRec(Form("%s%s",bRec,cAdd.Data())); \r
 \r
 \r
-   pwg4spec->SetFilterMask(filterMask); \r
-   pwg4spec->SetUseGlobalSelection(kTRUE); \r
-   pwg4spec->SetMinJetPt(5.);\r
-   pwg4spec->SetJetEtaWindow(0.4);\r
+   jetspec->SetFilterMask(filterMask); \r
+   jetspec->SetUseGlobalSelection(kTRUE); \r
+   jetspec->SetMinJetPt(5.);\r
+   jetspec->SetJetEtaWindow(0.4);\r
 \r
 \r
 \r
    if(type == "AOD"){\r
      // Assume all jets are not yet produced \r
-     //     pwg4spec->SetAODJetInput(kTRUE);\r
-     pwg4spec->SetAODTrackInput(kTRUE);\r
-     pwg4spec->SetAODMCInput(kTRUE);\r
+     //     jetspec->SetAODJetInput(kTRUE);\r
+     jetspec->SetAODTrackInput(kTRUE);\r
+     jetspec->SetAODMCInput(kTRUE);\r
    }\r
    else{\r
      if(mgr->GetMCtruthEventHandler()){\r
-       pwg4spec-> SetAnalysisType(AliAnalysisTaskJetSpectrum2::kAnaMCESD);\r
+       jetspec-> SetAnalysisType(AliAnalysisTaskJetSpectrum2::kAnaMCESD);\r
      }\r
    }\r
 \r
    if(typeRec.Contains("AODMC2b")){// work down from the top AODMC2b -> AODMC2 -> AODMC -> AOD\r
-     pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance);\r
+     jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance);\r
    }\r
    else if (typeRec.Contains("AODMC2")){\r
-     pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged);\r
+     jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged);\r
    }\r
    else if (typeRec.Contains("AODMC")){\r
-     pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll);\r
+     jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll);\r
    }\r
    else { // catch akk use AOD\r
-     pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAOD);\r
+     jetspec->SetTrackTypeRec(AliAnalysisTaskJetSpectrum2::kTrackAOD);\r
    }\r
 \r
    if(typeGen.Contains("AODMC2b")){// work down from the top AODMC2b -> AODMC2 -> AODMC -> AOD\r
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance);\r
+     jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCChargedAcceptance);\r
    }\r
    else if (typeGen.Contains("AODMC2")){\r
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged);\r
+     jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCCharged);\r
    }\r
    else if (typeGen.Contains("AODMC")){\r
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll);\r
+     jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll);\r
    }\r
    else if (typeGen.Length()>0){ // catch all use AOD\r
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAOD);\r
+     jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAOD);\r
    }\r
 \r
-   if(iPhysicsSelectionFlag)pwg4spec->SelectCollisionCandidates(iPhysicsSelectionFlag);\r
-   if(iEventSelectionMask)pwg4spec->SetEventSelectionMask(iEventSelectionMask);\r
+   if(iPhysicsSelectionFlag)jetspec->SelectCollisionCandidates(iPhysicsSelectionFlag);\r
+   if(iEventSelectionMask)jetspec->SetEventSelectionMask(iEventSelectionMask);\r
 \r
-   //   pwg4spec->SetDebugLevel(10);\r
+   //   jetspec->SetDebugLevel(10);\r
 \r
 \r
    // to fetch the AOD from the AOD extension ouput \r
-   if(strlen(nonStdFile))pwg4spec->SetNonStdFile(nonStdFile);\r
-   mgr->AddTask(pwg4spec);\r
+   if(strlen(nonStdFile))jetspec->SetNonStdFile(nonStdFile);\r
+   mgr->AddTask(jetspec);\r
      \r
    // Create ONLY the output containers for the data produced by the task.\r
    // Get and connect other common input/output containers via the manager as below\r
    //==============================================================================\r
-   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));\r
+   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));\r
 \r
-   mgr->ConnectInput  (pwg4spec, 0, mgr->GetCommonInputContainer());\r
-   mgr->ConnectOutput (pwg4spec, 0, mgr->GetCommonOutputContainer());\r
-   mgr->ConnectOutput (pwg4spec,  1, coutput1_Spec );\r
+   mgr->ConnectInput  (jetspec, 0, mgr->GetCommonInputContainer());\r
+   mgr->ConnectOutput (jetspec, 0, mgr->GetCommonOutputContainer());\r
+   mgr->ConnectOutput (jetspec,  1, coutput1_Spec );\r
    \r
-   return pwg4spec;\r
+   return jetspec;\r
 }\r
 \r
 void SetAODInput(AliAnalysisTaskJetSpectrum2 *taskJetSpectrum){\r
index a4f909a33c0f2b0af93c8ec9fd695765a1922d5c..dfe077bb77582f7b466eac20f558a1c0120a5b1d 100644 (file)
@@ -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()));
index c784e27abe54a642576b7e9205038521ee5517b9..50437152c4780ba5465633358c9d1a93c18bab42 100644 (file)
@@ -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.
index f82b038bf65d239d3dd4c7c22d100fa17b9fdd6b..5a83eea5e09810e684dd154a2aa6000f4d220bdb 100644 (file)
@@ -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);
index 8a533f8c7e1cba1f07c1490c31c38c9329024bcb..1c962e780d17ddcd1978c026c9984e9e9938ff23 100644 (file)
@@ -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);
index 0fa1f4edc6f26c5913b9b53b94e8865917435a9c..9015340a2b54b9487e38cf751c5947c9e35c3895 100644 (file)
@@ -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);
similarity index 99%
rename from PWGJE/macros/AnalysisTrainPWG4Jets.C
rename to PWGJE/macros/AnalysisTrainPWGJets.C
index 2bc6a7a185d8bcf1597fea178f40ddec2d5e460d..01ef4ca1376ee15de98e1ed994a31c990ad36e45 100644 (file)
@@ -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)
 {
similarity index 98%
rename from PWGJE/macros/CreateTrackCutsPWG4.C
rename to PWGJE/macros/CreateTrackCutsPWGJE.C
index 79dce2f63d29fc65cfdf8832d44dc3be50519e8e..354b80b96e519bd63e4b548636615f28673d721d 100644 (file)
@@ -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)