From 6a5d2f1383699b0e1a686bda96452abc1da57d2a Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Wed, 21 Sep 2022 11:40:41 +0200 Subject: [PATCH] [RF] Enable the new BatchMode by default to see what still fails --- roofit/roofitcore/src/RooAbsOptTestStatistic.cxx | 8 ++++++++ roofit/roofitcore/src/RooAbsPdf.cxx | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx b/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx index 909c0d37b61a3..728e7da82a10d 100644 --- 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(_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(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 index 5a99cbd747e74..d687cd9840a28 100644 --- 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") ;