cont evaltype

Author: WolfgangWaltenberger

smodels/statistics/speyTools.py

@@ -324,7 +324,7 @@ def translateExpectationType ( cls, expected : NllEvalType ) -> ExpectationType:
                          aposteriori: ExpectationType.aposteriori}
         if expected in expectedDict:
             return expectedDict[expected]
-        logger.error('%s is not a valid expectation type. Possible expectation types are True (observed), False (apriori) and "posteriori".' %expected)
+        logger.error( f'{expected} is not a valid expectation type. Possible expectation types are True (observed), False (apriori) and "posteriori".' )
         return None
 
     def get_five_values ( self, expected : NllEvalType,
@@ -413,7 +413,7 @@ def getBestCombinationIndex(self, data ):
                 logger.debug( f"Workspace number {i_ws} has zero signals" )
                 continue
             else:
-                ul = self.poi_upper_limit(expected=True, model_index=i_ws)
+                ul = self.poi_upper_limit(expected=apriori, model_index=i_ws)
             if ul == None:
                 continue
             if ul < ulMin:

smodels/tools/caching.py

@@ -15,6 +15,7 @@
 
 import numpy as np
 from collections.abc import Iterable
+from smodels.statistics.basicStats import observed, apriori, aposteriori, NllEvalType
 from functools import lru_cache, wraps
 
 def roundObj(obj, digits : int):
@@ -63,13 +64,13 @@ class TestCase:
         def __init__ ( self ):
             self.bla = 0
         @roundCache(argname='mu',argpos=1,digits=5)
-        def myfunc ( self, mu : float = 0., expected : Union[Text,bool] = False,
+        def myfunc ( self, mu : float = 0., expected : NllEvalType = observed,
                          asimov : Union[None,float] = None ):
             print ( "calling myfunc" )
             ret = mu
-            if expected == True:
+            if expected == apriori:
                 ret += 10.
-            if expected == "posteriori":
+            if expected == aposteriori:
                 ret += 20.
             if asimov != None:
                 ret += 1000.*(asimov+1000.)
@@ -83,7 +84,7 @@ def myfunc ( self, mu : float = 0., expected : Union[Text,bool] = False,
     print ( test.myfunc ( 1. ) )
     print ( test.myfunc ( mu=1. ) )
     print ( test.myfunc ( mu=1. ) )
-    print ( test.myfunc ( 1.,expected=True, asimov=0. ) )
-    print ( test.myfunc ( 1.,expected=True, asimov=0. ) )
-    print ( test.myfunc ( 1.,True, asimov=0. ) )
-    print ( test.myfunc ( 1.,True, asimov=0. ) )
+    print ( test.myfunc ( 1.,expected=apriori, asimov=0. ) )
+    print ( test.myfunc ( 1.,expected=apriori, asimov=0. ) )
+    print ( test.myfunc ( 1.,apriori, asimov=0. ) )
+    print ( test.myfunc ( 1.,apriori, asimov=0. ) )