svFitHistogramAdapter: make histogram names unique to avoid memory conflicts/leaks

Author: thomas-mueller

BuildFile.xml

@@ -1,4 +1,5 @@
 <use   name="TauAnalysis/SVfitTF"/>
+<use   name="boost"/>
 <use   name="root"/>
 <use   name="roofit"/>
 <Flags CPPDEFINES="USE_SVFITTF"/>

interface/svFitHistogramAdapter.h

@@ -50,6 +50,10 @@ namespace classic_svFit
 
     bool isValidSolution() const;
 
+   private:
+    static int nInstances;
+    std::string uniqueName;
+    
     mutable TH1* histogram_ = nullptr;
   };
 

src/svFitHistogramAdapter.cc

@@ -2,9 +2,12 @@
 
 #include <TMath.h>
 #include <TFile.h>
+#include <TObject.h>
 
 #include <numeric>
 
+#include <boost/algorithm/string/replace.hpp>
+
 using namespace classic_svFit;
 
 TH1* HistogramTools::compHistogramDensity(TH1 const* histogram)
@@ -113,7 +116,10 @@ TH1* HistogramTools::makeHistogram(const std::string& histogramName, double xMin
   return histogram;
 }
 
-SVfitQuantity::SVfitQuantity()
+int SVfitQuantity::nInstances = 0;
+
+SVfitQuantity::SVfitQuantity() :
+  uniqueName("_SVfitQuantity_"+std::to_string(++SVfitQuantity::nInstances))
 {
 }
 
@@ -126,11 +132,17 @@ void SVfitQuantity::bookHistogram(const LorentzVector& vis1P4, const LorentzVect
 {
   if (histogram_ != nullptr) delete histogram_;
   histogram_ = createHistogram(vis1P4, vis2P4, met);
+  histogram_->SetName((histogram_->GetName()+uniqueName).c_str());
 }
 
 void SVfitQuantity::writeHistogram() const
 {
-  if (histogram_ != nullptr) histogram_->Write();
+  if (histogram_ != nullptr)
+  {
+    std::string histogramName = histogram_->GetName();
+    boost::replace_all(histogramName, uniqueName, "");
+    histogram_->Write(histogramName.c_str(), TObject::kWriteDelete);
+  }
 }
 
 void SVfitQuantity::fillHistogram(