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/G2sfact.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-09-26 09:41:33 -0500 (Fri, 26 Sep 2014) $</span>
     53<span class="c"># $Date: 2015-02-13 13:35:55 -0600 (Fri, 13 Feb 2015) $</span>
    5454<span class="c"># $Author: vondreele $</span>
    55 <span class="c"># $Revision: 1506 $</span>
     55<span class="c"># $Revision: 1655 $</span>
    5656<span class="c"># $URL: https://subversion.xray.aps.anl.gov/pyGSAS/trunk/imports/G2sfact.py $</span>
    57 <span class="c"># $Id: G2sfact.py 1506 2014-09-26 14:41:33Z vondreele $</span>
     57<span class="c"># $Id: G2sfact.py 1655 2015-02-13 19:35:55Z vondreele $</span>
    5858<span class="c">########### SVN repository information ###################</span>
    5959<span class="sd">&#39;&#39;&#39;</span>
     
    6969<span class="kn">import</span> <span class="nn">GSASIIIO</span> <span class="kn">as</span> <span class="nn">G2IO</span>
    7070<span class="kn">import</span> <span class="nn">GSASIIpath</span>
    71 <span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 1506 $&quot;</span><span class="p">)</span>
     71<span class="n">GSASIIpath</span><span class="o">.</span><span class="n">SetVersionNumber</span><span class="p">(</span><span class="s">&quot;$Revision: 1655 $&quot;</span><span class="p">)</span>
    7272
    7373<div class="viewcode-block" id="ColumnValidator"><a class="viewcode-back" href="../imports.html#G2sfact.ColumnValidator">[docs]</a><span class="k">def</span> <span class="nf">ColumnValidator</span><span class="p">(</span><span class="n">parent</span><span class="p">,</span> <span class="n">filepointer</span><span class="p">,</span><span class="n">nCol</span><span class="o">=</span><span class="mi">5</span><span class="p">):</span>
     
    202202                <span class="k">break</span>
    203203        <span class="bp">self</span><span class="o">.</span><span class="n">Super</span> <span class="o">=</span> <span class="n">numCols</span><span class="o">-</span><span class="mi">9</span>     <span class="c">#= 0,1,2,or 3</span>
     204        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">Super</span> <span class="o">&gt;</span> <span class="mi">1</span><span class="p">:</span>
     205            <span class="k">raise</span> <span class="bp">self</span><span class="o">.</span><span class="n">ImportException</span><span class="p">(</span><span class="s">&quot;Supersymmetry too high; GSAS-II limited to (3+1) supersymmetry&quot;</span><span class="p">)</span>           
    204206        <span class="k">return</span> <span class="bp">True</span> <span class="c">#ColumnValidator(self, filepointer)</span>
    205207</div>
     
    217219                        <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span> <span class="o">=</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">()[:</span><span class="mi">6</span><span class="p">]</span>
    218220                        <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span> <span class="o">=</span> <span class="p">[</span><span class="nb">int</span><span class="p">(</span><span class="n">h</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">k</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">l</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">m1</span><span class="p">)]</span>
    219                     <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">Super</span> <span class="o">==</span> <span class="mi">2</span><span class="p">:</span>
    220                         <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="n">m2</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span> <span class="o">=</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">()[:</span><span class="mi">7</span><span class="p">]</span>
    221                         <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="n">m2</span> <span class="o">=</span> <span class="p">[</span><span class="nb">int</span><span class="p">(</span><span class="n">h</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">k</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">l</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">m1</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">m2</span><span class="p">)]</span>
    222                     <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">Super</span> <span class="o">==</span> <span class="mi">3</span><span class="p">:</span>
    223                         <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="n">m2</span><span class="p">,</span><span class="n">m3</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span> <span class="o">=</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">()[:</span><span class="mi">8</span><span class="p">]</span>
    224                         <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="n">m2</span><span class="p">,</span><span class="n">m3</span> <span class="o">=</span> <span class="p">[</span><span class="nb">int</span><span class="p">(</span><span class="n">h</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">k</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">l</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">m1</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">m2</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">m3</span><span class="p">)]</span>                       
    225221                <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>  <span class="c">#skipping text at front</span>
    226222                    <span class="n">text</span> <span class="o">=</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">()</span>
     
    235231                <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">Super</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
    236232                    <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">append</span><span class="p">([</span><span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">])</span>
    237                 <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">Super</span> <span class="o">==</span> <span class="mi">2</span><span class="p">:</span>
    238                     <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">append</span><span class="p">([</span><span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="n">m2</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">])</span>
    239                 <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">Super</span> <span class="o">==</span> <span class="mi">3</span><span class="p">:</span>
    240                     <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">append</span><span class="p">([</span><span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">m1</span><span class="p">,</span><span class="n">m2</span><span class="p">,</span><span class="n">m3</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">])</span>
    241233            <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">=</span> <span class="s">&#39;Error after reading reflections (unexpected!)&#39;</span>
    242234            <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">])</span>
     
    440432                <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;Type&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s">&#39;SNT&#39;</span>
    441433                <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;Super&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="mi">0</span>   <span class="c">#for now</span>
     434                <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">=</span> <span class="s">&#39;Error after reading reflections (unexpected!)&#39;</span>
     435                <span class="bp">self</span><span class="o">.</span><span class="n">UpdateParameters</span><span class="p">(</span><span class="n">Type</span><span class="o">=</span><span class="s">&#39;SNT&#39;</span><span class="p">,</span><span class="n">Wave</span><span class="o">=</span><span class="bp">None</span><span class="p">)</span> <span class="c"># histogram type</span>
     436            <span class="k">return</span> <span class="bp">True</span>
     437        <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">detail</span><span class="p">:</span>
     438            <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">+=</span> <span class="s">&#39;</span><span class="se">\n</span><span class="s">  &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">detail</span><span class="p">)</span>
     439            <span class="k">print</span> <span class="s">&#39;</span><span class="se">\n\n</span><span class="s">&#39;</span><span class="o">+</span><span class="bp">self</span><span class="o">.</span><span class="n">formatName</span><span class="o">+</span><span class="s">&#39; read error: &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">detail</span><span class="p">)</span> <span class="c"># for testing</span>
     440            <span class="kn">import</span> <span class="nn">traceback</span>
     441            <span class="n">traceback</span><span class="o">.</span><span class="n">print_exc</span><span class="p">(</span><span class="nb">file</span><span class="o">=</span><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="p">)</span>
     442            <span class="k">return</span> <span class="bp">False</span>
     443</div></div>
     444<div class="viewcode-block" id="ISIS_SXD_INT_ReaderClass"><a class="viewcode-back" href="../imports.html#G2sfact.ISIS_SXD_INT_ReaderClass">[docs]</a><span class="k">class</span> <span class="nc">ISIS_SXD_INT_ReaderClass</span><span class="p">(</span><span class="n">G2IO</span><span class="o">.</span><span class="n">ImportStructFactor</span><span class="p">):</span>
     445    <span class="s">&#39;Routines to import neutron TOF F**2, sig(F**2) reflections from a ISIS int file&#39;</span>
     446    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
     447        <span class="nb">super</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">__class__</span><span class="p">,</span><span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="n">__init__</span><span class="p">(</span> <span class="c"># fancy way to self-reference</span>
     448            <span class="n">extensionlist</span><span class="o">=</span><span class="p">(</span><span class="s">&#39;.int&#39;</span><span class="p">,</span><span class="s">&#39;.INT&#39;</span><span class="p">),</span>
     449            <span class="n">strictExtension</span><span class="o">=</span><span class="bp">False</span><span class="p">,</span>
     450            <span class="n">formatName</span> <span class="o">=</span> <span class="s">u&#39;Neutron SXD TOF HKL F</span><span class="se">\u00b2</span><span class="s">&#39;</span><span class="p">,</span>
     451            <span class="n">longFormatName</span> <span class="o">=</span> <span class="s">u&#39;Neutron SXD TOF [hkl, Fo</span><span class="se">\u00b2</span><span class="s">, sig(Fo</span><span class="se">\u00b2</span><span class="s">),...] Structure factor text file&#39;</span>
     452            <span class="p">)</span>
     453
     454<div class="viewcode-block" id="ISIS_SXD_INT_ReaderClass.ContentsValidator"><a class="viewcode-back" href="../imports.html#G2sfact.ISIS_SXD_INT_ReaderClass.ContentsValidator">[docs]</a>    <span class="k">def</span> <span class="nf">ContentsValidator</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">filepointer</span><span class="p">):</span>
     455        <span class="s">&#39;Make sure file contains the expected columns on numbers &amp; count number of data blocks - &quot;Banks&quot;&#39;</span>
     456        <span class="n">oldNo</span> <span class="o">=</span> <span class="o">-</span><span class="mi">1</span>
     457        <span class="k">for</span> <span class="n">line</span><span class="p">,</span><span class="n">S</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">filepointer</span><span class="p">):</span>
     458            <span class="k">if</span> <span class="ow">not</span> <span class="n">S</span><span class="p">:</span>   <span class="c">#empty line terminates read</span>
     459                <span class="k">break</span>
     460            <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> <span class="k">continue</span>       <span class="c">#ignore comments, if any</span>
     461            <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> <span class="k">continue</span>        <span class="c">#ignore format line</span>
     462            <span class="n">bankNo</span> <span class="o">=</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">()[</span><span class="mi">5</span><span class="p">]</span>
     463            <span class="k">if</span> <span class="n">bankNo</span> <span class="o">!=</span> <span class="n">oldNo</span><span class="p">:</span>
     464                <span class="bp">self</span><span class="o">.</span><span class="n">Banks</span><span class="o">.</span><span class="n">append</span><span class="p">({</span><span class="s">&#39;RefDict&#39;</span><span class="p">:{</span><span class="s">&#39;RefList&#39;</span><span class="p">:[],}})</span>
     465                <span class="n">oldNo</span> <span class="o">=</span> <span class="n">bankNo</span>
     466        <span class="n">filepointer</span><span class="o">.</span><span class="n">seek</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
     467        <span class="k">return</span> <span class="n">ColumnValidator</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">filepointer</span><span class="p">,</span><span class="n">nCol</span><span class="o">=</span><span class="mi">8</span><span class="p">)</span>
     468</div>
     469<div class="viewcode-block" id="ISIS_SXD_INT_ReaderClass.Reader"><a class="viewcode-back" href="../imports.html#G2sfact.ISIS_SXD_INT_ReaderClass.Reader">[docs]</a>    <span class="k">def</span> <span class="nf">Reader</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="n">filename</span><span class="p">,</span><span class="n">filepointer</span><span class="p">,</span> <span class="n">ParentFrame</span><span class="o">=</span><span class="bp">None</span><span class="p">,</span> <span class="o">**</span><span class="n">unused</span><span class="p">):</span>
     470        <span class="s">&#39;Read the file&#39;</span>
     471        <span class="n">filepointer</span><span class="o">.</span><span class="n">seek</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
     472        <span class="k">try</span><span class="p">:</span>
     473            <span class="k">for</span> <span class="n">line</span><span class="p">,</span><span class="n">S</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">filepointer</span><span class="p">):</span>
     474                <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">=</span> <span class="s">&#39;  Error reading line &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">line</span><span class="o">+</span><span class="mi">1</span><span class="p">)</span>
     475                <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> <span class="k">continue</span>       <span class="c">#ignore comments, if any</span>
     476                <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> <span class="k">continue</span>        <span class="c">#ignore the format line</span>
     477                <span class="n">data</span> <span class="o">=</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">()</span>
     478                <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span><span class="p">,</span><span class="n">bN</span><span class="p">,</span><span class="n">wave</span><span class="p">,</span><span class="n">x</span><span class="p">,</span><span class="n">x</span><span class="p">,</span><span class="n">tbar</span> <span class="o">=</span> <span class="n">data</span><span class="p">[:</span><span class="mi">10</span><span class="p">]</span>                   
     479                <span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span> <span class="o">=</span> <span class="p">[</span><span class="nb">int</span><span class="p">(</span><span class="n">h</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">k</span><span class="p">),</span><span class="nb">int</span><span class="p">(</span><span class="n">l</span><span class="p">)]</span>
     480                <span class="k">if</span> <span class="ow">not</span> <span class="nb">any</span><span class="p">([</span><span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">]):</span>
     481                    <span class="k">break</span>
     482                <span class="n">Fo</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">Fo</span><span class="p">)</span>
     483                <span class="n">sigFo</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">sigFo</span><span class="p">)</span>
     484                <span class="n">wave</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">wave</span><span class="p">)</span>
     485                <span class="n">tbar</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">tbar</span><span class="p">)</span>
     486                <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">Banks</span><span class="p">):</span>
     487                    <span class="bp">self</span><span class="o">.</span><span class="n">Banks</span><span class="p">[</span><span class="nb">int</span><span class="p">(</span><span class="n">bN</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">][</span><span class="s">&#39;RefDict&#39;</span><span class="p">][</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">append</span><span class="p">([</span><span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">wave</span><span class="p">,</span><span class="n">tbar</span><span class="p">])</span>
     488                <span class="k">else</span><span class="p">:</span>
     489                <span class="c"># h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...</span>
     490                    <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">append</span><span class="p">([</span><span class="n">h</span><span class="p">,</span><span class="n">k</span><span class="p">,</span><span class="n">l</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="n">sigFo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">Fo</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">,</span><span class="n">wave</span><span class="p">,</span><span class="n">tbar</span><span class="p">])</span>
     491            <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">Banks</span><span class="p">):</span>
     492                <span class="bp">self</span><span class="o">.</span><span class="n">UpdateParameters</span><span class="p">(</span><span class="n">Type</span><span class="o">=</span><span class="s">&#39;SNT&#39;</span><span class="p">,</span><span class="n">Wave</span><span class="o">=</span><span class="bp">None</span><span class="p">)</span> <span class="c"># histogram type</span>
     493                <span class="k">for</span> <span class="n">Bank</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">Banks</span><span class="p">:</span>
     494                    <span class="n">Bank</span><span class="p">[</span><span class="s">&#39;RefDict&#39;</span><span class="p">][</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">Bank</span><span class="p">[</span><span class="s">&#39;RefDict&#39;</span><span class="p">][</span><span class="s">&#39;RefList&#39;</span><span class="p">])</span>
     495                    <span class="n">Bank</span><span class="p">[</span><span class="s">&#39;RefDict&#39;</span><span class="p">][</span><span class="s">&#39;Type&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s">&#39;SNT&#39;</span>                   
     496                    <span class="n">Bank</span><span class="p">[</span><span class="s">&#39;RefDict&#39;</span><span class="p">][</span><span class="s">&#39;Super&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="mi">0</span>
     497            <span class="k">else</span><span class="p">:</span>
     498                <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;RefList&#39;</span><span class="p">])</span>
     499                <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;Type&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s">&#39;SNT&#39;</span>
     500                <span class="bp">self</span><span class="o">.</span><span class="n">RefDict</span><span class="p">[</span><span class="s">&#39;Super&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="mi">0</span>
    442501                <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">=</span> <span class="s">&#39;Error after reading reflections (unexpected!)&#39;</span>
    443502                <span class="bp">self</span><span class="o">.</span><span class="n">UpdateParameters</span><span class="p">(</span><span class="n">Type</span><span class="o">=</span><span class="s">&#39;SNT&#39;</span><span class="p">,</span><span class="n">Wave</span><span class="o">=</span><span class="bp">None</span><span class="p">)</span> <span class="c"># histogram type</span>
Note: See TracChangeset for help on using the changeset viewer.