the filter needs the OutputContainer, not the exchange

diff --git a/PWG4/macros/AddTaskESDfilter.C b/PWG4/macros/AddTaskESDfilter.C
index 9eb4445f4af961d9b363fb02806050dd4aeb968f..b6d86ad82ea05f54f25f16af7013fe8071fb9f75 100644 (file)
--- a/PWG4/macros/AddTaskESDfilter.C
+++ b/PWG4/macros/AddTaskESDfilter.C
@@ -1,7 +1,4 @@
 AliESDtrackCuts *CreateCuts(Int_t iCut = 0); // create the standard cuts\r
-AliAnalysisTaskESDfilter *AddTaskESDfilter();\r
-AliAnalysisTaskESDfilter *AddTaskESDfilter(AliAnalysisManager* mgr,AliAnalysisDataContainer *cinput);\r
-\r
 AliAnalysisTaskESDfilter *AddTaskESDfilter()\r
 {\r
 // Creates a jet fider task, configures it and adds it to the analysis manager.\r
@@ -39,7 +36,7 @@ AliAnalysisTaskESDfilter *AddTaskESDfilter()
    return esdfilter;\r
 }\r
 \r
-AliAnalysisTaskESDfilter *AddTaskESDfilter(AliAnalysisManager* mgr,AliAnalysisDataContainer *cinput)\r
+AliAnalysisTaskESDfilter *AddTaskESDfilter(AliAnalysisManager* mgr,AliAnalysisDataContainer *cinput, AliAnalysisDataContainer *cout_aod)\r
 {\r
   // This is only for running on PROOF with the old root version 5-22-00 \r
   // and the older version of the AF\r
@@ -69,11 +66,9 @@ AliAnalysisTaskESDfilter *AddTaskESDfilter(AliAnalysisManager* mgr,AliAnalysisDa
    esdfilter->SetTrackFilter(trackFilter);\r
    mgr->AddTask(esdfilter);\r
 \r
-   AliAnalysisDataContainer *c_aod_filter = mgr->CreateContainer("cAODfilter", TTree::Class(),\r
-                                                               AliAnalysisManager::kExchangeContainer);\r
    // Connect to data containers\r
    mgr->ConnectInput  (esdfilter,  0, cinput  );\r
-   mgr->ConnectOutput (esdfilter,  0, c_aod_filter );\r
+   mgr->ConnectOutput (esdfilter,  0, cout_aod );\r
 \r
    return esdfilter;\r
 \r

diff --git a/PWG4/macros/AnalysisTrainCAF.C b/PWG4/macros/AnalysisTrainCAF.C
index ceb98040a135927ac321306d8d5a9f8e8f0c3eca..ac7347899b5941cd3279f7eda984787aa07e1f37 100644 (file)
--- a/PWG4/macros/AnalysisTrainCAF.C
+++ b/PWG4/macros/AnalysisTrainCAF.C
@@ -198,7 +198,7 @@ void AnalysisTrainCAF(Int_t nEvents = 10000, Int_t nOffset = 0, char *ds = "/PWG
     if (iESDfilter && !iAODanalysis) {\r
       gROOT->LoadMacro("AddTaskESDfilter.C");\r
       AliAnalysisTaskESDfilter *esdfilter = 0;\r
-      if(bOLD)esdfilter = AddTaskESDfilter(mgr,cinput);\r
+      if(bOLD)esdfilter = AddTaskESDfilter(mgr,cinput,cout_aod);\r
       else esdfilter = AddTaskESDfilter();\r
     }   \r
     // Jet analysis from the AOD\r

diff --git a/PWG4/macros/runJetSpectrumUnfolding.C b/PWG4/macros/runJetSpectrumUnfolding.C
index fbe4d92df8c0dc6e9b908781543befaca370108d..e6456cfd787925a2416b0e5adefcb395f770aa74 100644 (file)
--- a/PWG4/macros/runJetSpectrumUnfolding.C
+++ b/PWG4/macros/runJetSpectrumUnfolding.C
@@ -337,6 +337,7 @@ void FillSpecFromFiles(const char* fileNameReal = "histos_pwg4spec.root",const c
        Int_t binz = jetSpec->GetGenSpectrum()->GetYaxis()->FindBin(z);
        Float_t cont = jetSpec->GetGenSpectrum()->GetBinContent(bine,binz);
        Float_t err  = jetSpec->GetGenSpectrum()->GetBinError(bine,binz);
+       // merging of bins happens here!
        jetSpec->GetGenSpectrum()->SetBinContent(bine, binz, cont + fhEGenZGen->GetBinContent(te, tz));
        jetSpec->GetGenSpectrum()->SetBinError(bine, binz, err + fhEGenZGen->GetBinError(te, tz));
     }
@@ -359,6 +360,7 @@ void FillSpecFromFiles(const char* fileNameReal = "histos_pwg4spec.root",const c
     bin[3] = jetSpec->GetCorrelation()->GetAxis(3)->FindBin(var[3]);        
     Float_t cont = jetSpec->GetCorrelation()->GetBinContent(bin);
     Float_t err  = jetSpec->GetCorrelation()->GetBinError(bin);
+    // merging of bins happens here!
     jetSpec->GetCorrelation()->SetBinContent(bin, cont + fhCorrelation->GetBinContent(idx));
     jetSpec->GetCorrelation()->SetBinError(bin, err + fhCorrelation->GetBinError(idx));
   }
@@ -434,10 +436,10 @@ void correct(){
   loadlibs();
   // rec and gen
   //  FillSpecFromFiles("pwg4spec_15-50_all.root","pwg4spec_allpt.root");
-  FillSpecFromFiles("pwg4spec_allpt.root","pwg4spec_allpt.root");
+  FillSpecFromFiles("pwg4spec_allpt_16.root","pwg4spec_allpt_16.root");
 
   char name[100];
-  sprintf(name, "unfolded_pwg4spec.root");
+  sprintf(name, "unfolded_pwg4spec_16.root");
 
   unfold("gen_pwg4spec.root", "unfolding", "rec_pwg4spec.root", name);
   //draw(name, "unfolding", 1);