fix ?

OstapHEP · Jun 24, 2024 · 30b2f28 · 30b2f28
1 parent 12162dc
commit 30b2f28
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/ostap/fitting/pdfbasic.py b/ostap/fitting/pdfbasic.py
@@ -1296,6 +1296,10 @@ def nll ( self            ,
         sf   = dataset.sFactor() 
 
         self.debug ( 'nll: createNLL args: %s'% list ( opts ) )
+
+        if ( 6 , 32 ) <= root_info :
+            return Ostap.MoreRooFit.createNLL ( self.pdf , dataset , *opts ), sF 
+
         if len ( opts ) < 8 and root_info < ( 6 , 29 ) : 
             return self.pdf.createNLL ( dataset , *opts   ) , sf
         else :

diff --git a/source/include/Ostap/MoreRooFit.h b/source/include/Ostap/MoreRooFit.h
@@ -3158,7 +3158,15 @@ namespace Ostap
     ( RooAbsPdf&           model   , 
       RooAbsData&          data    , 
       const RooLinkedList& opts    ) ;
+    // ========================================================================
+    RooAbsReal*
+    createNLL
+    ( RooAbsPdf&           model   ,
+      RooAbsData&          data    ,
+      const RooLinkedList& opts    ) ;
+    // =======================================================================
 #if ROOT_VERSION(6,32,0)<=ROOT_VERSION_CODE
+    // =======================================================================
     template <typename... CmdArgs_t>
     RooFit::OwningPtr<RooFitResult> fitTo
     ( RooAbsPdf&           model   ,
@@ -3167,6 +3175,16 @@ namespace Ostap
     {
       return model.fitTo(data, cmdArgs... ) ;
     }
+    // =======================================================================
+    template <typename... CmdArgs_t>
+    RooFit::OwningPtr<RooAbsReal> createNLL
+    ( RooAbsPdf&           model   ,
+      RooAbsData&          data    ,
+      CmdArgs_t const&...  cmdArgs )
+    {
+      return model.createNLL ( data , cmdArgs... ) ;
+    }
+    // ========================================================================
 #endif
     // ========================================================================
   } //                                   The end of namespace Ostap::MoreRooFit  

diff --git a/source/src/MoreRooFit.cpp b/source/src/MoreRooFit.cpp
@@ -1652,6 +1652,15 @@ Ostap::MoreRooFit::fitTo
   const RooLinkedList& opts  )
 { return model.fitTo ( data , opts ) ; }
 // ============================================================================
+// helper function to call RooAbsPdf::createNLL( data , options ) 
+// ============================================================================
+RooAbsReal* 
+Ostap::MoreRooFit::createNLL
+( RooAbsPdf&           model , 
+  RooAbsData&          data  , 
+  const RooLinkedList& opts  )
+{ return model.createNLL ( data , opts ) ; }
+// ============================================================================
 
 
 // ============================================================================