prepare v1.9.7.6

OstapHEP · Mar 23, 2023 · 16866c8 · 16866c8
1 parent 53e2d57
commit 16866c8
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(CTest)
 set(OSTAP_VERSION_MAJOR 1)
 set(OSTAP_VERSION_MINOR 9)
 set(OSTAP_VERSION_PATCH 7)
-set(OSTAP_VERSION_TWEAK 5)
+set(OSTAP_VERSION_TWEAK 6)
 
 set(OSTAP_VERSION ${OSTAP_VERSION_MAJOR}.${OSTAP_VERSION_MINOR}.${OSTAP_VERSION_PATCH}.${OSTAP_VERSION_TWEAK})
 

diff --git a/ReleaseNotes/release_notes.md b/ReleaseNotes/release_notes.md
@@ -1,3 +1,4 @@
+# v1.9.7.6
 
 ## New features:
 
@@ -7,6 +8,8 @@
 
 ## Bug fixes:
 
+  1. set of tiny fixes for several 2D&3D-fit models 
+
 # v1.9.7.4
 
 ## New features:

diff --git a/ReleaseNotes/v1.9.7.6.md b/ReleaseNotes/v1.9.7.6.md
@@ -0,0 +1,12 @@
+# v1.9.7.6
+
+## New features:
+
+  1. fix `Ostap::Math::WMoment_` - zero weigths are totally ignored 
+
+## Backward incompatible: 
+
+## Bug fixes:
+
+  1. set of tiny fixes for several 2D&3D-fit models 
+
diff --git a/ostap/fitting/background.py b/ostap/fitting/background.py
@@ -2650,31 +2650,31 @@ def __init__ ( self           ,
 
     @property
     def data   ( self ) :
-        """``data'' : the actual data set for RooNDKeysPdf"""
+        """`data' : the actual data set for RooNDKeysPdf"""
         return self.__data
     @property
     def options ( self ) :
-        """``options'' : ``options'' string for RooNDKeysPdf"""
+        """`options' : `options' string for RooNDKeysPdf"""
         return self.__options        
     @property
     def rho    ( self )  :
-        """``rho'' : ``rho'' parameter for RooNDKeysPdf"""
+        """`rho' : `rho' parameter for RooNDKeysPdf"""
         return self.__rho 
     @property
     def rotate    ( self )  :
-        """``rotate'' : ``rotate'' flag for RooNDKeysPdf"""
+        """`rotate' : `rotate' flag for RooNDKeysPdf"""
         return self.__rotate
     @property
     def sort      ( self )  :
-        """``sort'' : ``sort'' flag for RooNDKeysPdf"""
+        """`sort' : `sort' flag for RooNDKeysPdf"""
         return self.__sort 
     @property
     def nsigma    ( self )  :
-        """``nsigma'' : ``nsigma'' parameter for RooNDKeysPdf"""
+        """`nsigma' : `nsigma' parameter for RooNDKeysPdf"""
         return self.__nsigma
 
 # =============================================================================
-## create popular 1D ``background''  function
+## create popular 1D `background'  function
 #  @param bkg  the type of background function/PDF
 #  @param name the name of background function/PDF
 #  @param xvar the observable

diff --git a/ostap/fitting/fit1d.py b/ostap/fitting/fit1d.py
@@ -557,7 +557,10 @@ def __init__ ( self            ,
         assert isinstance ( order, integer_types ) and 0 <= order ,\
                'Invalid interpolation order: %s/%s' % ( order , type ( order ) )
 
-        self.__ds = H1D_dset ( histo , xvar = xvar , density = density ,  silent = silent )
+        self.__ds = H1D_dset ( histo             ,
+                               xaxis   = xvar    ,
+                               density = density ,
+                               silent  = silent  )
 
         PDF1    .__init__ ( self , name  , self.ds.xaxis ) 
 
@@ -585,7 +588,6 @@ def __init__ ( self            ,
             'order'   : self.order   ,
             }
 
-
     @property
     def ds ( self ) :
         """'ds' : the H1D_dset object"""

diff --git a/ostap/fitting/fit2d.py b/ostap/fitting/fit2d.py
@@ -313,7 +313,11 @@ def __init__ ( self            ,
         assert isinstance ( order, integer_types ) and 0 <= order ,\
                'Invalid interpolation order: %s/%s' % ( order , type ( order ) )
 
-        self.__ds = H2D_dset ( histo , xvar = xvar , yvar = yvar , density = density ,  silent = silent )
+        self.__ds = H2D_dset ( histo             ,
+                               xaxis   = xvar    ,
+                               yaxis   = yvar    , 
+                               density = density ,  
+                               silent  = silent  )
 
         PDF2    .__init__ ( self , name  , self.ds.xaxis , self.ds.yaxis ) 
 

diff --git a/ostap/fitting/fit3d.py b/ostap/fitting/fit3d.py
@@ -333,8 +333,12 @@ def __init__ ( self            ,
         assert isinstance ( order, integer_types ) and 0 <= order ,\
                'Invalid interpolation order: %s/%s' % ( order , type ( order ) )
 
-        self.__ds = H3D_dset ( histo , xvar = xvar , yvar = yvar , zvar = zvar ,
-                               density = density ,  silent = silent )
+        self.__ds = H3D_dset ( histo ,
+                               xaxis   = xvar    ,
+                               yaxis   = yvar    ,
+                               zaxis   = zvar    ,
+                               density = density ,
+                               silent  = silent  )
 
         PDF3    .__init__ ( self , name = name  ,
                             xvar = self.ds.xvar ,

diff --git a/ostap/fitting/models_2d.py b/ostap/fitting/models_2d.py
@@ -1678,16 +1678,16 @@ def __init__ ( self           ,
         PDF2.__init__ (  self , name , xvar , yvar )
 
         self.__data    = data
-        self.__options = mirror
+        self.__options = options 
         self.__rho     = rho 
         self.__options = options 
         self.__nsigma  = nsigma 
         self.__rotate  = True if rotate else False 
         self.__sort    = True if sort   else False 
 
         self.__keys_vlst = ROOT.RooArgList()
-        self.__keys_vlst.Add ( self.xvar )
-        self.__keys_vlst.Add ( self.yvar )
+        self.__keys_vlst.add ( self.xvar )
+        self.__keys_vlst.add ( self.yvar )
 
         ## create PDF
         self.pdf = ROOT.RooNDKeysPdf (
@@ -1721,7 +1721,7 @@ def data   ( self ) :
     @property
     def options ( self ) :
         """'options' : 'options'-string for RooNDKeysPdf"""
-        return self.__mirror        
+        return self.__options        
     @property
     def rho    ( self )  :
         """'rho' :  'rho'-parameter for RooNDKeysPdf"""

diff --git a/ostap/fitting/models_3d.py b/ostap/fitting/models_3d.py
@@ -778,17 +778,17 @@ def __init__ ( self           ,
         PDF3.__init__ (  self , name , xvar , yvar , zvar )
 
         self.__data    = data
-        self.__options = mirror
+        self.__options = options 
         self.__rho     = rho 
         self.__options = options 
         self.__nsigma  = nsigma 
         self.__rotate  = True if rotate else False 
         self.__sort    = True if sort   else False 
 
         self.__keys_vlst = ROOT.RooArgList()
-        self.__keys_vlst.Add ( self.xvar )
-        self.__keys_vlst.Add ( self.yvar )
-        self.__keys_vlst.Add ( self.zvar )
+        self.__keys_vlst.add ( self.xvar )
+        self.__keys_vlst.add ( self.yvar )
+        self.__keys_vlst.add ( self.zvar )
 
         ## create PDF
         self.pdf = ROOT.RooNDKeysPdf (
@@ -823,7 +823,7 @@ def data   ( self ) :
     @property
     def options ( self ) :
         """'options' : 'ootions' string for RooNDKeysPdf"""
-        return self.__mirror        
+        return self.__options 
     @property
     def rho    ( self )  :
         """'rho' : 'rho' parameter for RooNDKeysPdf"""