deploy: 689d770

_modules/iceplot/iceplot.html

@@ -549,6 +549,13 @@ <h1>Source code for iceplot.iceplot</h1><div class="highlight"><pre>
         <span class="k">else</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">is_empty</span> <span class="o">=</span> <span class="kc">False</span>
 
+    <span class="c1"># Compute histogram integral (piece-wise differential sum)</span>
+<div class="viewcode-block" id="hobj.integral">
+<a class="viewcode-back" href="../../modules/iceplot.html#iceplot.iceplot.hobj.integral">[docs]</a>
+    <span class="k">def</span> <span class="nf">integral</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="k">return</span> <span class="n">np</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">binscale</span> <span class="o">*</span> <span class="bp">self</span><span class="o">.</span><span class="n">counts</span> <span class="o">*</span> <span class="n">binwidth</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">bins</span><span class="p">))</span></div>
+
+
     <span class="c1"># + operator</span>
     <span class="k">def</span> <span class="fm">__add__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">other</span><span class="p">):</span>
 
@@ -564,7 +571,7 @@ <h1>Source code for iceplot.iceplot</h1><div class="highlight"><pre>
         <span class="n">counts</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">counts</span> <span class="o">+</span> <span class="n">other</span><span class="o">.</span><span class="n">counts</span>
         <span class="n">errs</span>   <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">errs</span><span class="o">**</span><span class="mi">2</span>   <span class="o">+</span> <span class="n">other</span><span class="o">.</span><span class="n">errs</span><span class="o">**</span><span class="mi">2</span><span class="p">)</span>
 
-        <span class="k">return</span> <span class="n">hobj</span><span class="p">(</span><span class="n">counts</span><span class="p">,</span> <span class="n">errs</span><span class="p">,</span> <span class="n">bins</span><span class="p">,</span> <span class="n">cbins</span><span class="p">,</span> <span class="n">binscale</span><span class="p">)</span>
+        <span class="k">return</span> <span class="n">hobj</span><span class="p">(</span><span class="n">counts</span><span class="p">,</span> <span class="n">errs</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">bins</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">cbins</span><span class="p">,</span> <span class="n">binscale</span><span class="p">)</span>
 
     <span class="c1"># += operator</span>
     <span class="k">def</span> <span class="fm">__iadd__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">other</span><span class="p">):</span>
@@ -1024,7 +1031,7 @@ <h1>Source code for iceplot.iceplot</h1><div class="highlight"><pre>
         <span class="c1"># Compute differential cross section within histogram range</span>
         <span class="c1"># Note that division by sum(weights) handles the histogram range integral (overflow) properly</span>
         <span class="n">binscale</span> <span class="o">=</span> <span class="n">mcdata</span><span class="p">[</span><span class="s1">&#39;xsection_pb&#39;</span><span class="p">]</span> <span class="o">/</span> <span class="n">binwidth</span><span class="p">(</span><span class="n">bins</span><span class="p">)</span> <span class="o">/</span> <span class="n">np</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">mcdata</span><span class="p">[</span><span class="s1">&#39;weights&#39;</span><span class="p">])</span> 
-
+        
         <span class="c1"># Additional scale factor</span>
         <span class="k">if</span> <span class="n">scale</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
             <span class="n">binscale</span> <span class="o">*=</span> <span class="n">scale</span>
@@ -1037,6 +1044,8 @@ <h1>Source code for iceplot.iceplot</h1><div class="highlight"><pre>
         <span class="n">obj</span><span class="p">[</span><span class="n">OBS</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="s1">&#39;hdata&#39;</span><span class="p">:</span> <span class="n">hobj</span><span class="p">(</span><span class="n">counts</span><span class="p">,</span> <span class="n">errs</span><span class="p">,</span> <span class="n">bins</span><span class="p">,</span> <span class="n">cbins</span><span class="p">,</span> <span class="n">binscale</span><span class="p">),</span>
                     <span class="s1">&#39;hfunc&#39;</span> <span class="p">:</span> <span class="s1">&#39;hist&#39;</span><span class="p">,</span> <span class="s1">&#39;color&#39;</span><span class="p">:</span> <span class="n">color</span><span class="p">,</span> <span class="s1">&#39;label&#39;</span><span class="p">:</span> <span class="n">label</span><span class="p">,</span> <span class="s1">&#39;style&#39;</span> <span class="p">:</span> <span class="n">style</span><span class="p">}</span>
 
+        <span class="nb">print</span><span class="p">(</span><span class="sa">f</span><span class="s1">&#39;histmc: integral = </span><span class="si">{</span><span class="n">obj</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s2">&quot;hdata&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">integral</span><span class="p">()</span><span class="si">:</span><span class="s1">0.2E</span><span class="si">}</span><span class="s1"> (</span><span class="si">{</span><span class="n">OBS</span><span class="si">}</span><span class="s1">)&#39;</span><span class="p">)</span>
+
     <span class="k">return</span> <span class="n">obj</span></div>
 
 
@@ -1049,13 +1058,11 @@ <h1>Source code for iceplot.iceplot</h1><div class="highlight"><pre>
     <span class="n">obj</span> <span class="o">=</span> <span class="p">{}</span>
 
     <span class="k">for</span> <span class="n">OBS</span> <span class="ow">in</span> <span class="n">all_obs</span><span class="o">.</span><span class="n">keys</span><span class="p">():</span>
-
-        <span class="c1"># Over all DATA files (now fixed to one)</span>
-        <span class="n">data_obj</span> <span class="o">=</span> <span class="p">[]</span>
-
+
         <span class="n">y</span>        <span class="o">=</span> <span class="n">hepdata</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s1">&#39;y&#39;</span><span class="p">]</span>    
         <span class="n">yerr</span>     <span class="o">=</span> <span class="n">hepdata</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s1">&#39;y_err&#39;</span><span class="p">]</span>
         <span class="n">bins</span>     <span class="o">=</span> <span class="n">hepdata</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s1">&#39;bins&#39;</span><span class="p">]</span>
+        <span class="n">binwidth</span> <span class="o">=</span> <span class="n">hepdata</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s1">&#39;binwidth&#39;</span><span class="p">]</span>
         <span class="n">cbins</span>    <span class="o">=</span> <span class="n">hepdata</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s1">&#39;x&#39;</span><span class="p">]</span>
 
         <span class="n">binscale</span> <span class="o">=</span> <span class="n">hepdata</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s1">&#39;scale&#39;</span><span class="p">]</span> <span class="o">*</span> <span class="n">MC_XS_SCALE</span>
@@ -1066,14 +1073,15 @@ <h1>Source code for iceplot.iceplot</h1><div class="highlight"><pre>
 
         <span class="c1"># Density integral 1 over the histogram bins</span>
         <span class="k">if</span> <span class="n">density</span><span class="p">:</span>
-             <span class="c1"># note .mean(), each element is already differentially normalized</span>
-            <span class="n">norm</span>  <span class="o">=</span> <span class="n">hepdata</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s1">&#39;binwidth&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">mean</span><span class="p">()</span> <span class="o">*</span> <span class="n">y</span><span class="o">.</span><span class="n">sum</span><span class="p">()</span>
+            <span class="n">norm</span>  <span class="o">=</span> <span class="p">(</span><span class="n">y</span> <span class="o">*</span> <span class="n">binwidth</span><span class="p">)</span><span class="o">.</span><span class="n">sum</span><span class="p">()</span>
             <span class="n">y</span>    <span class="o">/=</span> <span class="n">norm</span>
             <span class="n">yerr</span> <span class="o">/=</span> <span class="n">norm</span>
             <span class="n">binscale</span> <span class="o">=</span> <span class="mf">1.0</span>
 
         <span class="n">obj</span><span class="p">[</span><span class="n">OBS</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="s1">&#39;hdata&#39;</span><span class="p">:</span> <span class="n">hobj</span><span class="p">(</span><span class="n">y</span><span class="p">,</span> <span class="n">yerr</span><span class="p">,</span> <span class="n">bins</span><span class="p">,</span> <span class="n">cbins</span><span class="p">,</span> <span class="n">binscale</span><span class="p">),</span>
                     <span class="s1">&#39;hfunc&#39;</span> <span class="p">:</span> <span class="s1">&#39;hist&#39;</span><span class="p">,</span> <span class="s1">&#39;color&#39;</span><span class="p">:</span> <span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">),</span> <span class="s1">&#39;label&#39;</span><span class="p">:</span> <span class="n">label</span><span class="p">,</span> <span class="s1">&#39;style&#39;</span> <span class="p">:</span> <span class="n">style</span><span class="p">}</span>
+
+        <span class="nb">print</span><span class="p">(</span><span class="sa">f</span><span class="s1">&#39;histhepdata: integral = </span><span class="si">{</span><span class="n">obj</span><span class="p">[</span><span class="n">OBS</span><span class="p">][</span><span class="s2">&quot;hdata&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">integral</span><span class="p">()</span><span class="si">:</span><span class="s1">0.2E</span><span class="si">}</span><span class="s1"> (</span><span class="si">{</span><span class="n">OBS</span><span class="si">}</span><span class="s1">)&#39;</span><span class="p">)</span>
 
     <span class="k">return</span> <span class="n">obj</span></div>
 

genindex.html

@@ -1528,6 +1528,8 @@ <h2 id="I">I</h2>
       <li><a href="modules/icebrk.html#icebrk.fasthistos.initialize">initialize() (in module icebrk.fasthistos)</a>
 </li>
       <li><a href="modules/icenet.html#icenet.tools.aux.int2onehot">int2onehot() (in module icenet.tools.aux)</a>
+</li>
+      <li><a href="modules/iceplot.html#iceplot.iceplot.hobj.integral">integral() (hobj method)</a>
 </li>
       <li><a href="modules/icenet.html#icenet.algo.analytic.invmass">invmass() (in module icenet.algo.analytic)</a>
 </li>

modules/iceplot.html

@@ -551,6 +551,11 @@ <h1>iceplot<a class="headerlink" href="#iceplot" title="Link to this heading">¶
 <dt class="sig sig-object py" id="iceplot.iceplot.hobj">
 <em class="property"><span class="pre">class</span><span class="w"> </span></em><span class="sig-name descname"><span class="pre">hobj</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">counts</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">0</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">errs</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">0</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">bins</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">0</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">cbins</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">0</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">binscale</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">1.0</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/iceplot/iceplot.html#hobj"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#iceplot.iceplot.hobj" title="Link to this definition">¶</a></dt>
 <dd><p>Minimal histogram data object.</p>
+<dl class="py method">
+<dt class="sig sig-object py" id="iceplot.iceplot.hobj.integral">
+<span class="sig-name descname"><span class="pre">integral</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="../_modules/iceplot/iceplot.html#hobj.integral"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#iceplot.iceplot.hobj.integral" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+
 </dd></dl>
 
 <dl class="py function">