improve assigment of S,B,F,C-properties for 1D-fits

OstapHEP · Dec 17, 2018 · 999a761 · 999a761
1 parent be8d76c
commit 999a761
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/ostap/fitting/basic.py b/ostap/fitting/basic.py
@@ -2291,7 +2291,8 @@ def S (  self , value ) :
         for s , v in zip ( ss , value ) :
 
             vv = float ( v  )
-            if not vv in ss : logger.warning("Value %s is outside the allowed region %s"  % ( value , s.minmax() ) ) 
+            if s.minmax() and not vv in s :
+                logger.error ("Value %s is outside the allowed region %s"  % ( vv , s.minmax() ) ) 
             s.setVal   ( vv ) 
 
     @property
@@ -2328,7 +2329,8 @@ def B (  self , value ) :
         for s , v in zip ( ss , value ) :
 
             vv = float ( v  )
-            if not vv in ss : logger.warning("Value %s is outside the allowed region %s"  % ( value , s.minmax() ) ) 
+            if s.minmax() and not vv in s :
+                logger.error ("Value %s is outside the allowed region %s"  % ( vv  , s.minmax() ) ) 
             s.setVal   ( vv ) 
 
     @property
@@ -2364,7 +2366,8 @@ def C (  self , value ) :
         for s , v in zip ( ss , value ) :
 
             vv = float ( v  )
-            if not vv in ss : logger.warning("Value %s is outside the allowed region %s"  % ( value , s.minmax() ) ) 
+            if s.minmax() and not vv in s :
+                logger.error("Value %s is outside the allowed region %s"  % ( vv , s.minmax() ) ) 
             s.setVal   ( vv ) 
 
     @property 
@@ -2394,10 +2397,10 @@ def F (  self , value ) :
         for s , v in zip ( ss , value ) :
 
             vv = float ( v  )
-            if not vv in ss : logger.warning("Value %s is outside the allowed region %s"  % ( value , s.minmax() ) ) 
+            if s.minmax() and not vv in s :
+                logger.error ("Value %s is outside the allowed region %s"  % ( vv , s.minmax() ) ) 
             s.setVal   ( vv ) 
 
-
     @property
     def  yields    ( self ) :
         """The list/tuple of the yields of all numeric components (empty for non-extended fit)"""

diff --git a/ostap/fitting/utils.py b/ostap/fitting/utils.py
@@ -621,13 +621,13 @@ def phis ( self , values ) :
         elif isinstance ( values , ROOT.RooArgList    ) : pass
         else :
             raise TypeError("Unknown type for ``values'' %s/%s" % (  values , type ( values ) ) )
-
+
+        for s , v in  zip ( self.__phis , values ) :
+            vv = float ( v  )
+            if s.minmax() and not vv in s :
+                logger.error ("Value %s is outside the allowed region %s"  % ( vv , s.minmax() ) )                 
+            s.setVal   ( vv )
         nphi = len ( self.__phis )
-        iphi = 0
-        for v in values :
-            if iphi < nphi :
-                self.__phis[iphi].setVal ( float ( v ) )
-            iphi +=1 
 
     @property
     def phi_list ( self ) :