Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGLF / FORWARD / analysis2 / AliFMDMCSharingFilter.cxx

diff --git a/PWGLF/FORWARD/analysis2/AliFMDMCSharingFilter.cxx b/PWGLF/FORWARD/analysis2/AliFMDMCSharingFilter.cxx
index 770c7c7fd629bd0262b7abbf34b50e649d940601..42be670d9d0ece3a9c0cc876df4f4ed34c9e5fb9 100644 (file)
--- a/PWGLF/FORWARD/analysis2/AliFMDMCSharingFilter.cxx
+++ b/PWGLF/FORWARD/analysis2/AliFMDMCSharingFilter.cxx
@@ -47,8 +47,7 @@ AliFMDMCSharingFilter::AliFMDMCSharingFilter(const char* title)
     fFMD2i(0),
     fFMD2o(0),
     fFMD3i(0),
-    fFMD3o(0),
-    fOperComp(0)
+    fFMD3o(0)// , fOperComp(0)
 {
   // 
   // Constructor 
@@ -77,6 +76,7 @@ AliFMDMCSharingFilter::AliFMDMCSharingFilter(const char* title)
   fFMD3i->SetDirectory(0);
   fFMD3o->SetDirectory(0);
 
+#if 0
   fOper     = new AliFMDFloatMap(0,0,0,0);
   fOperComp = new TH2I("operComp", "Operation vs # track refs", 
                       kMergedInto, kNone-.5, kMergedInto+.5, 
@@ -89,6 +89,7 @@ AliFMDMCSharingFilter::AliFMDMCSharingFilter(const char* title)
   fOperComp->GetXaxis()->SetBinLabel(kMergedWithOther, "Merged w/other");
   fOperComp->GetXaxis()->SetBinLabel(kMergedInto,      "Merged into");
   fOperComp->SetDirectory(0);
+#endif
 }
 
 //____________________________________________________________________
@@ -99,8 +100,7 @@ AliFMDMCSharingFilter::AliFMDMCSharingFilter(const AliFMDMCSharingFilter& o)
     fFMD2i(o.fFMD2i),
     fFMD2o(o.fFMD2o),
     fFMD3i(o.fFMD3i),
-    fFMD3o(o.fFMD3o),
-    fOperComp(o.fOperComp)
+    fFMD3o(o.fFMD3o) // ,  fOperComp(o.fOperComp)
 {
   // 
   // Copy constructor 
@@ -209,7 +209,7 @@ AliFMDMCSharingFilter::CompareResults(const AliESDFMD&  esd,
   
 //____________________________________________________________________
 void
-AliFMDMCSharingFilter::DefineOutput(TList* dir)
+AliFMDMCSharingFilter::CreateOutputObjects(TList* dir)
 {
   // 
   // Define the output histograms.  These are put in a sub list of the
@@ -219,7 +219,7 @@ AliFMDMCSharingFilter::DefineOutput(TList* dir)
   // Parameters:
   //    dir Directory to add to 
   //
-  AliFMDSharingFilter::DefineOutput(dir);
+  AliFMDSharingFilter::CreateOutputObjects(dir);
   TList* d = static_cast<TList*>(dir->FindObject(GetName()));
   TList* cd = new TList;
   cd->SetOwner();
@@ -230,13 +230,13 @@ AliFMDMCSharingFilter::DefineOutput(TList* dir)
   cd->Add(fFMD2o);
   cd->Add(fFMD3i);
   cd->Add(fFMD3o);
-  cd->Add(fOperComp);
-  fTrackDensity.DefineOutput(d);
+  // cd->Add(fOperComp);
+  fTrackDensity.CreateOutputObjects(d);
 }
 
 //____________________________________________________________________
 void
-AliFMDMCSharingFilter::ScaleHistograms(const TList* dir, Int_t nEvents)
+AliFMDMCSharingFilter::Terminate(const TList* dir, TList* output, Int_t nEvents)
 {
   // 
   // Scale the histograms to the total number of events 
@@ -245,7 +245,7 @@ AliFMDMCSharingFilter::ScaleHistograms(const TList* dir, Int_t nEvents)
   //    dir     Where the output is 
   //    nEvents Number of events 
   //
-  AliFMDSharingFilter::ScaleHistograms(dir, nEvents);
+  AliFMDSharingFilter::Terminate(dir, output, nEvents);
 }
 
 //____________________________________________________________________