Skip to content
This repository has been archived by the owner on Nov 12, 2019. It is now read-only.

Commit

Permalink
fix needpalt in asymptotic and frequentist calculator
Browse files Browse the repository at this point in the history
  • Loading branch information
@marinang
marinang committed Mar 19, 2019
1 parent 292290a commit 41ad073
Show file tree
Hide file tree
Showing 8 changed files with 212 additions and 212 deletions.
118 changes: 59 additions & 59 deletions examples/notebooks/confidence_interval_zfit_asy.ipynb
View file

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions examples/notebooks/confidence_interval_zfit_freq.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@
"text/html": [
"<table>\n",
" <tr>\n",
" <td title=\"Minimum value of function\">FCN = -2349.867004881766</td>\n",
" <td title=\"Minimum value of function\">FCN = -2349.8670049041853</td>\n",
" <td title=\"Total number of call to FCN so far\">TOTAL NCALL = 143</td>\n",
" <td title=\"Number of call in last migrad\">NCALLS = 143</td>\n",
" </tr>\n",
" <tr>\n",
" <td title=\"Estimated distance to minimum\">EDM = 1.0085887245090498e-05</td>\n",
" <td title=\"Estimated distance to minimum\">EDM = 1.006588270353107e-05</td>\n",
" <td title=\"Maximum EDM definition of convergence\">GOAL EDM = 5e-06</td>\n",
" <td title=\"Error def. Amount of increase in FCN to be defined as 1 standard deviation\">\n",
" UP = 0.5</td>\n",
Expand Down Expand Up @@ -186,7 +186,7 @@
"text/html": [
"<table>\n",
" <tr>\n",
" <td><a href=\"#\" onclick=\"$('#kxqOHpaxjM').toggle()\">+</a></td>\n",
" <td><a href=\"#\" onclick=\"$('#GvICnyGyLt').toggle()\">+</a></td>\n",
" <td title=\"Variable name\">Name</td>\n",
" <td title=\"Value of parameter\">Value</td>\n",
" <td title=\"Hesse error\">Hesse Error</td>\n",
Expand All @@ -209,64 +209,64 @@
" </tr>\n",
" <tr>\n",
" <td>1</td>\n",
" <td>Nbkg</td>\n",
" <td>416.004</td>\n",
" <td>22.6419</td>\n",
" <td>Nsig</td>\n",
" <td>73.9468</td>\n",
" <td>13.1715</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0</td>\n",
" <td>539</td>\n",
" <td>490</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
" <td>2</td>\n",
" <td>lambda</td>\n",
" <td>-1.94353</td>\n",
" <td>0.119192</td>\n",
" <td>Nbkg</td>\n",
" <td>416.003</td>\n",
" <td>22.6729</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>-4</td>\n",
" <td>-1</td>\n",
" <td>0</td>\n",
" <td>539</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
" <td>3</td>\n",
" <td>Nsig</td>\n",
" <td>73.9468</td>\n",
" <td>13.1632</td>\n",
" <td>lambda</td>\n",
" <td>-1.94354</td>\n",
" <td>0.11921</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0</td>\n",
" <td>490</td>\n",
" <td>-4</td>\n",
" <td>-1</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
" <td>4</td>\n",
" <td>sigma</td>\n",
" <td>0.099556</td>\n",
" <td>0.020796</td>\n",
" <td>0.0208015</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0.02</td>\n",
" <td>0.2</td>\n",
" <td>No</td>\n",
" </tr>\n",
"</table>\n",
"<pre id=\"kxqOHpaxjM\" style=\"display:none;\">\n",
"<pre id=\"GvICnyGyLt\" style=\"display:none;\">\n",
"<textarea rows=\"16\" cols=\"50\" onclick=\"this.select()\" readonly>\n",
"\\begin{tabular}{|c|r|r|r|r|r|r|r|c|}\n",
"\\hline\n",
" & Name & Value & Hesse Error & Minos Error- & Minos Error+ & Limit- & Limit+ & Fixed?\\\\\n",
"\\hline\n",
"0 & mean & 1.20665 & 0.0178914 & & & 0.5 & 2 & No\\\\\n",
"\\hline\n",
"1 & Nbkg & 416.004 & 22.6419 & & & 0.0 & 539 & No\\\\\n",
"1 & Nsig & 73.9468 & 13.1715 & & & 0.0 & 490 & No\\\\\n",
"\\hline\n",
"2 & $\\lambda$ & -1.94353 & 0.119192 & & & -4.0 & -1 & No\\\\\n",
"2 & Nbkg & 416.003 & 22.6729 & & & 0.0 & 539 & No\\\\\n",
"\\hline\n",
"3 & Nsig & 73.9468 & 13.1632 & & & 0.0 & 490 & No\\\\\n",
"3 & $\\lambda$ & -1.94354 & 0.11921 & & & -4.0 & -1 & No\\\\\n",
"\\hline\n",
"4 & $\\sigma$ & 0.099556 & 0.020796 & & & 0.019999999552965164 & 0.2 & No\\\\\n",
"4 & $\\sigma$ & 0.099556 & 0.0208015 & & & 0.019999999552965164 & 0.2 & No\\\\\n",
"\\hline\n",
"\\end{tabular}\n",
"</textarea>\n",
Expand Down Expand Up @@ -373,12 +373,12 @@
"text/html": [
"<table>\n",
" <tr>\n",
" <td title=\"Minimum value of function\">FCN = -2349.86700957008</td>\n",
" <td title=\"Minimum value of function\">FCN = -2349.8670095791567</td>\n",
" <td title=\"Total number of call to FCN so far\">TOTAL NCALL = 62</td>\n",
" <td title=\"Number of call in last migrad\">NCALLS = 62</td>\n",
" </tr>\n",
" <tr>\n",
" <td title=\"Estimated distance to minimum\">EDM = 5.392168629899614e-06</td>\n",
" <td title=\"Estimated distance to minimum\">EDM = 5.384371610102798e-06</td>\n",
" <td title=\"Maximum EDM definition of convergence\">GOAL EDM = 5e-06</td>\n",
" <td title=\"Error def. Amount of increase in FCN to be defined as 1 standard deviation\">\n",
" UP = 0.5</td>\n",
Expand Down Expand Up @@ -424,7 +424,7 @@
"text/html": [
"<table>\n",
" <tr>\n",
" <td><a href=\"#\" onclick=\"$('#WJrucxuPug').toggle()\">+</a></td>\n",
" <td><a href=\"#\" onclick=\"$('#JoGdIUIyzq').toggle()\">+</a></td>\n",
" <td title=\"Variable name\">Name</td>\n",
" <td title=\"Value of parameter\">Value</td>\n",
" <td title=\"Hesse error\">Hesse Error</td>\n",
Expand All @@ -438,7 +438,7 @@
" <td>0</td>\n",
" <td>mean</td>\n",
" <td>1.20658</td>\n",
" <td>0.0178856</td>\n",
" <td>0.0178857</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0.5</td>\n",
Expand All @@ -447,35 +447,35 @@
" </tr>\n",
" <tr>\n",
" <td>1</td>\n",
" <td>Nbkg</td>\n",
" <td>416.004</td>\n",
" <td>22.6886</td>\n",
" <td>Nsig</td>\n",
" <td>73.9468</td>\n",
" <td>13.172</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0</td>\n",
" <td>539</td>\n",
" <td>490</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
" <td>2</td>\n",
" <td>lambda</td>\n",
" <td>-1.94354</td>\n",
" <td>0.119207</td>\n",
" <td>Nbkg</td>\n",
" <td>416.003</td>\n",
" <td>22.6865</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>-4</td>\n",
" <td>-1</td>\n",
" <td>0</td>\n",
" <td>539</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
" <td>3</td>\n",
" <td>Nsig</td>\n",
" <td>73.9468</td>\n",
" <td>13.171</td>\n",
" <td>lambda</td>\n",
" <td>-1.94354</td>\n",
" <td>0.119207</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0</td>\n",
" <td>490</td>\n",
" <td>-4</td>\n",
" <td>-1</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
Expand All @@ -490,19 +490,19 @@
" <td>No</td>\n",
" </tr>\n",
"</table>\n",
"<pre id=\"WJrucxuPug\" style=\"display:none;\">\n",
"<pre id=\"JoGdIUIyzq\" style=\"display:none;\">\n",
"<textarea rows=\"16\" cols=\"50\" onclick=\"this.select()\" readonly>\n",
"\\begin{tabular}{|c|r|r|r|r|r|r|r|c|}\n",
"\\hline\n",
" & Name & Value & Hesse Error & Minos Error- & Minos Error+ & Limit- & Limit+ & Fixed?\\\\\n",
"\\hline\n",
"0 & mean & 1.20658 & 0.0178856 & & & 0.5 & 2 & No\\\\\n",
"0 & mean & 1.20658 & 0.0178857 & & & 0.5 & 2 & No\\\\\n",
"\\hline\n",
"1 & Nbkg & 416.004 & 22.6886 & & & 0.0 & 539 & No\\\\\n",
"1 & Nsig & 73.9468 & 13.172 & & & 0.0 & 490 & No\\\\\n",
"\\hline\n",
"2 & $\\lambda$ & -1.94354 & 0.119207 & & & -4.0 & -1 & No\\\\\n",
"2 & Nbkg & 416.003 & 22.6865 & & & 0.0 & 539 & No\\\\\n",
"\\hline\n",
"3 & Nsig & 73.9468 & 13.171 & & & 0.0 & 490 & No\\\\\n",
"3 & $\\lambda$ & -1.94354 & 0.119207 & & & -4.0 & -1 & No\\\\\n",
"\\hline\n",
"4 & $\\sigma$ & 0.099538 & 0.020795 & & & 0.019999999552965164 & 0.2 & No\\\\\n",
"\\hline\n",
Expand All @@ -526,7 +526,7 @@
{
"data": {
"text/plain": [
"<zfit.minimizers.fitresult.FitResult at 0x1a37be9a58>"
"<zfit.minimizers.fitresult.FitResult at 0x1a4089e828>"
]
},
"execution_count": 13,
Expand Down Expand Up @@ -586,13 +586,13 @@
"Compute qobs for the null hypothesis!\n",
"\n",
"Confidence interval on mean:\n",
"\t1.1884273709483795 < mean < 1.2251552795031055 at 68.00% C.L.\n"
"\t1.1884273709483795 < mean < 1.2251552795031055 at 68.0% C.L.\n"
]
},
{
"data": {
"text/plain": [
"{'observed': 1.2065819118010608,\n",
"{'observed': 1.2065819287142818,\n",
" 'band_p': 1.2251552795031055,\n",
" 'band_m': 1.1884273709483795}"
]
Expand Down
60 changes: 30 additions & 30 deletions examples/notebooks/discovery_zfit_asy.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
" <td title=\"Number of call in last migrad\">NCALLS = 70</td>\n",
" </tr>\n",
" <tr>\n",
" <td title=\"Estimated distance to minimum\">EDM = 2.07375261008852e-06</td>\n",
" <td title=\"Estimated distance to minimum\">EDM = 2.0737526100885202e-06</td>\n",
" <td title=\"Maximum EDM definition of convergence\">GOAL EDM = 5e-06</td>\n",
" <td title=\"Error def. Amount of increase in FCN to be defined as 1 standard deviation\">\n",
" UP = 0.5</td>\n",
Expand Down Expand Up @@ -193,7 +193,7 @@
"text/html": [
"<table>\n",
" <tr>\n",
" <td><a href=\"#\" onclick=\"$('#LZFYyzZMHd').toggle()\">+</a></td>\n",
" <td><a href=\"#\" onclick=\"$('#lZXqdCFaHT').toggle()\">+</a></td>\n",
" <td title=\"Variable name\">Name</td>\n",
" <td title=\"Value of parameter\">Value</td>\n",
" <td title=\"Hesse error\">Hesse Error</td>\n",
Expand All @@ -205,24 +205,24 @@
" </tr>\n",
" <tr>\n",
" <td>0</td>\n",
" <td>Nbkg</td>\n",
" <td>251.519</td>\n",
" <td>16.7539</td>\n",
" <td>Nsig</td>\n",
" <td>19.4765</td>\n",
" <td>7.12567</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0</td>\n",
" <td>298.1</td>\n",
" <td>-20</td>\n",
" <td>271</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
" <td>1</td>\n",
" <td>Nsig</td>\n",
" <td>19.4765</td>\n",
" <td>7.12567</td>\n",
" <td>Nbkg</td>\n",
" <td>251.519</td>\n",
" <td>16.7539</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>-20</td>\n",
" <td>271</td>\n",
" <td>0</td>\n",
" <td>298.1</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
Expand All @@ -237,15 +237,15 @@
" <td>No</td>\n",
" </tr>\n",
"</table>\n",
"<pre id=\"LZFYyzZMHd\" style=\"display:none;\">\n",
"<pre id=\"lZXqdCFaHT\" style=\"display:none;\">\n",
"<textarea rows=\"12\" cols=\"50\" onclick=\"this.select()\" readonly>\n",
"\\begin{tabular}{|c|r|r|r|r|r|r|r|c|}\n",
"\\hline\n",
" & Name & Value & Hesse Error & Minos Error- & Minos Error+ & Limit- & Limit+ & Fixed?\\\\\n",
"\\hline\n",
"0 & Nbkg & 251.519 & 16.7539 & & & 0.0 & 298.1 & No\\\\\n",
"0 & Nsig & 19.4765 & 7.12567 & & & -20.0 & 271 & No\\\\\n",
"\\hline\n",
"1 & Nsig & 19.4765 & 7.12567 & & & -20.0 & 271 & No\\\\\n",
"1 & Nbkg & 251.519 & 16.7539 & & & 0.0 & 298.1 & No\\\\\n",
"\\hline\n",
"2 & $\\lambda$ & -1.93315 & 0.1408 & & & -4.0 & -1 & No\\\\\n",
"\\hline\n",
Expand Down Expand Up @@ -408,7 +408,7 @@
"text/html": [
"<table>\n",
" <tr>\n",
" <td><a href=\"#\" onclick=\"$('#MOElpDJijk').toggle()\">+</a></td>\n",
" <td><a href=\"#\" onclick=\"$('#skOZesrdUl').toggle()\">+</a></td>\n",
" <td title=\"Variable name\">Name</td>\n",
" <td title=\"Value of parameter\">Value</td>\n",
" <td title=\"Hesse error\">Hesse Error</td>\n",
Expand All @@ -420,24 +420,24 @@
" </tr>\n",
" <tr>\n",
" <td>0</td>\n",
" <td>Nbkg</td>\n",
" <td>251.519</td>\n",
" <td>16.7586</td>\n",
" <td>Nsig</td>\n",
" <td>19.4765</td>\n",
" <td>7.1254</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>0</td>\n",
" <td>298.1</td>\n",
" <td>-20</td>\n",
" <td>271</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
" <td>1</td>\n",
" <td>Nsig</td>\n",
" <td>19.4765</td>\n",
" <td>7.1254</td>\n",
" <td>Nbkg</td>\n",
" <td>251.519</td>\n",
" <td>16.7586</td>\n",
" <td></td>\n",
" <td></td>\n",
" <td>-20</td>\n",
" <td>271</td>\n",
" <td>0</td>\n",
" <td>298.1</td>\n",
" <td>No</td>\n",
" </tr>\n",
" <tr>\n",
Expand All @@ -452,15 +452,15 @@
" <td>No</td>\n",
" </tr>\n",
"</table>\n",
"<pre id=\"MOElpDJijk\" style=\"display:none;\">\n",
"<pre id=\"skOZesrdUl\" style=\"display:none;\">\n",
"<textarea rows=\"12\" cols=\"50\" onclick=\"this.select()\" readonly>\n",
"\\begin{tabular}{|c|r|r|r|r|r|r|r|c|}\n",
"\\hline\n",
" & Name & Value & Hesse Error & Minos Error- & Minos Error+ & Limit- & Limit+ & Fixed?\\\\\n",
"\\hline\n",
"0 & Nbkg & 251.519 & 16.7586 & & & 0.0 & 298.1 & No\\\\\n",
"0 & Nsig & 19.4765 & 7.1254 & & & -20.0 & 271 & No\\\\\n",
"\\hline\n",
"1 & Nsig & 19.4765 & 7.1254 & & & -20.0 & 271 & No\\\\\n",
"1 & Nbkg & 251.519 & 16.7586 & & & 0.0 & 298.1 & No\\\\\n",
"\\hline\n",
"2 & $\\lambda$ & -1.93314 & 0.140798 & & & -4.0 & -1 & No\\\\\n",
"\\hline\n",
Expand All @@ -484,7 +484,7 @@
{
"data": {
"text/plain": [
"<zfit.minimizers.fitresult.FitResult at 0x1a3e474da0>"
"<zfit.minimizers.fitresult.FitResult at 0x1a4377dda0>"
]
},
"execution_count": 13,
Expand Down

0 comments on commit 41ad073

Please sign in to comment.