Ignore:
Timestamp:
May 2, 2015 5:30:05 PM (10 years ago)
Author:
toby
Message:

bug fix in unused grid code; doc fixes and cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified sphinxdocs/build/html/_modules/G2pwd_fxye.html

    r1709 r1832  
    5151<span class="c"># -*- coding: utf-8 -*-</span>
    5252<span class="c">########### SVN repository information ###################</span>
    53 <span class="c"># $Date: 2015-02-12 15:36:46 -0600 (Thu, 12 Feb 2015) $</span>
     53<span class="c"># $Date: 2015-04-30 16:34:19 -0500 (Thu, 30 Apr 2015) $</span>
    5454<span class="c"># $Author: vondreele $</span>
    55 <span class="c"># $Revision: 1652 $</span>
     55<span class="c"># $Revision: 1829 $</span>
    5656<span class="c"># $URL: https://subversion.xray.aps.anl.gov/pyGSAS/trunk/imports/G2pwd_fxye.py $</span>
    57 <span class="c"># $Id: G2pwd_fxye.py 1652 2015-02-12 21:36:46Z vondreele $</span>
     57<span class="c"># $Id: G2pwd_fxye.py 1829 2015-04-30 21:34:19Z 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: 1652 $&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: 1829 $&quot;</span><span class="p">)</span>
    7272
    7373<div class="viewcode-block" id="GSAS_ReaderClass"><a class="viewcode-back" href="../imports.html#G2pwd_fxye.GSAS_ReaderClass">[docs]</a><span class="k">class</span> <span class="nc">GSAS_ReaderClass</span><span class="p">(</span><span class="n">G2IO</span><span class="o">.</span><span class="n">ImportPowderData</span><span class="p">):</span>
    … …  
    8080            <span class="n">longFormatName</span> <span class="o">=</span> <span class="s">&#39;GSAS powder data files (.fxye, .raw, .gsas...)&#39;</span>
    8181            <span class="p">)</span>
    82         <span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span> <span class="o">=</span> <span class="bp">None</span>
     82        <span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span> <span class="o">=</span> <span class="p">{}</span>
     83        <span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span> <span class="o">=</span> <span class="p">{}</span>
    8384
    8485    <span class="c"># Validate the contents -- look for a bank line</span>
    … …  
    153154            <span class="n">File</span><span class="o">.</span><span class="n">seek</span><span class="p">(</span><span class="n">Pos</span><span class="p">)</span>
    154155            <span class="n">cons</span> <span class="o">=</span> <span class="n">Bank</span><span class="o">.</span><span class="n">split</span><span class="p">()</span>
    155             <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">:</span>
     156            <span class="k">if</span> <span class="s">&#39;TIME_MAP&#39;</span> <span class="o">==</span> <span class="n">cons</span><span class="p">[</span><span class="mi">4</span><span class="p">]:</span>
    156157                <span class="n">start</span> <span class="o">=</span> <span class="mi">0</span>
    157158                <span class="n">step</span> <span class="o">=</span> <span class="mi">1</span>
    … …  
    165166            <span class="n">j</span> <span class="o">=</span> <span class="mi">0</span>
    166167            <span class="k">while</span> <span class="n">S</span> <span class="ow">and</span> <span class="n">S</span><span class="p">[:</span><span class="mi">4</span><span class="p">]</span> <span class="o">!=</span> <span class="s">&#39;BANK&#39;</span> <span class="ow">and</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>
     168                <span class="k">if</span> <span class="s">&#39;TIME_MAP&#39;</span> <span class="ow">in</span> <span class="n">S</span><span class="p">:</span>
     169                    <span class="k">break</span>
    167170                <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="mi">80</span><span class="p">,</span><span class="mi">16</span><span class="p">):</span>
     171                    <span class="k">if</span> <span class="n">S</span><span class="p">[</span><span class="n">i</span><span class="p">:</span><span class="n">i</span><span class="o">+</span><span class="mi">8</span><span class="p">]</span> <span class="o">==</span> <span class="mi">8</span><span class="o">*</span><span class="s">&#39; &#39;</span><span class="p">:</span>
     172                        <span class="k">break</span>
    168173                    <span class="n">xi</span> <span class="o">=</span> <span class="n">start</span><span class="o">+</span><span class="n">step</span><span class="o">*</span><span class="n">j</span>
    169174                    <span class="n">yi</span> <span class="o">=</span> <span class="n">sfloat</span><span class="p">(</span><span class="n">S</span><span class="p">[</span><span class="n">i</span><span class="p">:</span><span class="n">i</span><span class="o">+</span><span class="mi">8</span><span class="p">])</span>
    … …  
    180185            <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>
    181186            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">:</span>
    182                 <span class="n">x</span> <span class="o">=</span> <span class="n">Tmap2TOF</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">,</span><span class="n">clockWd</span><span class="p">)</span>
     187                <span class="n">x</span> <span class="o">=</span> <span class="n">Tmap2TOF</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">[</span><span class="n">cons</span><span class="p">[</span><span class="mi">5</span><span class="p">]],</span><span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">[</span><span class="n">cons</span><span class="p">[</span><span class="mi">5</span><span class="p">]])</span>
    183188            <span class="k">return</span> <span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">x</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">y</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">w</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">)]</span>
    184189       
    … …  
    200205            <span class="k">while</span> <span class="n">S</span> <span class="ow">and</span> <span class="n">S</span><span class="p">[:</span><span class="mi">4</span><span class="p">]</span> <span class="o">!=</span> <span class="s">&#39;BANK&#39;</span> <span class="ow">and</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>
    201206                <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="mi">80</span><span class="p">,</span><span class="mi">8</span><span class="p">):</span>
     207                    <span class="k">if</span> <span class="n">S</span><span class="p">[</span><span class="n">i</span><span class="p">:</span><span class="n">i</span><span class="o">+</span><span class="mi">10</span><span class="p">]</span> <span class="o">==</span> <span class="mi">10</span><span class="o">*</span><span class="s">&#39; &#39;</span><span class="p">:</span>
     208                        <span class="k">break</span>
    202209                    <span class="n">xi</span> <span class="o">=</span> <span class="n">start</span><span class="o">+</span><span class="n">step</span><span class="o">*</span><span class="n">j</span>
    203210                    <span class="n">ni</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="n">sint</span><span class="p">(</span><span class="n">S</span><span class="p">[</span><span class="n">i</span><span class="p">:</span><span class="n">i</span><span class="o">+</span><span class="mi">2</span><span class="p">]),</span><span class="mi">1</span><span class="p">)</span>
    … …  
    220227            <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>
    221228            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">:</span>
    222                 <span class="n">x</span> <span class="o">=</span> <span class="n">Tmap2TOF</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">)[:</span><span class="o">-</span><span class="mi">2</span><span class="p">]</span>
     229                <span class="n">x</span> <span class="o">=</span> <span class="n">Tmap2TOF</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">[</span><span class="n">cons</span><span class="p">[</span><span class="mi">5</span><span class="p">]],</span><span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">[</span><span class="n">cons</span><span class="p">[</span><span class="mi">5</span><span class="p">]])</span>
    223230            <span class="k">return</span> <span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">x</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">y</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">w</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">)]</span>
    224231           
    … …  
    233240            <span class="k">while</span> <span class="n">S</span> <span class="ow">and</span> <span class="n">S</span><span class="p">[:</span><span class="mi">4</span><span class="p">]</span> <span class="o">!=</span> <span class="s">&#39;BANK&#39;</span> <span class="ow">and</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>
    234241                <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="mi">80</span><span class="p">,</span><span class="mi">20</span><span class="p">):</span>
     242                    <span class="k">if</span> <span class="n">S</span><span class="p">[</span><span class="n">i</span><span class="p">:</span><span class="n">i</span><span class="o">+</span><span class="mi">8</span><span class="p">]</span> <span class="o">==</span> <span class="mi">9</span><span class="o">*</span><span class="s">&#39; &#39;</span><span class="p">:</span>
     243                        <span class="k">break</span>
    235244                    <span class="n">xi</span> <span class="o">=</span> <span class="n">sfloat</span><span class="p">(</span><span class="n">S</span><span class="p">[</span><span class="n">i</span><span class="p">:</span><span class="n">i</span><span class="o">+</span><span class="mi">9</span><span class="p">])</span><span class="o">/</span><span class="mf">3200.</span>
    236245                    <span class="n">yi</span> <span class="o">=</span> <span class="n">sfloat</span><span class="p">(</span><span class="n">S</span><span class="p">[</span><span class="n">i</span><span class="o">+</span><span class="mi">9</span><span class="p">:</span><span class="n">i</span><span class="o">+</span><span class="mi">16</span><span class="p">])</span><span class="o">/</span><span class="mf">1000.</span>
    … …  
    247256            <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>
    248257            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">:</span>
    249                 <span class="n">x</span> <span class="o">=</span> <span class="n">Tmap2TOF</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">,</span><span class="n">clockWd</span><span class="p">)</span>
     258                <span class="n">x</span> <span class="o">=</span> <span class="n">Tmap2TOF</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">[</span><span class="n">cons</span><span class="p">[</span><span class="mi">5</span><span class="p">]],</span><span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">[</span><span class="n">cons</span><span class="p">[</span><span class="mi">5</span><span class="p">]])</span>
    250259            <span class="k">return</span> <span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">x</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">y</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">w</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">),</span><span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">N</span><span class="p">)]</span>
    251260           
    252261        <span class="k">def</span> <span class="nf">GetTimeMap</span><span class="p">(</span><span class="n">File</span><span class="p">,</span><span class="n">Pos</span><span class="p">,</span><span class="n">TimeMap</span><span class="p">):</span>
    253262            <span class="n">File</span><span class="o">.</span><span class="n">seek</span><span class="p">(</span><span class="n">Pos</span><span class="p">)</span>
    254             <span class="n">cons</span> <span class="o">=</span> <span class="n">TimeMap</span><span class="o">.</span><span class="n">split</span><span class="p">()</span>
     263            <span class="n">cons</span> <span class="o">=</span> <span class="n">TimeMap</span><span class="p">[</span><span class="mi">8</span><span class="p">:]</span><span class="o">.</span><span class="n">split</span><span class="p">()</span>
     264            <span class="n">mapNo</span> <span class="o">=</span> <span class="n">cons</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
     265            <span class="k">if</span> <span class="n">mapNo</span> <span class="o">==</span> <span class="s">&#39;10&#39;</span><span class="p">:</span> <span class="n">mapNo</span> <span class="o">=</span> <span class="s">&#39;1&#39;</span>   <span class="c">#HIPD cluge!</span>
    255266            <span class="n">Nch</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">cons</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span>
    256267            <span class="n">Nrec</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">cons</span><span class="p">[</span><span class="mi">2</span><span class="p">])</span>
    … …  
    270281            <span class="n">TMap</span> <span class="o">=</span> <span class="n">TMap</span><span class="o">.</span><span class="n">T</span>
    271282            <span class="n">TMap</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">-=</span> <span class="mi">1</span>
    272             <span class="k">return</span> <span class="n">TMap</span><span class="o">.</span><span class="n">T</span><span class="p">,</span><span class="n">clockWd</span>
     283            <span class="k">return</span> <span class="n">TMap</span><span class="o">.</span><span class="n">T</span><span class="p">,</span><span class="n">clockWd</span><span class="p">,</span><span class="n">mapNo</span>
    273284           
    274285        <span class="k">def</span> <span class="nf">Tmap2TOF</span><span class="p">(</span><span class="n">TMap</span><span class="p">,</span><span class="n">clockWd</span><span class="p">):</span>
    … …  
    333344                        <span class="n">Banks</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">S</span><span class="p">)</span>
    334345                        <span class="n">Pos</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">filepointer</span><span class="o">.</span><span class="n">tell</span><span class="p">())</span>
    335                     <span class="k">if</span> <span class="n">S</span><span class="p">[:</span><span class="mi">8</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;TIME_MAP&#39;</span><span class="p">:</span>
     346                    <span class="k">if</span> <span class="n">S</span><span class="p">[:</span><span class="mi">8</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;TIME_MAP&#39;</span><span class="p">:</span>     <span class="c">#assumes one time map; HIPPO has multiple time maps</span>
    336347                        <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">Banks</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
    337348                            <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">=</span> <span class="s">&#39;Error reading time map before any bank lines&#39;</span>
    338349                        <span class="k">else</span><span class="p">:</span>
    339350                            <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">=</span> <span class="s">&#39;Error reading time map after bank:</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">Banks</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">])</span>
    340                         <span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span> <span class="o">=</span> <span class="n">GetTimeMap</span><span class="p">(</span><span class="n">filepointer</span><span class="p">,</span><span class="n">filepointer</span><span class="o">.</span><span class="n">tell</span><span class="p">(),</span><span class="n">S</span><span class="p">)</span>
     351                        <span class="n">timemap</span><span class="p">,</span><span class="n">clockwd</span><span class="p">,</span><span class="n">mapNo</span> <span class="o">=</span> <span class="n">GetTimeMap</span><span class="p">(</span><span class="n">filepointer</span><span class="p">,</span><span class="n">filepointer</span><span class="o">.</span><span class="n">tell</span><span class="p">(),</span><span class="n">S</span><span class="p">)</span>
     352                        <span class="bp">self</span><span class="o">.</span><span class="n">TimeMap</span><span class="p">[</span><span class="n">mapNo</span><span class="p">]</span> <span class="o">=</span> <span class="n">timemap</span>
     353                        <span class="bp">self</span><span class="o">.</span><span class="n">clockWd</span><span class="p">[</span><span class="n">mapNo</span><span class="p">]</span> <span class="o">=</span> <span class="n">clockwd</span>
     354                       
    341355            <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">detail</span><span class="p">:</span>
    342356                <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>
    … …  
    382396        <span class="n">Bank</span> <span class="o">=</span> <span class="n">Banks</span><span class="p">[</span><span class="n">selblk</span><span class="p">]</span>
    383397        <span class="k">try</span><span class="p">:</span>
     398            <span class="n">bnkNo</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">Bank</span><span class="o">.</span><span class="n">split</span><span class="p">()[</span><span class="mi">1</span><span class="p">])</span>
     399        <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
     400            <span class="n">bnkNo</span> <span class="o">=</span> <span class="mi">1</span>
     401        <span class="k">try</span><span class="p">:</span>
    384402            <span class="k">if</span> <span class="s">&#39;FXYE&#39;</span> <span class="ow">in</span> <span class="n">Bank</span><span class="p">:</span>
    385403                <span class="bp">self</span><span class="o">.</span><span class="n">errors</span> <span class="o">=</span> <span class="s">&#39;Error reading FXYE data in Bank</span><span class="se">\n</span><span class="s">  &#39;</span><span class="o">+</span><span class="n">Banks</span><span class="p">[</span><span class="n">selblk</span><span class="p">]</span>
    … …  
    412430        <span class="bp">self</span><span class="o">.</span><span class="n">powderentry</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">=</span> <span class="n">filename</span>
    413431        <span class="bp">self</span><span class="o">.</span><span class="n">powderentry</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">=</span> <span class="n">Pos</span> <span class="c"># position offset (never used, I hope)</span>
    414         <span class="bp">self</span><span class="o">.</span><span class="n">powderentry</span><span class="p">[</span><span class="mi">2</span><span class="p">]</span> <span class="o">=</span> <span class="n">selblk</span><span class="o">+</span><span class="mi">1</span> <span class="c"># bank number</span>
    415         <span class="bp">self</span><span class="o">.</span><span class="n">idstring</span> <span class="o">=</span> <span class="n">ospath</span><span class="o">.</span><span class="n">basename</span><span class="p">(</span><span class="n">filename</span><span class="p">)</span> <span class="o">+</span> <span class="s">&#39; Bank &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">selblk</span><span class="o">+</span><span class="mi">1</span><span class="p">)</span>
     432        <span class="bp">self</span><span class="o">.</span><span class="n">powderentry</span><span class="p">[</span><span class="mi">2</span><span class="p">]</span> <span class="o">=</span> <span class="n">bnkNo</span> <span class="c">#selblk+1 # bank number</span>
     433        <span class="bp">self</span><span class="o">.</span><span class="n">idstring</span> <span class="o">=</span> <span class="n">ospath</span><span class="o">.</span><span class="n">basename</span><span class="p">(</span><span class="n">filename</span><span class="p">)</span> <span class="o">+</span> <span class="s">&#39; Bank &#39;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">bnkNo</span><span class="p">)</span> <span class="c">#selblk+1)</span>
    416434        <span class="bp">self</span><span class="o">.</span><span class="n">numbanks</span><span class="o">=</span><span class="nb">len</span><span class="p">(</span><span class="n">Banks</span><span class="p">)</span>
    417435        <span class="c"># scan comments for temperature &amp; radius</span>
    … …  
    430448            <span class="k">elif</span> <span class="s">&#39;Omega&#39;</span> <span class="ow">in</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s">&#39;=&#39;</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span> <span class="ow">or</span> <span class="s">&#39;Theta&#39;</span> <span class="ow">in</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s">&#39;=&#39;</span><span class="p">)[</span><span class="mi">0</span><span class="p">]:</span>  <span class="c">#HIPD weirdness</span>
    431449                <span class="k">try</span><span class="p">:</span>
    432                     <span class="bp">self</span><span class="o">.</span><span class="n">Sample</span><span class="p">[</span><span class="s">&#39;Omega&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s">&#39;=&#39;</span><span class="p">)[</span><span class="mi">1</span><span class="p">])</span>
     450                    <span class="bp">self</span><span class="o">.</span><span class="n">Sample</span><span class="p">[</span><span class="s">&#39;Omega&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="mf">90.</span><span class="o">-</span><span class="nb">float</span><span class="p">(</span><span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s">&#39;=&#39;</span><span class="p">)[</span><span class="mi">1</span><span class="p">])</span>
    433451                <span class="k">except</span><span class="p">:</span>
    434452                    <span class="k">pass</span>
    435453            <span class="k">elif</span> <span class="s">&#39;Chi&#39;</span> <span class="ow">in</span> <span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s">&#39;=&#39;</span><span class="p">)[</span><span class="mi">0</span><span class="p">]:</span>
    436454                <span class="k">try</span><span class="p">:</span>
    437                     <span class="bp">self</span><span class="o">.</span><span class="n">Sample</span><span class="p">[</span><span class="s">&#39;Chi&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s">&#39;=&#39;</span><span class="p">)[</span><span class="mi">1</span><span class="p">])</span>
     455                    <span class="bp">self</span><span class="o">.</span><span class="n">Sample</span><span class="p">[</span><span class="s">&#39;Chi&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="o">-</span><span class="nb">float</span><span class="p">(</span><span class="n">S</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s">&#39;=&#39;</span><span class="p">)[</span><span class="mi">1</span><span class="p">])</span>
    438456                <span class="k">except</span><span class="p">:</span>
    439457                    <span class="k">pass</span>                   
Note: See TracChangeset for help on using the changeset viewer.