Make combineCreateNLL available in Python via utility class

Author: guitargeek

interface/Combine.h

@@ -7,6 +7,8 @@
 #include "RooAbsReal.h"
 #include "RooRealVar.h"
 
+#include "CombineUtils.h"
+
 class TDirectory;
 class TTree;
 class LimitAlgo;
@@ -123,10 +125,4 @@ class Combine {
   static std::string  textToWorkspaceString_;
 };
 
-std::unique_ptr<RooAbsReal> combineCreateNLL(RooAbsPdf &pdf,
-                                             RooAbsData &data,
-                                             RooArgSet const *constraint = nullptr,
-                                             bool offset = false,
-                                             bool warnAboutDifferentBackend = true);
-
 #endif

interface/CombineUtils.h

@@ -0,0 +1,22 @@
+#ifndef HiggsAnalysis_CombinedLimit_CombineUtils_h
+#define HiggsAnalysis_CombinedLimit_CombineUtils_h
+
+std::unique_ptr<RooAbsReal> combineCreateNLL(RooAbsPdf& pdf,
+                                             RooAbsData& data,
+                                             RooArgSet const* constraint = nullptr,
+                                             bool offset = false,
+                                             bool warnAboutDifferentBackend = true);
+
+// Class that makes the utility functions also available in Python (adding classes to the dictionaries is less brittle than adding functions)
+class CombineUtils {
+public:
+  static std::unique_ptr<RooAbsReal> combineCreateNLL(RooAbsPdf& pdf,
+                                                      RooAbsData& data,
+                                                      RooArgSet const* constraint = nullptr,
+                                                      bool offset = false,
+                                                      bool warnAboutDifferentBackend = true) {
+    return ::combineCreateNLL(pdf, data, constraint, offset, warnAboutDifferentBackend);
+  }
+};
+
+#endif

python/tool_base/FastScan.py

@@ -57,7 +57,7 @@ def run_method(self):
                 data = f_d.Get(ws_d[1])
             else:
                 data = f_d.Get(ws_d[1]).data(ws_d[2])
-        nll = ROOT.combineCreateNLL(pdf, data)
+        nll = ROOT.CombineUtils.combineCreateNLL(pdf, data)
         pars = pdf.getParameters(data)
         pars.Print()
         snap = pars.snapshot()

python/tool_base/TaylorExpand.py

@@ -186,7 +186,7 @@ def load_workspace(self, file, POIs, data="data_obs", snapshot="MultiDimFit"):
         mc = self.loaded_wsp.genobj("ModelConfig")
         pdf = mc.GetPdf()
         data = self.loaded_wsp.data(data)
-        self.nll = ROOT.combineCreateNLL(pdf, data)
+        self.nll = ROOT.CombineUtils.combineCreateNLL(pdf, data)
         self.loaded_wsp.loadSnapshot("MultiDimFit")
         print("...NLL loaded")
         # nll.Print()

src/classes.h

@@ -63,3 +63,4 @@
 #include "HiggsAnalysis/CombinedLimit/interface/RooEFTScalingFunction.h"
 
 #include "HiggsAnalysis/CombinedLimit/interface/CombineCodegenImpl.h"
+#include "HiggsAnalysis/CombinedLimit/interface/CombineUtils.h"

src/classes_def.xml

@@ -220,4 +220,5 @@
   <class name="RooSumTwoExpPdf" />
   <class name="RooPowerLawPdf" />
   <class name="RooSumTwoPowerLawPdf" />
+  <class name="CombineUtils" />
 </lcgdict>