[RF] Correcty syncronize integral objects for RooFit driver

guitargeek · Aug 10, 2021 · a0cdcdf · a0cdcdf
1 parent 95d064d
commit a0cdcdf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/roofit/roofitcore/inc/RooAbsPdf.h b/roofit/roofitcore/inc/RooAbsPdf.h
@@ -214,7 +214,11 @@ class RooAbsPdf : public RooAbsReal {
   }
   virtual Double_t getNorm(const RooArgSet* set=0) const ;
   inline const RooAbsReal* getIntegral(RooArgSet const& set) const {
-    if(!_norm) getVal(&set);
+    if(!_norm) {
+      syncNormalization(&set,true) ;
+      getVal(set);
+    }
+    assert(_norm != nullptr);
     return _norm;
   }
 

diff --git a/roofit/roofitcore/src/RooAbsCachedPdf.cxx b/roofit/roofitcore/src/RooAbsCachedPdf.cxx
@@ -100,6 +100,7 @@ Double_t RooAbsCachedPdf::getValV(const RooArgSet* nset) const
   Double_t value = cache->pdf()->getVal(nset) ;
 
   _value = value ;
+  _norm = cache->pdf()->_norm;
   return _value ;
 }
 

diff --git a/roofit/roofitcore/src/RooAbsPdf.cxx b/roofit/roofitcore/src/RooAbsPdf.cxx
@@ -3645,6 +3645,7 @@ void RooAbsPdf::computeBatch(double* output, size_t nEvents, rbc::DataMap& dataM
       output[i] *= oneOverNorm;
     }
   } else {
+    assert(integralSpan.size() == nEvents);
     for (std::size_t i=0; i < nEvents; ++i) {
       output[i] /= integralSpan[i];
     }