Index: sansmodels/docs/sphinx/html/api/NewCylinderModel.html
===================================================================
--- sansmodels/docs/sphinx/html/api/NewCylinderModel.html	(revision 512573a53f2ed9d9eed01dddaf2634f02d8da866)
+++ sansmodels/docs/sphinx/html/api/NewCylinderModel.html	(revision c0d873f72968ff9d57d6b547d5e4d6b81c01b9a1)
@@ -3,4 +3,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -8,7 +9,9 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>NewCylinderModel &mdash; sansmodels v0.1.0 documentation</title>
+    <title>NewCylinderModel &mdash; sansmodels 0.1.0 documentation</title>
+    
     <link rel="stylesheet" href="../_static/default.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
@@ -23,5 +26,5 @@
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
-    <link rel="top" title="sansmodels v0.1.0 documentation" href="../index.html" />
+    <link rel="top" title="sansmodels 0.1.0 documentation" href="../index.html" />
     <link rel="up" title="Reference" href="index.html" />
     <link rel="next" title="NoStructure" href="NoStructure.html" />
@@ -44,5 +47,5 @@
           <a href="MultiShellModel.html" title="MultiShellModel"
              accesskey="P">previous</a> |</li>
-        <li><a href="../index.html">sansmodels v0.1.0 documentation</a> &raquo;</li>
+        <li><a href="../index.html">sansmodels 0.1.0 documentation</a> &raquo;</li>
           <li><a href="index.html" accesskey="U">Reference</a> &raquo;</li> 
       </ul>
@@ -56,7 +59,7 @@
   <div class="section" id="newcylindermodel">
 <h1>NewCylinderModel<a class="headerlink" href="#newcylindermodel" title="Permalink to this headline">Â¶</a></h1>
-<div class="section" id="module-sans.models.NewCylinderModel">
-<span id="sans-models-newcylindermodel"></span><h2><a class="reference internal" href="#module-sans.models.NewCylinderModel" title="sans.models.NewCylinderModel"><tt class="xref py py-mod docutils literal"><span class="pre">sans.models.NewCylinderModel</span></tt></a><a class="headerlink" href="#module-sans.models.NewCylinderModel" title="Permalink to this headline">Â¶</a></h2>
-<p>This software was developed by the University of Tennessee as part of the
+<div class="section" id="sans-models-newcylindermodel">
+<h2><a class="reference internal" href="#module-sans.models.NewCylinderModel" title="sans.models.NewCylinderModel"><tt class="xref py py-mod docutils literal"><span class="pre">sans.models.NewCylinderModel</span></tt></a><a class="headerlink" href="#sans-models-newcylindermodel" title="Permalink to this headline">Â¶</a></h2>
+<span class="target" id="module-sans.models.NewCylinderModel"></span><p>This software was developed by the University of Tennessee as part of the
 Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
 project funded by the US National Science Foundation.</p>
@@ -83,7 +86,124 @@
 cyl_theta       = 1.0 rad
 cyl_phi         = 1.0 rad</div></blockquote>
-<dl class="attribute">
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__add__">
+<tt class="descname">__add__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__add__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__call__">
+<tt class="descname">__call__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__call__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>Evaluate the model. Equivalent to runXY(x)</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>x</strong> &#8211; input value</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">value of the model</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__class__">
+<tt class="descname">__class__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__class__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>alias of <tt class="xref py py-class docutils literal"><span class="pre">type</span></tt></p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__delattr__">
+<tt class="descname">__delattr__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__delattr__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__delattr__(&#8216;name&#8217;) &lt;==&gt; del x.name</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__dict__">
+<tt class="descname">__dict__</tt><em class="property"> = &lt;dictproxy object at 0x0279BE50&gt;</em><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__dict__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__div__">
+<tt class="descname">__div__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__div__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__getattribute__">
+<tt class="descname">__getattribute__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__getattribute__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__getattribute__(&#8216;name&#8217;) &lt;==&gt; x.name</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__hash__">
+<tt class="descname">__hash__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__hash__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__hash__() &lt;==&gt; hash(x)</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__init__">
+<tt class="descname">__init__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__init__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>Initialization</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__module__">
+<tt class="descname">__module__</tt><em class="property"> = 'sans.models.NewCylinderModel'</em><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__module__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__mul__">
+<tt class="descname">__mul__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__mul__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="staticmethod">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__new__">
+<em class="property">static </em><tt class="descname">__new__</tt><big>(</big><em>S</em>, <em>...</em><big>)</big> &rarr; a new object with type S, a subtype of T<a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__new__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__reduce__">
+<tt class="descname">__reduce__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__reduce__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>helper for pickle</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__reduce_ex__">
+<tt class="descname">__reduce_ex__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__reduce_ex__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>helper for pickle</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__repr__">
+<tt class="descname">__repr__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__repr__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__repr__() &lt;==&gt; repr(x)</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__setattr__">
+<tt class="descname">__setattr__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__setattr__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__setattr__(&#8216;name&#8217;, value) &lt;==&gt; x.name = value</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__str__">
+<tt class="descname">__str__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__str__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__str__() &lt;==&gt; str(x)</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__sub__">
+<tt class="descname">__sub__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__sub__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.__weakref__">
+<tt class="descname">__weakref__</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.__weakref__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>list of weak references to the object (if defined)</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.calculate_ER">
-<tt class="descname">calculate_ER</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.calculate_ER" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">calculate_ER</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.calculate_ER" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Evaluate the model at a given Q or Q, phi</p>
 </dd></dl>
@@ -101,7 +221,7 @@
 </dd></dl>
 
-<dl class="attribute">
+<dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.evalDistribution">
-<tt class="descname">evalDistribution</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.evalDistribution" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">evalDistribution</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.evalDistribution" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Evaluate the model at a given Q or Qx, Qy vector</p>
 </dd></dl>
@@ -109,5 +229,5 @@
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.getParam">
-<tt class="descname">getParam</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.getParam" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">getParam</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.getParam" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Set the value of a model parameter</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -115,5 +235,5 @@
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>name</strong> &#8211; name of the parameter</li>
 <li><strong>value</strong> &#8211; value of the parameter</li>
@@ -133,10 +253,10 @@
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.getParamListWithToken">
-<tt class="descname">getParamListWithToken</tt><big>(</big><em>token</em>, <em>member</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.getParamListWithToken" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">getParamListWithToken</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.getParamListWithToken" title="Permalink to this definition">Â¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.getParamWithToken">
-<tt class="descname">getParamWithToken</tt><big>(</big><em>name</em>, <em>token</em>, <em>member</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.getParamWithToken" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">getParamWithToken</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.getParamWithToken" title="Permalink to this definition">Â¶</a></dt>
 <dd></dd></dl>
 
@@ -148,4 +268,9 @@
 
 <dl class="attribute">
+<dt id="sans.models.NewCylinderModel.CylinderModel.name">
+<tt class="descname">name</tt><em class="property"> = 'BaseModel'</em><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.name" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
 <dt id="sans.models.NewCylinderModel.CylinderModel.params">
 <tt class="descname">params</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.params" title="Permalink to this definition">Â¶</a></dt>
@@ -153,7 +278,7 @@
 </dd></dl>
 
-<dl class="attribute">
+<dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.reset">
-<tt class="descname">reset</tt><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.reset" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">reset</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.reset" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Reset pair correlation</p>
 </dd></dl>
@@ -161,5 +286,5 @@
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.run">
-<tt class="descname">run</tt><big>(</big><em>x=0.0</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.run" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">run</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.run" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Evaluate the model
 &#64;param x: input q, or [q,phi]
@@ -169,5 +294,5 @@
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.runXY">
-<tt class="descname">runXY</tt><big>(</big><em>x=0.0</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.runXY" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">runXY</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.runXY" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Evaluate the model in cartesian coordinates
 &#64;param x: input q, or [qx, qy]
@@ -177,5 +302,5 @@
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.setParam">
-<tt class="descname">setParam</tt><big>(</big><em>name</em>, <em>value</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.setParam" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">setParam</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.setParam" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Set the value of a model parameter</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -183,5 +308,5 @@
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>name</strong> &#8211; name of the parameter</li>
 <li><strong>value</strong> &#8211; value of the parameter</li>
@@ -195,10 +320,10 @@
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.setParamWithToken">
-<tt class="descname">setParamWithToken</tt><big>(</big><em>name</em>, <em>value</em>, <em>token</em>, <em>member</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.setParamWithToken" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">setParamWithToken</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.setParamWithToken" title="Permalink to this definition">Â¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
 <dt id="sans.models.NewCylinderModel.CylinderModel.set_dispersion">
-<tt class="descname">set_dispersion</tt><big>(</big><em>parameter</em>, <em>dispersion</em><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.set_dispersion" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">set_dispersion</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.NewCylinderModel.CylinderModel.set_dispersion" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Set the dispersion object for a model parameter
 &#64;param parameter: name of the parameter [string]
@@ -220,5 +345,5 @@
   <ul>
 <li><a class="reference internal" href="#">NewCylinderModel</a><ul>
-<li><a class="reference internal" href="#module-sans.models.NewCylinderModel"><tt class="docutils literal"><span class="pre">sans.models.NewCylinderModel</span></tt></a></li>
+<li><a class="reference internal" href="#sans-models-newcylindermodel"><tt class="docutils literal"><span class="pre">sans.models.NewCylinderModel</span></tt></a></li>
 </ul>
 </li>
@@ -239,5 +364,5 @@
   <h3>Quick search</h3>
     <form class="search" action="../search.html" method="get">
-      <input type="text" name="q" size="18" />
+      <input type="text" name="q" />
       <input type="submit" value="Go" />
       <input type="hidden" name="check_keywords" value="yes" />
@@ -268,5 +393,5 @@
           <a href="MultiShellModel.html" title="MultiShellModel"
              >previous</a> |</li>
-        <li><a href="../index.html">sansmodels v0.1.0 documentation</a> &raquo;</li>
+        <li><a href="../index.html">sansmodels 0.1.0 documentation</a> &raquo;</li>
           <li><a href="index.html" >Reference</a> &raquo;</li> 
       </ul>
@@ -274,5 +399,5 @@
     <div class="footer">
         &copy; Copyright 2010, sans group.
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.7.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.
     </div>
   </body>
