Skip to content

Commit 0621474

Browse files
sbillingesbillinge
committed
deploy: 5359054 
1 parent b0d8713 commit 0621474

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+4246
-1837
lines changed

Diff for: ‎.buildinfo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file records the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 2404e2ec6aba05caa89b3a09cc80f33d
3+
config: 502ea467bdc9264ac0f9be42e14db075
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

Diff for: ‎_downloads/62ff72d8f375ac2f72737a5807d10eaf/parserdata.zip renamed to ‎_downloads/bd886e57cf9f4de4ad76c29e2ff8bf8b/parser_data.zip

File renamed without changes.

Diff for: ‎_modules/diffpy/utils/diffraction_objects.html

+721
Large diffs are not rendered by default.

Diff for: ‎_modules/diffpy/utils/parsers/custom_exceptions.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>diffpy.utils.parsers.custom_exceptions &mdash; diffpy.utils 3.5.0 documentation</title>
8+
<title>diffpy.utils.parsers.custom_exceptions &mdash; diffpy.utils 3.6.0rc3 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=fa44fd50" />
10-
<link rel="stylesheet" type="text/css" href="../../../../_static/css/theme.css?v=7ab3649f" />
10+
<link rel="stylesheet" type="text/css" href="../../../../_static/css/theme.css?v=e59714d7" />
1111

1212

1313
<script src="../../../../_static/jquery.js?v=5d32c60e"></script>
1414
<script src="../../../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
15-
<script src="../../../../_static/documentation_options.js?v=47b26e07"></script>
15+
<script src="../../../../_static/documentation_options.js?v=1db8a07e"></script>
1616
<script src="../../../../_static/doctools.js?v=9bcbadda"></script>
1717
<script src="../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
1818
<script src="../../../../_static/js/theme.js"></script>
@@ -142,7 +142,7 @@ <h1>Source code for diffpy.utils.parsers.custom_exceptions</h1><div class="highl
142142
<hr/>
143143

144144
<div role="contentinfo">
145-
<p>&#169; Copyright 2024, The Trustees of Columbia University in the City of New York.</p>
145+
<p>&#169; Copyright 2025, The Trustees of Columbia University in the City of New York.</p>
146146
</div>
147147

148148
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

Diff for: ‎_modules/diffpy/utils/parsers/loaddata.html

+14-25
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>diffpy.utils.parsers.loaddata &mdash; diffpy.utils 3.5.0 documentation</title>
8+
<title>diffpy.utils.parsers.loaddata &mdash; diffpy.utils 3.6.0rc3 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=fa44fd50" />
10-
<link rel="stylesheet" type="text/css" href="../../../../_static/css/theme.css?v=7ab3649f" />
10+
<link rel="stylesheet" type="text/css" href="../../../../_static/css/theme.css?v=e59714d7" />
1111

1212

1313
<script src="../../../../_static/jquery.js?v=5d32c60e"></script>
1414
<script src="../../../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
15-
<script src="../../../../_static/documentation_options.js?v=47b26e07"></script>
15+
<script src="../../../../_static/documentation_options.js?v=1db8a07e"></script>
1616
<script src="../../../../_static/doctools.js?v=9bcbadda"></script>
1717
<script src="../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
1818
<script src="../../../../_static/js/theme.js"></script>
@@ -87,8 +87,12 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
8787
<span class="c1">#</span>
8888
<span class="c1">##############################################################################</span>
8989

90+
<span class="kn">import</span> <span class="nn">os</span>
91+
9092
<span class="kn">import</span> <span class="nn">numpy</span>
9193

94+
<span class="kn">from</span> <span class="nn">diffpy.utils</span> <span class="kn">import</span> <span class="n">validators</span>
95+
9296

9397
<div class="viewcode-block" id="loadData">
9498
<a class="viewcode-back" href="../../../../api/diffpy.utils.parsers.html#diffpy.utils.parsers.loaddata.loadData">[docs]</a>
@@ -106,7 +110,7 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
106110
<span class="sd"> Minimum number of rows in the first data block. All rows must have the same number of floating</span>
107111
<span class="sd"> point values.</span>
108112
<span class="sd"> headers: bool</span>
109-
<span class="sd"> when False (defualt), the function returns a numpy array of the data in the data block.</span>
113+
<span class="sd"> when False (default), the function returns a numpy array of the data in the data block.</span>
110114
<span class="sd"> When True, the function instead returns a dictionary of parameters and their corresponding</span>
111115
<span class="sd"> values parsed from header (information prior the data block). See hdel and hignore for options</span>
112116
<span class="sd"> to help with parsing header information.</span>
@@ -175,6 +179,10 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
175179
<span class="n">nc</span> <span class="o">=</span> <span class="n">nv</span> <span class="o">=</span> <span class="mi">0</span>
176180
<span class="k">return</span> <span class="n">nc</span><span class="p">,</span> <span class="n">nv</span>
177181

182+
<span class="c1"># Check if file exists before trying to open</span>
183+
<span class="k">if</span> <span class="ow">not</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">filename</span><span class="p">):</span>
184+
<span class="k">raise</span> <span class="ne">IOError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;File </span><span class="si">{</span><span class="n">filename</span><span class="si">}</span><span class="s2"> cannot be found. Please rerun the program specifying a valid filename.&quot;</span><span class="p">)</span>
185+
178186
<span class="c1"># make sure fid gets cleaned up</span>
179187
<span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="n">filename</span><span class="p">,</span> <span class="s2">&quot;rb&quot;</span><span class="p">)</span> <span class="k">as</span> <span class="n">fid</span><span class="p">:</span>
180188
<span class="c1"># search for the start of datablock</span>
@@ -209,7 +217,7 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
209217
<span class="n">name</span> <span class="o">=</span> <span class="n">hpair</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
210218
<span class="n">value</span> <span class="o">=</span> <span class="n">hpair</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span>
211219
<span class="c1"># check if data value should be stored as float</span>
212-
<span class="k">if</span> <span class="n">isfloat</span><span class="p">(</span><span class="n">hpair</span><span class="p">[</span><span class="mi">1</span><span class="p">]):</span>
220+
<span class="k">if</span> <span class="n">validators</span><span class="o">.</span><span class="n">is_number</span><span class="p">(</span><span class="n">hpair</span><span class="p">[</span><span class="mi">1</span><span class="p">]):</span>
213221
<span class="n">value</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">hpair</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span>
214222
<span class="n">hdata</span><span class="o">.</span><span class="n">update</span><span class="p">({</span><span class="n">name</span><span class="p">:</span> <span class="n">value</span><span class="p">})</span>
215223
<span class="c1"># continue search for the start of datablock</span>
@@ -411,25 +419,6 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
411419
<span class="bp">self</span><span class="o">.</span><span class="n">datasets</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">data</span><span class="p">)</span>
412420
<span class="k">return</span></div>
413421

414-
415-
416-
<span class="c1"># End of class TextDataLoader</span>
417-
418-
419-
<div class="viewcode-block" id="isfloat">
420-
<a class="viewcode-back" href="../../../../api/diffpy.utils.parsers.html#diffpy.utils.parsers.loaddata.isfloat">[docs]</a>
421-
<span class="k">def</span> <span class="nf">isfloat</span><span class="p">(</span><span class="n">s</span><span class="p">):</span>
422-
<span class="w"> </span><span class="sd">&quot;&quot;&quot;True if s is convertible to float.&quot;&quot;&quot;</span>
423-
<span class="k">try</span><span class="p">:</span>
424-
<span class="nb">float</span><span class="p">(</span><span class="n">s</span><span class="p">)</span>
425-
<span class="k">return</span> <span class="kc">True</span>
426-
<span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
427-
<span class="k">pass</span>
428-
<span class="k">return</span> <span class="kc">False</span></div>
429-
430-
431-
432-
<span class="c1"># End of file</span>
433422
</pre></div>
434423

435424
</div>
@@ -439,7 +428,7 @@ <h1>Source code for diffpy.utils.parsers.loaddata</h1><div class="highlight"><pr
439428
<hr/>
440429

441430
<div role="contentinfo">
442-
<p>&#169; Copyright 2024, The Trustees of Columbia University in the City of New York.</p>
431+
<p>&#169; Copyright 2025, The Trustees of Columbia University in the City of New York.</p>
443432
</div>
444433

445434
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

Diff for: ‎_modules/diffpy/utils/parsers/serialization.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>diffpy.utils.parsers.serialization &mdash; diffpy.utils 3.5.0 documentation</title>
8+
<title>diffpy.utils.parsers.serialization &mdash; diffpy.utils 3.6.0rc3 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=fa44fd50" />
10-
<link rel="stylesheet" type="text/css" href="../../../../_static/css/theme.css?v=7ab3649f" />
10+
<link rel="stylesheet" type="text/css" href="../../../../_static/css/theme.css?v=e59714d7" />
1111

1212

1313
<script src="../../../../_static/jquery.js?v=5d32c60e"></script>
1414
<script src="../../../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
15-
<script src="../../../../_static/documentation_options.js?v=47b26e07"></script>
15+
<script src="../../../../_static/documentation_options.js?v=1db8a07e"></script>
1616
<script src="../../../../_static/doctools.js?v=9bcbadda"></script>
1717
<script src="../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
1818
<script src="../../../../_static/js/theme.js"></script>
@@ -109,8 +109,8 @@ <h1>Source code for diffpy.utils.parsers.serialization</h1><div class="highlight
109109
<span class="n">show_path</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
110110
<span class="n">serial_file</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
111111
<span class="p">):</span>
112-
<span class="w"> </span><span class="sd">&quot;&quot;&quot;Serialize file data into a dictionary. Can also save dictionary into a serial language file. Dictionary is</span>
113-
<span class="sd"> formatted as {filename: data}.</span>
112+
<span class="w"> </span><span class="sd">&quot;&quot;&quot;Serialize file data into a dictionary. Can also save dictionary into a</span>
113+
<span class="sd"> serial language file. Dictionary is formatted as {filename: data}.</span>
114114

115115
<span class="sd"> Requires hdata and data_table (can be generated by loadData).</span>
116116

@@ -132,7 +132,7 @@ <h1>Source code for diffpy.utils.parsers.serialization</h1><div class="highlight
132132
<span class="sd"> include a path element in the database entry (default True). If &#39;path&#39; is not included in hddata,</span>
133133
<span class="sd"> extract path from filename.</span>
134134
<span class="sd"> serial_file</span>
135-
<span class="sd"> Serial language file to dump dictionary into. If None (defualt), no dumping will occur.</span>
135+
<span class="sd"> Serial language file to dump dictionary into. If None (default), no dumping will occur.</span>
136136

137137
<span class="sd"> Returns</span>
138138
<span class="sd"> -------</span>
@@ -291,7 +291,7 @@ <h1>Source code for diffpy.utils.parsers.serialization</h1><div class="highlight
291291
<hr/>
292292

293293
<div role="contentinfo">
294-
<p>&#169; Copyright 2024, The Trustees of Columbia University in the City of New York.</p>
294+
<p>&#169; Copyright 2025, The Trustees of Columbia University in the City of New York.</p>
295295
</div>
296296

297297
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

0 commit comments

Comments
 (0)