Ignore:
Timestamp:
Jan 5, 2014 9:22:22 AM (8 years ago)
Author:
toby
Message:

fixup number formatting; update produced doc files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sphinxdocs/build/html/_modules/GSASIIspc.html

    r1168 r1183  
    6161<span class="sd">&quot;&quot;&quot;</span>
    6262<span class="c">########### SVN repository information ###################</span>
    63 <span class="c"># $Date: 2013-06-28 14:28:13 -0500 (Fri, 28 Jun 2013) $</span>
     63<span class="c"># $Date: 2013-12-17 09:38:23 -0600 (Tue, 17 Dec 2013) $</span>
    6464<span class="c"># $Author: vondreele $</span>
    65 <span class="c"># $Revision: 973 $</span>
     65<span class="c"># $Revision: 1169 $</span>
    6666<span class="c"># $URL: https://subversion.xor.aps.anl.gov/pyGSAS/trunk/GSASIIspc.py $</span>
    67 <span class="c"># $Id: GSASIIspc.py 973 2013-06-28 19:28:13Z vondreele $</span>
     67<span class="c"># $Id: GSASIIspc.py 1169 2013-12-17 15:38:23Z vondreele $</span>
    6868<span class="c">########### SVN repository information ###################</span>
    6969<span class="kn">import</span> <span class="nn">numpy</span> <span class="kn">as</span> <span class="nn">np</span>
     
    7575
    7676<span class="kn">import</span> <span class="nn">GSASIIpath</span>
    77 <span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 973 $&quot;</span><span class="p">)</span>
     77<span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 1169 $&quot;</span><span class="p">)</span>
    7878<span class="kn">import</span> <span class="nn">pyspg</span>
    7979
     
    304304<div class="viewcode-block" id="MT2text"><a class="viewcode-back" href="../GSASIIutil.html#GSASIIspc.MT2text">[docs]</a><span class="k">def</span> <span class="nf">MT2text</span><span class="p">(</span><span class="n">M</span><span class="p">,</span><span class="n">T</span><span class="p">):</span>
    305305    <span class="s">&quot;From space group matrix/translation operator returns text version&quot;</span>
    306     <span class="n">XYZ</span> <span class="o">=</span> <span class="p">(</span><span class="s">&#39;-Z &#39;</span><span class="p">,</span><span class="s">&#39;-Y &#39;</span><span class="p">,</span><span class="s">&#39;-X &#39;</span><span class="p">,</span><span class="s">&#39;X-Y&#39;</span><span class="p">,</span><span class="s">&#39;ERR&#39;</span><span class="p">,</span><span class="s">&#39;Y-X&#39;</span><span class="p">,</span><span class="s">&#39; X &#39;</span><span class="p">,</span><span class="s">&#39; Y &#39;</span><span class="p">,</span><span class="s">&#39; Z &#39;</span><span class="p">,</span><span class="s">&#39;+X &#39;</span><span class="p">,</span><span class="s">&#39;+Y &#39;</span><span class="p">,</span><span class="s">&#39;+Z &#39;</span><span class="p">)</span>
     306    <span class="n">XYZ</span> <span class="o">=</span> <span class="p">(</span><span class="s">&#39;-Z&#39;</span><span class="p">,</span><span class="s">&#39;-Y&#39;</span><span class="p">,</span><span class="s">&#39;-X&#39;</span><span class="p">,</span><span class="s">&#39;X-Y&#39;</span><span class="p">,</span><span class="s">&#39;ERR&#39;</span><span class="p">,</span><span class="s">&#39;Y-X&#39;</span><span class="p">,</span><span class="s">&#39;X&#39;</span><span class="p">,</span><span class="s">&#39;Y&#39;</span><span class="p">,</span><span class="s">&#39;Z&#39;</span><span class="p">)</span>
    307307    <span class="n">TRA</span> <span class="o">=</span> <span class="p">(</span><span class="s">&#39;   &#39;</span><span class="p">,</span><span class="s">&#39;ERR&#39;</span><span class="p">,</span><span class="s">&#39;1/6&#39;</span><span class="p">,</span><span class="s">&#39;1/4&#39;</span><span class="p">,</span><span class="s">&#39;1/3&#39;</span><span class="p">,</span><span class="s">&#39;ERR&#39;</span><span class="p">,</span><span class="s">&#39;1/2&#39;</span><span class="p">,</span><span class="s">&#39;ERR&#39;</span><span class="p">,</span><span class="s">&#39;2/3&#39;</span><span class="p">,</span><span class="s">&#39;3/4&#39;</span><span class="p">,</span><span class="s">&#39;5/6&#39;</span><span class="p">,</span><span class="s">&#39;ERR&#39;</span><span class="p">)</span>
    308308    <span class="n">Fld</span> <span class="o">=</span> <span class="s">&#39;&#39;</span>
     
    310310        <span class="n">IJ</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="nb">round</span><span class="p">(</span><span class="mi">2</span><span class="o">*</span><span class="n">M</span><span class="p">[</span><span class="n">j</span><span class="p">][</span><span class="mi">0</span><span class="p">]</span><span class="o">+</span><span class="mi">3</span><span class="o">*</span><span class="n">M</span><span class="p">[</span><span class="n">j</span><span class="p">][</span><span class="mi">1</span><span class="p">]</span><span class="o">+</span><span class="mi">4</span><span class="o">*</span><span class="n">M</span><span class="p">[</span><span class="n">j</span><span class="p">][</span><span class="mi">2</span><span class="p">]</span><span class="o">+</span><span class="mi">4</span><span class="p">))</span><span class="o">%</span><span class="mi">12</span>
    311311        <span class="n">IK</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="nb">round</span><span class="p">(</span><span class="n">T</span><span class="p">[</span><span class="n">j</span><span class="p">]</span><span class="o">*</span><span class="mi">12</span><span class="p">))</span><span class="o">%</span><span class="mi">12</span>
    312         <span class="k">if</span> <span class="n">IK</span> <span class="o">&gt;</span> <span class="mi">0</span> <span class="ow">and</span> <span class="n">IJ</span> <span class="o">&gt;</span> <span class="mi">4</span><span class="p">:</span> <span class="n">IJ</span> <span class="o">+=</span> <span class="mi">3</span>
    313         <span class="n">Fld</span> <span class="o">+=</span> <span class="n">TRA</span><span class="p">[</span><span class="n">IK</span><span class="p">]</span><span class="o">+</span><span class="n">XYZ</span><span class="p">[</span><span class="n">IJ</span><span class="p">]</span>
    314         <span class="k">if</span> <span class="n">j</span> <span class="o">!=</span> <span class="mi">2</span><span class="p">:</span> <span class="n">Fld</span> <span class="o">+=</span> <span class="s">&#39;,&#39;</span>
     312        <span class="k">if</span> <span class="n">IK</span><span class="p">:</span>
     313            <span class="k">if</span> <span class="n">IJ</span> <span class="o">&lt;</span> <span class="mi">3</span><span class="p">:</span>
     314                <span class="n">Fld</span> <span class="o">+=</span> <span class="n">TRA</span><span class="p">[</span><span class="n">IK</span><span class="p">]</span><span class="o">+</span><span class="n">XYZ</span><span class="p">[</span><span class="n">IJ</span><span class="p">]</span>
     315            <span class="k">else</span><span class="p">:</span>
     316                <span class="n">Fld</span> <span class="o">+=</span> <span class="n">TRA</span><span class="p">[</span><span class="n">IK</span><span class="p">]</span><span class="o">+</span><span class="s">&#39;+&#39;</span><span class="o">+</span><span class="n">XYZ</span><span class="p">[</span><span class="n">IJ</span><span class="p">]</span>
     317        <span class="k">else</span><span class="p">:</span>
     318            <span class="n">Fld</span> <span class="o">+=</span> <span class="n">XYZ</span><span class="p">[</span><span class="n">IJ</span><span class="p">]</span>
     319        <span class="k">if</span> <span class="n">j</span> <span class="o">!=</span> <span class="mi">2</span><span class="p">:</span> <span class="n">Fld</span> <span class="o">+=</span> <span class="s">&#39;, &#39;</span>
    315320    <span class="k">return</span> <span class="n">Fld</span>
    316321    </div>
Note: See TracChangeset for help on using the changeset viewer.