Addsupport for AOD /delta AOD, limit printouts and use different names for output...

diff --git a/PWG4/JetTasks/AliAnalysisTaskUE.cxx b/PWG4/JetTasks/AliAnalysisTaskUE.cxx
index eafee42ce0f374f8006a7d182fa9b723fbf4a2ed..f0a73cf601f19e8c07985b661458f683b8183cf9 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskUE.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskUE.cxx
@@ -78,15 +78,12 @@ ClassImp( AliAnalysisTaskUE)
 //____________________________________________________________________
 AliAnalysisTaskUE:: AliAnalysisTaskUE(const char* name):
 AliAnalysisTask(name, ""),
-fDebug(kFALSE),
+fDebug(0),
 fDeltaAOD(kFALSE),
 fDeltaAODBranch(""),
-  fArrayJets(0x0),           
+fArrayJets(0x0),           
 fAOD(0x0),            
 fAODjets(0x0),
-//fArrayJets(0x0),
-//fDeltaAOD(kFALSE),
-//fDeltaAODBranch("jetsAOD"),
 fListOfHistos(0x0),  
 fBinsPtInHist(30),     
 fMinJetPtInHist(0.),
@@ -1239,7 +1236,7 @@ void  AliAnalysisTaskUE::Terminate(Option_t */*option*/)
     Double_t xsec = fh1Xsec->GetBinContent(1);
     Double_t ntrials = fh1Trials->GetBinContent(1);
     Double_t normFactor = xsec/ntrials;
-    Printf("xSec %f nTrials %f Norm %f \n",xsec,ntrials,normFactor);
+    if(fDebug > 1)Printf("xSec %f nTrials %f Norm %f \n",xsec,ntrials,normFactor);
     
     
     TCanvas* c2 = new TCanvas("c2","Jet Pt dist",160,160,1200,800);

diff --git a/PWG4/macros/AddTaskJFSystematics.C b/PWG4/macros/AddTaskJFSystematics.C
index 53892866d43f632e914ba3810a667d287a88f772..dd8f68434b911c872cc5e37c84464e7ae8208b4a 100644 (file)
--- a/PWG4/macros/AddTaskJFSystematics.C
+++ b/PWG4/macros/AddTaskJFSystematics.C
@@ -1,4 +1,4 @@
-AliAnalysisTaskJFSystematics *AddTaskJFSystematics(char *jf1 = "jetsMC",char *jf2 = "jets")\r
+AliAnalysisTaskJFSystematics *AddTaskJFSystematics(char *jf1 = "jets",char *jf2 = "jetsAODMC_UA104")\r
 {\r
 \r
    // Get the pointer to the existing analysis manager via the static access method.\r
@@ -30,8 +30,8 @@ AliAnalysisTaskJFSystematics *AddTaskJFSystematics(char *jf1 = "jetsMC",char *jf
      pwg4jfs->SetAODInput(kTRUE);\r
    }\r
 \r
-   pwg4jfs->SetBranchGen(jf1); \r
-   pwg4jfs->SetBranchRec(jf2); \r
+   pwg4jfs->SetBranchGen(jf2); \r
+   pwg4jfs->SetBranchRec(jf1); \r
    mgr->AddTask(pwg4jfs);\r
       \r
    // Create ONLY the output containers for the data produced by the task.\r

diff --git a/PWG4/macros/AddTaskThreeJets.C b/PWG4/macros/AddTaskThreeJets.C
index 6199c5828ae5ca766d2f3571e1cb53da2976fcbe..ce296b4c1b9cc0f0958d55abc6197e4bce5ca60a 100644 (file)
--- a/PWG4/macros/AddTaskThreeJets.C
+++ b/PWG4/macros/AddTaskThreeJets.C
@@ -20,7 +20,7 @@ AliAnalysisTaskThreeJets * AddTaskThreeJets(char *bRec = "jets",char * bGen = "j
   \r
   threeJets->SetBranchRec(bRec);\r
   threeJets->SetBranchGen(bGen); \r
-  threeJets->SetDebugLevel(10);\r
+  //  threeJets->SetDebugLevel(10);\r
   threeJets->SetR(.5); \r
   \r
   TString type = mgr->GetInputEventHandler()->GetDataType();\r

diff --git a/PWG4/macros/AddTaskUE.C b/PWG4/macros/AddTaskUE.C
index ab826d6b982a4142ebf13cb33bce083651e283d4..7025006d5a8788778eeb42218d4bf0192acb916e 100644 (file)
--- a/PWG4/macros/AddTaskUE.C
+++ b/PWG4/macros/AddTaskUE.C
@@ -1,7 +1,7 @@
 \r
 void ConfigTaskUE(AliAnalysisTaskUE * ueana); // common config, extend with different cases\r
                   \r
-AliAnalysisTaskUE *AddTaskUE()\r
+AliAnalysisTaskUE *AddTaskUE(char *jetBranch = "")\r
 {\r
 // Creates a jet fider task, configures it and adds it to the analysis manager.\r
 \r
@@ -25,12 +25,22 @@ AliAnalysisTaskUE *AddTaskUE()
    \r
    AliAnalysisTaskUE* ueana = new  AliAnalysisTaskUE("Underlying Event");\r
    ConfigTaskUE(ueana);\r
+\r
+   TString jb(jetBranch);\r
+\r
+   if(jb.Length()>0){\r
+     ueana->ReadDeltaAOD(kTRUE);\r
+     ueana->SelectDeltaAODBranch(jb.Data());\r
+   }\r
+\r
    mgr->AddTask(ueana);\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_UE = mgr->CreateContainer("histosUE", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_UE",AliAnalysisManager::GetCommonFileName()));\r
+   AliAnalysisDataContainer *coutput1_UE = 0;\r
+   if(jb.Length()==0)coutput1_UE = mgr->CreateContainer("histosUE", TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_UE",AliAnalysisManager::GetCommonFileName()));\r
+   else coutput1_UE = mgr->CreateContainer(Form("histosUE_%s",jb.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWG4_UE_%s",AliAnalysisManager::GetCommonFileName(),jb.Data()));\r
    \r
    mgr->ConnectInput  (ueana, 0, mgr->GetCommonInputContainer());\r
    mgr->ConnectOutput (ueana,     0, coutput1_UE );\r
@@ -48,7 +58,7 @@ void ConfigTaskUE(AliAnalysisTaskUE * ueana){
   Double_t rad=0.7; \r
   Double_t deltaPhiCut = 2.616;\r
   \r
-  ueana->SetDebugLevel(10); \r
+  ueana->SetDebugLevel(0); \r
   ueana->SetPtRangeInHist(25, 0., 250.);\r
   ueana->SetAnaTopology(anaType);      \r
   ueana->SetRegionType(regType);        \r