Ignore:
Timestamp:
Mar 14, 2015 5:35:03 PM (8 years ago)
Author:
toby
Message:

change sphinx docs links; rebuild & fixing minor formatting

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sphinxdocs/build/html/_modules/G2pwd_xye.html

    r1513 r1709  
    5151<span class="c"># -*- coding: utf-8 -*-</span>
    5252<span class="c">########### SVN repository information ###################</span>
    53 <span class="c"># $Date: 2014-08-22 15:04:55 -0500 (Fri, 22 Aug 2014) $</span>
     53<span class="c"># $Date: 2014-12-27 11:14:59 -0600 (Sat, 27 Dec 2014) $</span>
    5454<span class="c"># $Author: vondreele $</span>
    55 <span class="c"># $Revision: 1476 $</span>
    56 <span class="c"># $URL: https://subversion.xor.aps.anl.gov/pyGSAS/trunk/imports/G2pwd_xye.py $</span>
    57 <span class="c"># $Id: G2pwd_xye.py 1476 2014-08-22 20:04:55Z vondreele $</span>
     55<span class="c"># $Revision: 1620 $</span>
     56<span class="c"># $URL: https://subversion.xray.aps.anl.gov/pyGSAS/trunk/imports/G2pwd_xye.py $</span>
     57<span class="c"># $Id: G2pwd_xye.py 1620 2014-12-27 17:14:59Z vondreele $</span>
    5858<span class="c">########### SVN repository information ###################</span>
    5959<span class="sd">&#39;&#39;&#39;</span>
    … …  
    7070<span class="kn">import</span> <span class="nn">GSASIIIO</span> <span class="kn">as</span> <span class="nn">G2IO</span>
    7171<span class="kn">import</span> <span class="nn">GSASIIpath</span>
    72 <span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 1476 $&quot;</span><span class="p">)</span>
     72<span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 1620 $&quot;</span><span class="p">)</span>
    7373<div class="viewcode-block" id="xye_ReaderClass"><a class="viewcode-back" href="../imports.html#G2pwd_xye.xye_ReaderClass">[docs]</a><span class="k">class</span> <span class="nc">xye_ReaderClass</span><span class="p">(</span><span class="n">G2IO</span><span class="o">.</span><span class="n">ImportPowderData</span><span class="p">):</span>
    7474    <span class="s">&#39;Routines to import powder data from a .xye file&#39;</span>
    … …  
    9696                    <span class="n">gotCcomment</span> <span class="o">=</span> <span class="bp">True</span>
    9797                    <span class="k">continue</span>   
    98                 <span class="k">if</span> <span class="n">S</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;#&#39;</span><span class="p">:</span>
     98                <span class="k">if</span> <span class="n">S</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="ow">in</span> <span class="p">[</span><span class="s">&quot;&#39;&quot;</span><span class="p">,</span><span class="s">&#39;#&#39;</span><span class="p">]:</span>
    9999                    <span class="k">continue</span>       <span class="c">#ignore comments, if any</span>
    100100                <span class="k">else</span><span class="p">:</span>
    … …  
    131131                        <span class="n">gotCcomment</span> <span class="o">=</span> <span class="bp">True</span>
    132132                        <span class="k">continue</span>   
    133                     <span class="k">if</span> <span class="n">S</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;#&#39;</span><span class="p">:</span>
     133                    <span class="k">if</span> <span class="n">S</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="ow">in</span> <span class="p">[</span><span class="s">&quot;&#39;&quot;</span><span class="p">,</span><span class="s">&#39;#&#39;</span><span class="p">]:</span>
    134134                        <span class="bp">self</span><span class="o">.</span><span class="n">comments</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">S</span><span class="p">[:</span><span class="o">-</span><span class="mi">1</span><span class="p">])</span>
    135135                        <span class="k">continue</span>       <span class="c">#ignore comments, if any</span>
    … …  
    138138                <span class="c"># valid line to read</span>
    139139                <span class="n">vals</span> <span class="o">=</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">()</span>
     140                <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">vals</span><span class="p">)</span> <span class="o">&lt;</span> <span class="mi">2</span><span class="p">:</span>
     141                    <span class="k">print</span> <span class="s">&#39;Line &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">i</span><span class="o">+</span><span class="mi">1</span><span class="p">)</span><span class="o">+</span><span class="s">&#39; cannot be read:</span><span class="se">\n\t</span><span class="s">&#39;</span><span class="o">+</span><span class="n">S</span>
     142                    <span class="k">continue</span>
    140143                <span class="k">try</span><span class="p">:</span>
    141144                    <span class="n">x</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="nb">float</span><span class="p">(</span><span class="n">vals</span><span class="p">[</span><span class="mi">0</span><span class="p">]))</span>
    … …  
    151154                        <span class="n">w</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="mf">1.0</span><span class="o">/</span><span class="nb">float</span><span class="p">(</span><span class="n">vals</span><span class="p">[</span><span class="mi">1</span><span class="p">]))</span>
    152155                <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
     156                    <span class="n">msg</span> <span class="o">=</span> <span class="s">&#39;Error parsing number in line &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">i</span><span class="o">+</span><span class="mi">1</span><span class="p">)</span>
     157                    <span class="k">print</span> <span class="n">msg</span>
     158                    <span class="k">print</span> <span class="n">S</span>
     159                    <span class="k">break</span>
     160                <span class="k">except</span><span class="p">:</span>
    153161                    <span class="n">msg</span> <span class="o">=</span> <span class="s">&#39;Error in line &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">i</span><span class="o">+</span><span class="mi">1</span><span class="p">)</span>
    154162                    <span class="k">print</span> <span class="n">msg</span>
     163                    <span class="k">print</span> <span class="n">S</span>
    155164                    <span class="k">break</span>
    156165            <span class="n">N</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
Note: See TracChangeset for help on using the changeset viewer.