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/GSASIIstrMath.html

    r1168 r1183  
    5757<span class="sd">&#39;&#39;&#39;</span>
    5858<span class="c">########### SVN repository information ###################</span>
    59 <span class="c"># $Date: 2013-11-07 12:47:17 -0600 (Thu, 07 Nov 2013) $</span>
     59<span class="c"># $Date: 2013-12-19 09:37:07 -0600 (Thu, 19 Dec 2013) $</span>
    6060<span class="c"># $Author: vondreele $</span>
    61 <span class="c"># $Revision: 1140 $</span>
     61<span class="c"># $Revision: 1175 $</span>
    6262<span class="c"># $URL: https://subversion.xor.aps.anl.gov/pyGSAS/trunk/GSASIIstrMath.py $</span>
    63 <span class="c"># $Id: GSASIIstrMath.py 1140 2013-11-07 18:47:17Z vondreele $</span>
     63<span class="c"># $Id: GSASIIstrMath.py 1175 2013-12-19 15:37:07Z vondreele $</span>
    6464<span class="c">########### SVN repository information ###################</span>
    6565<span class="kn">import</span> <span class="nn">time</span>
     
    7272<span class="kn">import</span> <span class="nn">scipy.stats</span> <span class="kn">as</span> <span class="nn">st</span>
    7373<span class="kn">import</span> <span class="nn">GSASIIpath</span>
    74 <span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 1140 $&quot;</span><span class="p">)</span>
     74<span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 1175 $&quot;</span><span class="p">)</span>
    7575<span class="kn">import</span> <span class="nn">GSASIIElem</span> <span class="kn">as</span> <span class="nn">G2el</span>
    7676<span class="kn">import</span> <span class="nn">GSASIIlattice</span> <span class="kn">as</span> <span class="nn">G2lat</span>
     
    10771077        <span class="k">return</span> <span class="n">G2pwd</span><span class="o">.</span><span class="n">Absorb</span><span class="p">(</span><span class="s">&#39;Cylinder&#39;</span><span class="p">,</span><span class="n">parmDict</span><span class="p">[</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Absorption&#39;</span><span class="p">],</span><span class="n">refl</span><span class="p">[</span><span class="mi">5</span><span class="p">],</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">)</span>
    10781078    <span class="k">else</span><span class="p">:</span>
    1079         <span class="k">return</span> <span class="mf">1.0</span>
     1079        <span class="k">return</span> <span class="n">G2pwd</span><span class="o">.</span><span class="n">SurfaceRough</span><span class="p">(</span><span class="n">parmDict</span><span class="p">[</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;SurfRoughA&#39;</span><span class="p">],</span><span class="n">parmDict</span><span class="p">[</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;SurfRoughB&#39;</span><span class="p">],</span><span class="n">refl</span><span class="p">[</span><span class="mi">5</span><span class="p">])</span>
    10801080    </div>
    10811081<div class="viewcode-block" id="GetAbsorbDerv"><a class="viewcode-back" href="../GSASIIstruc.html#GSASIIstrMath.GetAbsorbDerv">[docs]</a><span class="k">def</span> <span class="nf">GetAbsorbDerv</span><span class="p">(</span><span class="n">refl</span><span class="p">,</span><span class="n">hfx</span><span class="p">,</span><span class="n">calcControls</span><span class="p">,</span><span class="n">parmDict</span><span class="p">):</span>
     
    10841084        <span class="k">return</span> <span class="n">G2pwd</span><span class="o">.</span><span class="n">AbsorbDerv</span><span class="p">(</span><span class="s">&#39;Cylinder&#39;</span><span class="p">,</span><span class="n">parmDict</span><span class="p">[</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Absorption&#39;</span><span class="p">],</span><span class="n">refl</span><span class="p">[</span><span class="mi">5</span><span class="p">],</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">)</span>
    10851085    <span class="k">else</span><span class="p">:</span>
    1086         <span class="k">return</span> <span class="mf">0.0</span>
     1086        <span class="k">return</span> <span class="n">G2pwd</span><span class="o">.</span><span class="n">SurfaceRoughDerv</span><span class="p">(</span><span class="n">parmDict</span><span class="p">[</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;SurfRoughA&#39;</span><span class="p">],</span><span class="n">parmDict</span><span class="p">[</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;SurfRoughB&#39;</span><span class="p">],</span><span class="n">refl</span><span class="p">[</span><span class="mi">5</span><span class="p">])</span>
    10871087    </div>
    10881088<div class="viewcode-block" id="GetIntensityCorr"><a class="viewcode-back" href="../GSASIIstruc.html#GSASIIstrMath.GetIntensityCorr">[docs]</a><span class="k">def</span> <span class="nf">GetIntensityCorr</span><span class="p">(</span><span class="n">refl</span><span class="p">,</span><span class="n">uniq</span><span class="p">,</span><span class="n">G</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">pfx</span><span class="p">,</span><span class="n">phfx</span><span class="p">,</span><span class="n">hfx</span><span class="p">,</span><span class="n">SGData</span><span class="p">,</span><span class="n">calcControls</span><span class="p">,</span><span class="n">parmDict</span><span class="p">):</span>
     
    16341634                    <span class="n">hfx</span><span class="o">+</span><span class="s">&#39;I(L2)/I(L1)&#39;</span><span class="p">:[</span><span class="mf">1.0</span><span class="p">,</span><span class="s">&#39;L1/L2&#39;</span><span class="p">],</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Zero&#39;</span><span class="p">:[</span><span class="n">dpdZ</span><span class="p">,</span><span class="s">&#39;pos&#39;</span><span class="p">],</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Lam&#39;</span><span class="p">:[</span><span class="n">dpdw</span><span class="p">,</span><span class="s">&#39;pos&#39;</span><span class="p">],</span>
    16351635                    <span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Shift&#39;</span><span class="p">:[</span><span class="n">dpdSh</span><span class="p">,</span><span class="s">&#39;pos&#39;</span><span class="p">],</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Transparency&#39;</span><span class="p">:[</span><span class="n">dpdTr</span><span class="p">,</span><span class="s">&#39;pos&#39;</span><span class="p">],</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;DisplaceX&#39;</span><span class="p">:[</span><span class="n">dpdX</span><span class="p">,</span><span class="s">&#39;pos&#39;</span><span class="p">],</span>
    1636                     <span class="n">hfx</span><span class="o">+</span><span class="s">&#39;DisplaceY&#39;</span><span class="p">:[</span><span class="n">dpdY</span><span class="p">,</span><span class="s">&#39;pos&#39;</span><span class="p">],</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Absorption&#39;</span><span class="p">:[</span><span class="n">dFdAb</span><span class="p">,</span><span class="s">&#39;int&#39;</span><span class="p">],}</span>
     1636                    <span class="n">hfx</span><span class="o">+</span><span class="s">&#39;DisplaceY&#39;</span><span class="p">:[</span><span class="n">dpdY</span><span class="p">,</span><span class="s">&#39;pos&#39;</span><span class="p">],}</span>
     1637                <span class="k">if</span> <span class="s">&#39;Bragg&#39;</span> <span class="ow">in</span> <span class="n">calcControls</span><span class="p">[</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;instType&#39;</span><span class="p">]:</span>
     1638                    <span class="n">names</span><span class="o">.</span><span class="n">update</span><span class="p">({</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;SurfRoughA&#39;</span><span class="p">:[</span><span class="n">dFdAb</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span><span class="s">&#39;int&#39;</span><span class="p">],</span>
     1639                        <span class="n">hfx</span><span class="o">+</span><span class="s">&#39;SurfRoughB&#39;</span><span class="p">:[</span><span class="n">dFdAb</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span><span class="s">&#39;int&#39;</span><span class="p">],})</span>
     1640                <span class="k">else</span><span class="p">:</span>
     1641                    <span class="n">names</span><span class="o">.</span><span class="n">update</span><span class="p">({</span><span class="n">hfx</span><span class="o">+</span><span class="s">&#39;Absorption&#39;</span><span class="p">:[</span><span class="n">dFdAb</span><span class="p">,</span><span class="s">&#39;int&#39;</span><span class="p">],})</span>
    16371642                <span class="k">for</span> <span class="n">name</span> <span class="ow">in</span> <span class="n">names</span><span class="p">:</span>
    16381643                    <span class="n">item</span> <span class="o">=</span> <span class="n">names</span><span class="p">[</span><span class="n">name</span><span class="p">]</span>
Note: See TracChangeset for help on using the changeset viewer.