[RF] Enable the new BatchMode by default to see what still fails

root-project · Oct 25, 2022 · 6a5d2f1 · 6a5d2f1
1 parent a4ddea0
commit 6a5d2f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx b/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx
@@ -289,6 +289,14 @@ void RooAbsOptTestStatistic::initSlave(RooAbsReal& real, RooAbsData& indata, con
     if(auto pdfClone = dynamic_cast<RooAbsPdf*>(_funcClone)) {
        pdfClone->setNormRange(rangeName);
     }
+    // set the normRange for all the PDFs in the computation graph
+    //RooArgList nodeList;
+    //_funcClone->treeNodeServerList(&nodeList);
+    //for(RooAbsArg * node : nodeList) {
+        //if(auto nodePdf = dynamic_cast<RooAbsPdf*>(node)) {
+            //nodePdf->setNormRange(rangeName);
+        //}
+    //}
 
     // Print warnings if the requested ranges are not available for the observable
     for (const auto arg : *_funcObsSet) {

diff --git a/roofit/roofitcore/src/RooAbsPdf.cxx b/roofit/roofitcore/src/RooAbsPdf.cxx
@@ -1016,7 +1016,7 @@ RooAbsReal* RooAbsPdf::createNLL(RooAbsData& data, const RooLinkedList& cmdList)
   pc.defineSet("glObs","GlobalObservables",0,0) ;
   pc.defineInt("doOffset","OffsetLikelihood",0,0) ;
   pc.defineSet("extCons","ExternalConstraints",0,0) ;
-  pc.defineInt("BatchMode", "BatchMode", 0, 0);
+  pc.defineInt("BatchMode", "BatchMode", 0, 1);
   pc.defineDouble("IntegrateBins", "IntegrateBins", 0, -1.);
   pc.defineMutex("Range","RangeWithName") ;
   pc.defineMutex("GlobalObservables","GlobalObservablesTag") ;