Cache pointers CMSHistSum and ErrorPropagator in CachingNLL

This will make it more efficient to look them up to run the analytical
Barlow Beeston.

Author: guitargeek

interface/CachingNLL.h

@@ -20,6 +20,8 @@
 #include "SimpleConstraintGroup.h"
 
 class RooMultiPdf;
+class CMSHistSum;
+class CMSHistErrorPropagator;
 
 // Part zero: ArgSet checker
 namespace cacheutils {
@@ -145,6 +147,8 @@ class CachingAddNLL : public RooAbsReal {
         mutable std::vector<std::unique_ptr<RooAbsReal>>  prods_;
         mutable std::vector<RooAbsReal*> integrals_;
         mutable std::vector<std::pair<const RooMultiPdf*,CachingPdfBase*> > multiPdfs_;
+        mutable std::vector<CMSHistSum const*> histSums_;
+        mutable std::vector<CMSHistErrorPropagator const*> histErrorPropagators_;
         mutable std::vector<Double_t> partialSum_;
         mutable std::vector<Double_t> workingArea_;
         mutable bool isRooRealSum_, fastExit_;

src/CachingNLL.cc

@@ -568,13 +568,16 @@ cacheutils::CachingAddNLL::setup_()
 
     multiPdfs_.clear();
     for (auto &itp : pdfs_) {
-        bool isMultiPdf = itp->pdf()->IsA()->InheritsFrom(RooMultiPdf::Class());
-        if (isMultiPdf) {
-            const RooMultiPdf *mpdf = dynamic_cast<const RooMultiPdf*>(itp->pdf());
-            multiPdfs_.push_back(std::make_pair(mpdf, itp.get()));
-        }
+      if (auto* mpdf = dynamic_cast<const RooMultiPdf*>(itp->pdf())) {
+        multiPdfs_.emplace_back(mpdf, itp.get());
+      }
+      if (auto* hist = dynamic_cast<const CMSHistSum*>(itp->pdf())) {
+        histSums_.emplace_back(hist);
+      }
+      if (auto* hist = dynamic_cast<const CMSHistErrorPropagator*>(itp->pdf())) {
+        histErrorPropagators_.emplace_back(hist);
+      }
     }
- 
 }
 
 void
@@ -789,27 +792,21 @@ cacheutils::CachingAddNLL::setData(const RooAbsData &data)
 }
 
 void cacheutils::CachingAddNLL::propagateData() {
-    for (auto const& funci : pdfs_) {
-        if ( auto pdf = dynamic_cast<CMSHistErrorPropagator const*>(funci->pdf()); pdf != nullptr ) {
-            pdf->setData(*data_);
-        }
-        else if ( auto pdf = dynamic_cast<CMSHistSum const*>(funci->pdf()); pdf != nullptr ) {
-            pdf->setData(*data_);
-        }
-    }
+  for (auto* hist : histErrorPropagators_) {
+    hist->setData(*data_);
+  }
+  for (auto* hist : histSums_) {
+    hist->setData(*data_);
+  }
 }
 
-
 void cacheutils::CachingAddNLL::setAnalyticBarlowBeeston(bool flag) {
-    for (auto const& funci : pdfs_) {
-        if ( auto pdf = dynamic_cast<CMSHistErrorPropagator const*>(funci->pdf()); pdf != nullptr ) {
-            pdf->setAnalyticBarlowBeeston(flag);
-        }
-        if ( auto pdf = dynamic_cast<CMSHistSum const*>(funci->pdf()); pdf != nullptr ) {
-            pdf->setAnalyticBarlowBeeston(flag);
-        }
-
-    }
+  for (auto* hist : histErrorPropagators_) {
+    hist->setAnalyticBarlowBeeston(flag);
+  }
+  for (auto* hist : histSums_) {
+    hist->setAnalyticBarlowBeeston(flag);
+  }
 }
 
 cacheutils::CachingSimNLL::CachingSimNLL(RooSimultaneous *pdf, RooAbsData *data, const RooArgSet *nuis) :