Small changes in experimentalFeatures

smodels/matching/modelTester.py

@@ -178,7 +178,10 @@ def testPoint(inputFile, outputDir, parser, database):
             useBest = False
     except (NoSectionError, NoOptionError):
         pass
-    setExperimentalFeatures( parser )
+
+    if parser.has_section ( "experimentalFeatures" ):
+        featuresDict = dict(parser.items("experimentalFeatures"))
+        setExperimentalFeatures( featuresDict )
 
     allPredictions = theoryPredictionsFor(database, smstoplist,
                                           useBestDataset=useBest,
@@ -526,7 +529,11 @@ def getParameters(parameterFile):
     if ret == []:
         logger.error("No such file or directory: '%s'" % parameterFile)
         sys.exit()
-    setExperimentalFeatures(parser)
+
+    if parser.has_section ( "experimentalFeatures" ):
+        featuresDict = dict(parser.items("experimentalFeatures"))
+        setExperimentalFeatures(featuresDict)
+
     try:
         runtime.modelFile = parser.get("particles", "model")
     except:
@@ -540,15 +547,14 @@ def getParameters(parameterFile):
     return parser
 
 
-def setExperimentalFeatures(parser):
+def setExperimentalFeatures(featuresDict):
     """ set the experimental features flats, if experimentalFeatures:* = True """
-    if not parser.has_section ( "experimentalFeatures" ):
-        return
-    for feature in dict(parser.items("experimentalFeatures")).keys():
+
+    for feature in featuresDict.keys():
         if not feature in runtime._experimental:
             logger.warning ( f"'{feature}' is not a known experimental feature. will ignore." )
             continue
-        flag = parser.getboolean ( "experimentalFeatures", feature )
+        flag = bool(featuresDict[feature])
         runtime._experimental[feature]=flag
 
 def getAllInputFiles(inFile):

smodels/statistics/pyhfInterface.py

@@ -675,7 +675,7 @@ def likelihood( self, mu=1.0, workspace_index=None, return_nll=False,
             compute a priori expected, if "posteriori" compute posteriori \
             expected
         """
-        if True and workspace_index in self.data.cached_likelihoods[expected] and \
+        if workspace_index in self.data.cached_likelihoods[expected] and \
                 mu in self.data.cached_likelihoods[expected][workspace_index]:
             return self.data.cached_likelihoods[expected][workspace_index][mu]