deploy: e6a93b7

Author: sbillinge

_modules/diffpy/utils/parsers/loaddata.html

@@ -107,10 +107,12 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
 <span class="sd">    filename</span>
 <span class="sd">        Name of the file we want to load data from.</span>
 <span class="sd">    minrows: int</span>
-<span class="sd">        Minimum number of rows in the first data block. All rows must have the same number of floating point values.</span>
+<span class="sd">        Minimum number of rows in the first data block. All rows must have the same number of floating</span>
+<span class="sd">         point values.</span>
 <span class="sd">    headers: bool</span>
 <span class="sd">     when False (defualt), the function returns a numpy array of the data in the data block.</span>
-<span class="sd">        When True, the function instead returns a dictionary of parameters and their corresponding values parsed from</span>
+<span class="sd">        When True, the function instead returns a dictionary of parameters and their corresponding</span>
+<span class="sd">         values parsed from</span>
 <span class="sd">        header (information prior the data block). See hdel and hignore for options to help with parsing header</span>
 <span class="sd">        information.</span>
 <span class="sd">    hdel: str</span>
@@ -367,7 +369,7 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
         <span class="k">for</span> <span class="n">i</span><span class="p">,</span> <span class="n">w</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_words</span><span class="p">):</span>
             <span class="k">try</span><span class="p">:</span>
                 <span class="n">values</span><span class="p">[</span><span class="n">i</span><span class="p">]</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">w</span><span class="p">)</span>
-            <span class="k">except</span><span class="p">:</span>
+            <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
                 <span class="n">lw</span><span class="o">.</span><span class="n">ok</span><span class="p">[</span><span class="n">i</span><span class="p">]</span> <span class="o">=</span> <span class="kc">False</span>
         <span class="c1"># prune lines that have a non-float values:</span>
         <span class="n">lw</span><span class="o">.</span><span class="n">values</span> <span class="o">=</span> <span class="n">values</span>
@@ -426,7 +428,7 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
     <span class="k">try</span><span class="p">:</span>
         <span class="nb">float</span><span class="p">(</span><span class="n">s</span><span class="p">)</span>
         <span class="k">return</span> <span class="kc">True</span>
-    <span class="k">except</span><span class="p">:</span>
+    <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
         <span class="k">pass</span>
     <span class="k">return</span> <span class="kc">False</span></div>
 

_modules/diffpy/utils/parsers/resample.html

@@ -103,7 +103,8 @@ <h1>Source code for diffpy.utils.parsers.resample</h1><div class="highlight"><pr
 <span class="k">def</span> <span class="nf">wsinterp</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">xp</span><span class="p">,</span> <span class="n">fp</span><span class="p">,</span> <span class="n">left</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">right</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;One-dimensional Whittaker-Shannon interpolation.</span>
 
-<span class="sd">    This uses the Whittaker-Shannon interpolation formula to interpolate the value of fp (array), which is defined over</span>
+<span class="sd">    This uses the Whittaker-Shannon interpolation formula to interpolate the value of fp (array),</span>
+<span class="sd">     which is defined over</span>
 <span class="sd">    xp (array), at x (array or float).</span>
 
 <span class="sd">    Parameters</span>
@@ -115,7 +116,8 @@ <h1>Source code for diffpy.utils.parsers.resample</h1><div class="highlight"><pr
 <span class="sd">    fp: ndarray</span>
 <span class="sd">        Function to be interpolated.</span>
 <span class="sd">    left: float</span>
-<span class="sd">        If given, set fp for x &lt; xp[0] to left. Otherwise, if left is None (default) or not given, set fp for x &lt; xp[0]</span>
+<span class="sd">        If given, set fp for x &lt; xp[0] to left. Otherwise, if left is None (default) or not given,</span>
+<span class="sd">         set fp for x &lt; xp[0]</span>
 <span class="sd">        to fp evaluated at xp[-1].</span>
 <span class="sd">    right: float</span>
 <span class="sd">        If given, set fp for x &gt; xp[-1] to right. Otherwise, if right is None (default) or not given, set fp for</span>
@@ -196,7 +198,7 @@ <h1>Source code for diffpy.utils.parsers.resample</h1><div class="highlight"><pr
         <span class="c1"># spad = numpy.concatenate([s,spad])</span>
         <span class="c1"># rnew = numpy.arange(0, rpad[-1], dr)</span>
         <span class="c1"># snew = numpy.zeros_like(rnew)</span>
-        <span class="c1">## Accomodate for the fact that r[0] might not be 0</span>
+        <span class="c1"># Accomodate for the fact that r[0] might not be 0</span>
         <span class="c1"># u = (rnew-r[0]) / dr0</span>
         <span class="c1"># for n in range(len(spad)):</span>
         <span class="c1">#    snew += spad[n] * numpy.sinc(u - n)</span>

api/diffpy.utils.parsers.html

@@ -138,14 +138,20 @@ <h3>Parameters<a class="headerlink" href="#parameters" title="Link to this headi
 This seems to work for most of the datafiles including those generated by diffpy programs.</p>
 <section id="id1">
 <h3>Parameters<a class="headerlink" href="#id1" title="Link to this heading"></a></h3>
-<dl class="simple">
+<dl>
 <dt>filename</dt><dd><p>Name of the file we want to load data from.</p>
 </dd>
-<dt>minrows: int</dt><dd><p>Minimum number of rows in the first data block. All rows must have the same number of floating point values.</p>
+<dt>minrows: int</dt><dd><dl class="simple">
+<dt>Minimum number of rows in the first data block. All rows must have the same number of floating</dt><dd><p>point values.</p>
+</dd>
+</dl>
+</dd>
+<dt>headers: bool</dt><dd><dl>
+<dt>when False (defualt), the function returns a numpy array of the data in the data block.</dt><dd><dl class="simple">
+<dt>When True, the function instead returns a dictionary of parameters and their corresponding</dt><dd><p>values parsed from</p>
 </dd>
-<dt>headers: bool</dt><dd><dl class="simple">
-<dt>when False (defualt), the function returns a numpy array of the data in the data block.</dt><dd><p>When True, the function instead returns a dictionary of parameters and their corresponding values parsed from
-header (information prior the data block). See hdel and hignore for options to help with parsing header
+</dl>
+<p>header (information prior the data block). See hdel and hignore for options to help with parsing header
 information.</p>
 </dd>
 </dl>
@@ -282,19 +288,25 @@ <h3>Returns<a class="headerlink" href="#id7" title="Link to this heading"></a
 <dt class="sig sig-object py" id="diffpy.utils.parsers.resample.wsinterp">
 <span class="sig-prename descclassname"><span class="pre">diffpy.utils.parsers.resample.</span></span><span class="sig-name descname"><span class="pre">wsinterp</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">x</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">xp</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">fp</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">left</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">right</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/diffpy/utils/parsers/resample.html#wsinterp"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#diffpy.utils.parsers.resample.wsinterp" title="Link to this definition"></a></dt>
 <dd><p>One-dimensional Whittaker-Shannon interpolation.</p>
-<p>This uses the Whittaker-Shannon interpolation formula to interpolate the value of fp (array), which is defined over
-xp (array), at x (array or float).</p>
+<dl class="simple">
+<dt>This uses the Whittaker-Shannon interpolation formula to interpolate the value of fp (array),</dt><dd><p>which is defined over</p>
+</dd>
+</dl>
+<p>xp (array), at x (array or float).</p>
 <section id="id8">
 <h3>Parameters<a class="headerlink" href="#id8" title="Link to this heading"></a></h3>
-<dl class="simple">
+<dl>
 <dt>x: ndarray</dt><dd><p>Desired range for interpolation.</p>
 </dd>
 <dt>xp: ndarray</dt><dd><p>Defined range for fp.</p>
 </dd>
 <dt>fp: ndarray</dt><dd><p>Function to be interpolated.</p>
 </dd>
-<dt>left: float</dt><dd><p>If given, set fp for x &lt; xp[0] to left. Otherwise, if left is None (default) or not given, set fp for x &lt; xp[0]
-to fp evaluated at xp[-1].</p>
+<dt>left: float</dt><dd><dl class="simple">
+<dt>If given, set fp for x &lt; xp[0] to left. Otherwise, if left is None (default) or not given,</dt><dd><p>set fp for x &lt; xp[0]</p>
+</dd>
+</dl>
+<p>to fp evaluated at xp[-1].</p>
 </dd>
 <dt>right: float</dt><dd><p>If given, set fp for x &gt; xp[-1] to right. Otherwise, if right is None (default) or not given, set fp for
 x &gt; xp[-1] to fp evaluated at xp[-1].</p>