update from Salvatore, Ruediger for some bug fixes

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / macros / AddTaskFullpAJets.C

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskFullpAJets.C b/PWGJE/EMCALJetTasks/macros/AddTaskFullpAJets.C
index 0f84a97f314deb78cbc6a8a95a1e43ee3d0d1dfb..2f566db7772468ff463cb4f3114fda2c6296d0bd 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskFullpAJets.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskFullpAJets.C
@@ -1,18 +1,13 @@
-// AddTaskFullpAJets.C 2013-02-03 16:58:39Z yaldo
+// AddTaskFullpAJets.C 2013-02-07 cyaldo
 
-void AddTaskFullpAJets()
+AliAnalysisTaskFullpAJets *AddTaskFullpAJets()
 {
     const char *usedTracks="PicoTracks";
     const char *usedClusters="CaloClusters";
     const char *outClusName="CaloClustersCorr";
-    const Double_t hadcorr=2.0;
     const Double_t minTrackPt=0.15;
     const Double_t minClusterPt=0.30;
-    const Double_t minChargedJetPt=0.15;
-    const Double_t minFullJetPt=0.15;
-    const Double_t Eexcl=0.00;
-    const Double_t phiMatch=0.03;
-    const Double_t etaMatch=0.015;
+    const Double_t jetRadius=0.4;
     
     // Some constants for the jet finders
     const Int_t cKT                 = 0;
@@ -28,62 +23,47 @@ void AddTaskFullpAJets()
         return 0;
     }
 
+    // Determine the int of the jet radius for naming purposes
+    Int_t drjet=Int_t(100*jetRadius);
+    if (drjet%10 == 0)
+    {
+        drjet/=10;
+    }
+    
+    TString taskName = Form("AnalysisFullpAJetsR%d",drjet);
+    TString listName = Form("ListR%d",drjet);
+    TString fileName = taskName + ".root";
+    
     // Jet finders (RECONSTRUCTED DATA)
     TString tmpTaskName("");
     AliEmcalJetTask* jetFinderTask = NULL;
-    
+
     gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C");
+    
     // ########## CHARGED JETS ##########
-    // R=0.2
-    jetFinderTask = AddTaskEmcalJet(usedTracks,"",cANTIKT,0.2,1,minTrackPt,minClusterPt);
-    RequestMemory(jetFinderTask,250*1024);//more memory
-
-    // R=0.4
-    jetFinderTask = AddTaskEmcalJet(usedTracks,"",cANTIKT,0.4,1,minTrackPt,minClusterPt);
+    jetFinderTask = AddTaskEmcalJet(usedTracks,"",cANTIKT,jetRadius,cCHARGEDJETS,minTrackPt,minClusterPt);
     RequestMemory(jetFinderTask,250*1024);//more memory
 
     // ########## FULL JETS ##########
     // last two settings are for min pt tracks/clusters
-    // R=0.2, anti-kT
-    jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cANTIKT,0.2,cFULLJETS,minTrackPt,minClusterPt);
+    // anti-kT
+    jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cANTIKT,jetRadius,cFULLJETS,minTrackPt,minClusterPt);
     RequestMemory(jetFinderTask,250*1024);//more memory
 
-    // R=0.2 kT
-    jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cKT,0.2,cFULLJETS,minTrackPt,minClusterPt);
+    // kT
+    jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cKT,jetRadius,cFULLJETS,minTrackPt,minClusterPt);
     RequestMemory(jetFinderTask,250*1024);//more memory
 
-    // R=0.4
-    jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cANTIKT,0.4,cFULLJETS,minTrackPt,minClusterPt);
-    RequestMemory(jetFinderTask,250*1024);//more memory
-    
-    // R=0.4 kT
-    jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cKT,0.4,cFULLJETS,minTrackPt,minClusterPt);
-    RequestMemory(jetFinderTask,250*1024);//more memory
+    // Add User Task
+    AliAnalysisTaskFullpAJets *task = new AliAnalysisTaskFullpAJets(taskName);
+    mgr->AddTask(task);
+    //task->SetR_JET(drjet);
+    task->SetRjet(drjet);
+    AliAnalysisDataContainer *coutput = mgr->CreateContainer(listName,TList::Class(),AliAnalysisManager::kOutputContainer,fileName);
+    mgr->ConnectInput(task,0,mgr->GetCommonInputContainer());
+    mgr->ConnectOutput(task,1,coutput);
+    RequestMemory(task,250*1024);//more memory
 
-    // Add User Tasks'
-    // Run with R=0.2
-    AliAnalysisTaskFullpAJets *task1 = new AliAnalysisTaskFullpAJets("FileR2");
-    mgr->AddTask(task1);
-    task1->SetR_JET(2);
-    AliAnalysisDataContainer *coutput1 =
-    mgr->CreateContainer("R2List",
-                         TList::Class(),
-                         AliAnalysisManager::kOutputContainer,
-                         "FullpAJetsR2.root");
-    mgr->ConnectInput(task1,0,mgr->GetCommonInputContainer());
-    mgr->ConnectOutput(task1,1,coutput1);
-    RequestMemory(task1,250*1024);//more memory
+    return task;
 
-    // Run with R=0.4
-    AliAnalysisTaskFullpAJets *task2 = new AliAnalysisTaskFullpAJets("FileR4");
-    mgr->AddTask(task2);
-    task2->SetR_JET(4);
-    AliAnalysisDataContainer *coutput2 =
-    mgr->CreateContainer("R4List",
-                         TList::Class(),
-                         AliAnalysisManager::kOutputContainer,
-                         "FullpAJetsR4.root");
-    mgr->ConnectInput(task2,0,mgr->GetCommonInputContainer());
-    mgr->ConnectOutput(task2,1,coutput2);
-    RequestMemory(task2,250*1024);//more memory
 }