centralize statsComputer retrieval

Author: WolfgangWaltenberger

smodels/matching/theoryPrediction.py

@@ -143,11 +143,8 @@ def setStatsComputer(self):
         to define a statistical computer (upper limit result or no expected
         upper limits), set the computer to 'N/A'.
         """
-        from smodels.base import runtime
-        if runtime._experimental["spey"]:
-            from smodels.statistics.speyTools import SpeyComputer as StatsComputer
-        else:
-            from smodels.statistics.statsTools import StatsComputer
+        from smodels.statistics.statsTools import getStatsComputerModule
+        StatsComputer = getStatsComputerModule()
 
         if self.dataType() == "upperLimit":
             from smodels.base.runtime import experimentalFeature
@@ -527,11 +524,8 @@ def setStatsComputer(self):
         if any(tp.statsComputer == 'N/A' for tp in self.theoryPredictions):
             computer = 'N/A'
         else:
-            from smodels.base import runtime
-            if runtime._experimental["spey"]:
-                from smodels.statistics.speyTools import SpeyComputer as StatsComputer
-            else:
-                from smodels.statistics.statsTools import StatsComputer
+            from smodels.statistics.statsTools import getStatsComputerModule
+            StatsComputer = getStatsComputerModule()
             computer = StatsComputer.forAnalysesComb(self.theoryPredictions, self.deltas_rel)
 
         self._statsComputer = computer

smodels/statistics/statsTools.py

@@ -10,7 +10,7 @@
 
 """
 
-__all__ = [ "StatsComputer" ]
+__all__ = [ "StatsComputer", "getStatsComputerModule" ]
 
 from typing import Union, Text, Dict, List
 from smodels.statistics.exceptions import SModelSStatisticsError as SModelSError
@@ -23,6 +23,17 @@
 from smodels.experiment.datasetObj import DataSet,CombinedDataSet
 from typing import Union, Text
 
+def getStatsComputerModule():
+    """ very single convenience function to centralize
+    switching between our stats code and spey. """
+    from smodels.base import runtime
+    if runtime._experimental["spey"]:
+        from smodels.statistics.speyTools import SpeyComputer as StatsComputer
+        return StatsComputer
+    else:
+        from smodels.statistics.statsTools import StatsComputer
+        return StatsComputer
+
 class StatsComputer:
     __slots__ = [ "nsig", "dataObject", "dataType", "likelihoodComputer", "data",
                   "upperLimitComputer", "deltas_sys", "allowNegativeSignals" ]