deploy: ab72103

Author: sbillinge

_modules/diffpy/utils/parsers/resample.html

@@ -188,7 +188,6 @@ <h1>Source code for diffpy.utils.parsers.resample</h1><div class="highlight"><pr
         <span class="k">return</span> <span class="n">rnew</span><span class="p">,</span> <span class="n">snew</span>
 
     <span class="k">elif</span> <span class="n">dr0</span> <span class="o">&gt;</span> <span class="n">dr</span><span class="p">:</span>
-
         <span class="c1"># Tried to pad the end of s to dampen, but nothing works.</span>
         <span class="c1"># m = (s[-1] - s[-2]) / dr0</span>
         <span class="c1"># b = (s[-2] * r[-1] - s[-1] * r[-2]) / dr0</span>

_modules/diffpy/utils/parsers/serialization.html

@@ -91,12 +91,13 @@ <h1>Source code for diffpy.utils.parsers.serialization</h1><div class="highlight
 <span class="c1">#</span>
 <span class="c1">##############################################################################</span>
 
-<span class="kn">import</span> <span class="nn">pathlib</span>
 <span class="kn">import</span> <span class="nn">json</span>
+<span class="kn">import</span> <span class="nn">pathlib</span>
+<span class="kn">import</span> <span class="nn">warnings</span>
+
 <span class="kn">import</span> <span class="nn">numpy</span>
 
-<span class="kn">from</span> <span class="nn">.custom_exceptions</span> <span class="kn">import</span> <span class="n">UnsupportedTypeError</span><span class="p">,</span> <span class="n">ImproperSizeError</span>
-<span class="kn">import</span> <span class="nn">warnings</span>
+<span class="kn">from</span> <span class="nn">.custom_exceptions</span> <span class="kn">import</span> <span class="n">ImproperSizeError</span><span class="p">,</span> <span class="n">UnsupportedTypeError</span>
 
 <span class="c1"># FIXME: add support for yaml, xml</span>
 <span class="n">supported_formats</span> <span class="o">=</span> <span class="p">[</span><span class="s2">&quot;.json&quot;</span><span class="p">]</span>
@@ -164,12 +165,8 @@ <h1>Source code for diffpy.utils.parsers.serialization</h1><div class="highlight
         <span class="n">num_columns</span> <span class="o">=</span> <span class="p">[</span><span class="nb">len</span><span class="p">(</span><span class="n">row</span><span class="p">)</span> <span class="k">for</span> <span class="n">row</span> <span class="ow">in</span> <span class="n">data_table</span><span class="p">]</span>
         <span class="n">max_columns</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="n">num_columns</span><span class="p">)</span>
         <span class="n">num_col_names</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">dt_colnames</span><span class="p">)</span>
-        <span class="k">if</span> <span class="p">(</span>
-            <span class="n">max_columns</span> <span class="o">&lt;</span> <span class="n">num_col_names</span>
-        <span class="p">):</span>  <span class="c1"># assume numpy.loadtxt gives non-irregular array</span>
-            <span class="k">raise</span> <span class="n">ImproperSizeError</span><span class="p">(</span>
-                <span class="s2">&quot;More entries in dt_colnames than columns in data_table.&quot;</span>
-            <span class="p">)</span>
+        <span class="k">if</span> <span class="n">max_columns</span> <span class="o">&lt;</span> <span class="n">num_col_names</span><span class="p">:</span>  <span class="c1"># assume numpy.loadtxt gives non-irregular array</span>
+            <span class="k">raise</span> <span class="n">ImproperSizeError</span><span class="p">(</span><span class="s2">&quot;More entries in dt_colnames than columns in data_table.&quot;</span><span class="p">)</span>
         <span class="n">named_columns</span> <span class="o">=</span> <span class="mi">0</span>
         <span class="k">for</span> <span class="n">idx</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">num_col_names</span><span class="p">):</span>
             <span class="n">colname</span> <span class="o">=</span> <span class="n">dt_colnames</span><span class="p">[</span><span class="n">idx</span><span class="p">]</span>

index.html

@@ -83,7 +83,7 @@ <h1>diffpy.utils documentation<a class="headerlink" href="#diffpy-utils-document
 <p>diffpy.utils - general purpose shared utilities for the diffpy libraries.</p>
 <div class="line-block">
 <div class="line">Software version 3.3.1.</div>
-<div class="line">Last updated May 31, 2024.</div>
+<div class="line">Last updated June 01, 2024.</div>
 </div>
 <p>The diffpy.utils package provides general functions for extracting data from variously formatted text files as well as
 some PDF-specific functionality. These include wx GUI utilities used by the PDFgui program and an interpolation function