From e6035da6fa06d963265f1bcfd675db820df72653 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Fri, 3 Mar 2023 13:34:33 -0600 Subject: [PATCH 1/5] fix: Use workspace.get_measurement(measurement_name) * poi_name -> measurement_name --- book/SimpleWorkspace.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/SimpleWorkspace.ipynb b/book/SimpleWorkspace.ipynb index 038f97d..6b1f8a8 100644 --- a/book/SimpleWorkspace.ipynb +++ b/book/SimpleWorkspace.ipynb @@ -149,7 +149,7 @@ "metadata": {}, "outputs": [], "source": [ - "workspace.get_measurement(poi_name=\"mu\")" + "workspace.get_measurement(measurement_name=\"mu\")" ] }, { From b3dd317f3a498553a17b8bca0e239de6e11e59c8 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Fri, 3 Mar 2023 13:52:32 -0600 Subject: [PATCH 2/5] v0.7.0 doesn't support create measurement on the fly * c.f. https://pyhf.readthedocs.io/en/v0.6.3/_generated/pyhf.workspace.Workspace.html\#pyhf.workspace.Workspace.get_measurement --- book/SimpleWorkspace.ipynb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/book/SimpleWorkspace.ipynb b/book/SimpleWorkspace.ipynb index 6b1f8a8..681e687 100644 --- a/book/SimpleWorkspace.ipynb +++ b/book/SimpleWorkspace.ipynb @@ -136,22 +136,6 @@ "workspace.get_measurement(measurement_index=0)" ] }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Or create a new measurement on the fly by specifying the name for the parameter of interest:" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "workspace.get_measurement(measurement_name=\"mu\")" - ] - }, { "cell_type": "markdown", "metadata": {}, @@ -241,7 +225,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -255,7 +239,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.7" + "version": "3.10.4" } }, "nbformat": 4, From 2cb41053f0b0b9b57850accf231d2e2d05e74a27 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Fri, 3 Mar 2023 15:13:04 -0600 Subject: [PATCH 3/5] Fixup combined by passing model.config --- book/Combinations.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/Combinations.ipynb b/book/Combinations.ipynb index 10d9ad3..ca8c138 100644 --- a/book/Combinations.ipynb +++ b/book/Combinations.ipynb @@ -99,7 +99,7 @@ "print(f\" nbins: {combined_workspace.channel_nbins}\")\n", "print(f\" samples: {combined_workspace.samples}\")\n", "print(f\" modifiers: {combined_workspace.modifiers}\")\n", - "print(f\" parameters: {combined_workspace.parameters}\")\n", + "print(f\" parameters: {combined_workspace.model().config.parameters}\")\n", "print(f\"measurements: {combined_workspace.measurement_names}\")" ] }, From cfa3a84da76ca0b10655991c2b64e6b995a4c46d Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Fri, 3 Mar 2023 15:21:10 -0600 Subject: [PATCH 4/5] Use model.config to access parameters --- book/WorkspaceManipulations.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/WorkspaceManipulations.ipynb b/book/WorkspaceManipulations.ipynb index a28527d..68a8ab4 100644 --- a/book/WorkspaceManipulations.ipynb +++ b/book/WorkspaceManipulations.ipynb @@ -344,7 +344,7 @@ "print(f\" nbins: {ws.channel_nbins}\")\n", "print(f\" samples: {ws.samples}\")\n", "print(f\" modifiers: {ws.modifiers}\")\n", - "print(f\" parameters: {ws.parameters}\")\n", + "print(f\" parameters: {ws.model().config.parameters}\")\n", "print(f\"observations: {ws.observations}\")" ] }, From 7d50abafa21034597a2c1134ef4a08ae9a7e9d01 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 5 Mar 2023 18:46:23 -0600 Subject: [PATCH 5/5] remove model config parameters as notebooks focusing on workspace attributes --- book/Combinations.ipynb | 1 - book/WorkspaceManipulations.ipynb | 1 - 2 files changed, 2 deletions(-) diff --git a/book/Combinations.ipynb b/book/Combinations.ipynb index ca8c138..021341d 100644 --- a/book/Combinations.ipynb +++ b/book/Combinations.ipynb @@ -99,7 +99,6 @@ "print(f\" nbins: {combined_workspace.channel_nbins}\")\n", "print(f\" samples: {combined_workspace.samples}\")\n", "print(f\" modifiers: {combined_workspace.modifiers}\")\n", - "print(f\" parameters: {combined_workspace.model().config.parameters}\")\n", "print(f\"measurements: {combined_workspace.measurement_names}\")" ] }, diff --git a/book/WorkspaceManipulations.ipynb b/book/WorkspaceManipulations.ipynb index 68a8ab4..487beff 100644 --- a/book/WorkspaceManipulations.ipynb +++ b/book/WorkspaceManipulations.ipynb @@ -344,7 +344,6 @@ "print(f\" nbins: {ws.channel_nbins}\")\n", "print(f\" samples: {ws.samples}\")\n", "print(f\" modifiers: {ws.modifiers}\")\n", - "print(f\" parameters: {ws.model().config.parameters}\")\n", "print(f\"observations: {ws.observations}\")" ] },