last minute fixes

Author: WolfgangWaltenberger

docs/manual/source/recipes/combinationsmatrix.ipynb

@@ -38,6 +38,7 @@
     "from smodels.base.physicsUnits import fb\n",
     "from smodels.share.models.mssm import BSMList\n",
     "from smodels.share.models.SMparticles import SMList\n",
+    "from smodels.statistics.basicStats import observed,apriori\n",
     "from smodels.base.model import Model"
    ]
   },
@@ -160,42 +161,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "[('ATLAS-SUSY-2018-41', 'r_exp=', 0.869),\n",
-       " ('CMS-SUS-21-002', 'r_exp=', 1.158),\n",
-       " ('ATLAS-SUSY-2019-08', 'r_exp=', 0.96)]"
-      ]
-     },
-     "execution_count": 9,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "# let's have a quick look at the predictions, and the (expected) r-values\n",
-    "[ (x.dataset.globalInfo.id, \"r_exp=\", round(x.getRValue(expected=True),3)) for x in predictions ]"
+    "[ (x.dataset.globalInfo.id, \"r_exp=\", round(x.getRValue(evaluationType=apriori),3)) for x in predictions ]"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "can I combine ATLAS-SUSY-2018-41 with CMS-SUS-21-002? yes\n",
-      "can I combine ATLAS-SUSY-2018-41 with ATLAS-SUSY-2019-08? yes\n",
-      "can I combine CMS-SUS-21-002 with ATLAS-SUSY-2019-08? yes\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "for i,pr1 in enumerate(predictions[:-1]):\n",
     "    id1 = pr1.dataset.globalInfo.id\n",
@@ -214,7 +192,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -225,23 +203,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1.674"
-      ]
-     },
-     "execution_count": 12,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "# the combined expected r value must be above the individual expected r-values\n",
-    "round(combiner.getRValue(expected=True),3)"
+    "round(combiner.getRValue(evaluationType=apriori),3)"
    ]
   },
   {
@@ -268,9 +235,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.13.3"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }

smodels/statistics/pyhfInterface.py

@@ -716,7 +716,7 @@ def likelihood( self, mu : float = 1.0,
                 logger.error(f"pyhf fixed_poi_fit failed for {list(self.data.jsonFiles)[workspace_index]} for mu={mu}: {e}")
                 # lets try with different initialisation
                 init, n_ = pyhf.infer.mle.fixed_poi_fit(
-                    0.0, workspace.data(model), model, return_fitted_val=True, maxiter=200
+                    0.0, data, model, return_fitted_val=True, maxiter=200
                 )
                 initpars = init.tolist()
                 initpars[model.config.poi_index] = 1.