Skip to content

Commit

Permalink
Merge pull request #179 from johannbrehmer/develop
Browse files Browse the repository at this point in the history 
Final touches for v0.1.1
  • Loading branch information
@johannbrehmer
johannbrehmer authored Dec 6, 2018
2 parents dc9c063 + c032d0a commit 12f223e
Show file tree
Hide file tree
Showing 32 changed files with 219 additions and 100 deletions.
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ steps of a detector-level analysis.
After that, we recommend going through [tutorial_2.ipynb](examples/tutorial/tutorial_1.ipynb), which explains local
score methods, how to estimate the Fisher information, and introduces some convenient ensemble methods.

Finally, [tutorial_parton.ipynb](examples/tutorial/tutorial.ipynb) explains how to perform a parton-level Fisher
information analysis.
We're currently working on a significantly extended and improved series of tutorials.

### Package structure

Expand Down
2 changes: 1 addition & 1 deletion docs/html/_modules/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Overview: module code &#8212; MadMiner 0.1.0 documentation</title>
<title>Overview: module code &#8212; MadMiner 0.1.1 documentation</title>
<link rel="stylesheet" href="../_static/alabaster.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
Expand Down
7 changes: 4 additions & 3 deletions docs/html/_modules/madminer/core.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>madminer.core &#8212; MadMiner 0.1.0 documentation</title>
<title>madminer.core &#8212; MadMiner 0.1.1 documentation</title>
<link rel="stylesheet" href="../../_static/alabaster.css" type="text/css" />
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="../../" src="../../_static/documentation_options.js"></script>
Expand Down Expand Up @@ -1032,7 +1032,7 @@ <h1>Source code for madminer.core</h1><div class="highlight"><pre>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot;Run </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">i</span><span class="p">)</span>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot; Sampling from benchmark: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">sample_benchmark</span><span class="p">)</span>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot; Original run card: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">run_card_file</span><span class="p">)</span>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot; Original Pythia8 card: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">run_card_file</span><span class="p">)</span>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot; Original Pythia8 card: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">pythia8_card_file</span><span class="p">)</span>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot; Copied run card: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">new_run_card_file</span><span class="p">)</span>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot; Copied Pythia8 card: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">new_pythia8_card_file</span><span class="p">)</span>
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot; Param card: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">param_card_file</span><span class="p">)</span>
Expand Down Expand Up @@ -1078,7 +1078,8 @@ <h1>Source code for madminer.core</h1><div class="highlight"><pre>
<span class="n">mg_process_directory</span> <span class="o">+</span> <span class="s2">&quot;/&quot;</span> <span class="o">+</span> <span class="n">new_run_card_file</span><span class="p">,</span>
<span class="n">mg_process_directory</span> <span class="o">+</span> <span class="s2">&quot;/&quot;</span> <span class="o">+</span> <span class="n">param_card_file</span><span class="p">,</span>
<span class="n">mg_process_directory</span> <span class="o">+</span> <span class="s2">&quot;/&quot;</span> <span class="o">+</span> <span class="n">reweight_card_file</span><span class="p">,</span>
<span class="n">mg_process_directory</span> <span class="o">+</span> <span class="s2">&quot;/&quot;</span> <span class="o">+</span> <span class="n">new_pythia8_card_file</span><span class="p">,</span>
<span class="kc">None</span> <span class="k">if</span> <span class="n">new_pythia8_card_file</span> <span class="ow">is</span> <span class="kc">None</span> <span class="k">else</span> <span class="n">mg_process_directory</span> <span class="o">+</span> <span class="s2">&quot;/&quot;</span> <span class="o">+</span> <span class="n">new_pythia8_card_file</span><span class="p">,</span>
<span class="c1"># mg_process_directory + &quot;/&quot; + new_pythia8_card_file,</span>
<span class="n">is_background</span><span class="o">=</span><span class="n">is_background</span><span class="p">,</span>
<span class="n">initial_command</span><span class="o">=</span><span class="n">initial_command</span><span class="p">,</span>
<span class="n">log_file</span><span class="o">=</span><span class="n">log_directory</span> <span class="o">+</span> <span class="s2">&quot;/&quot;</span> <span class="o">+</span> <span class="n">log_file_run</span><span class="p">,</span>
Expand Down
Loading

0 comments on commit 12f223e

Please sign in to comment.