Index: sansmodels/docs/sphinx/html/api/ModelAdaptor.html
===================================================================
--- sansmodels/docs/sphinx/html/api/ModelAdaptor.html	(revision 512573a53f2ed9d9eed01dddaf2634f02d8da866)
+++ sansmodels/docs/sphinx/html/api/ModelAdaptor.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>ModelAdaptor &mdash; sansmodels v0.1.0 documentation</title>
+    <title>ModelAdaptor &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="ModelFactory" href="ModelFactory.html" />
@@ -44,5 +47,5 @@
           <a href="LorentzModel.html" title="LorentzModel"
              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="modeladaptor">
 <h1>ModelAdaptor<a class="headerlink" href="#modeladaptor" title="Permalink to this headline">Â¶</a></h1>
-<div class="section" id="module-sans.models.ModelAdaptor">
-<span id="sans-models-modeladaptor"></span><h2><a class="reference internal" href="#module-sans.models.ModelAdaptor" title="sans.models.ModelAdaptor"><tt class="xref py py-mod docutils literal"><span class="pre">sans.models.ModelAdaptor</span></tt></a><a class="headerlink" href="#module-sans.models.ModelAdaptor" 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-modeladaptor">
+<h2><a class="reference internal" href="#module-sans.models.ModelAdaptor" title="sans.models.ModelAdaptor"><tt class="xref py py-mod docutils literal"><span class="pre">sans.models.ModelAdaptor</span></tt></a><a class="headerlink" href="#sans-models-modeladaptor" title="Permalink to this headline">Â¶</a></h2>
+<span class="target" id="module-sans.models.ModelAdaptor"></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>
@@ -72,16 +75,117 @@
 <p>Model adaptor to provide old-style model functionality</p>
 <dl class="method">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__add__">
+<tt class="descname">__add__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__add__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__class__">
+<tt class="descname">__class__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__delattr__">
+<tt class="descname">__delattr__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__dict__">
+<tt class="descname">__dict__</tt><em class="property"> = &lt;dictproxy object at 0x01B548F0&gt;</em><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__dict__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__div__">
+<tt class="descname">__div__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__div__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__getattribute__">
+<tt class="descname">__getattribute__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__hash__">
+<tt class="descname">__hash__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__init__">
+<tt class="descname">__init__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__init__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>Initialization</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__module__">
+<tt class="descname">__module__</tt><em class="property"> = 'sans.models.ModelAdaptor'</em><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__module__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__mul__">
+<tt class="descname">__mul__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__mul__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="staticmethod">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__new__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__reduce__">
+<tt class="descname">__reduce__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__reduce__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>helper for pickle</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__reduce_ex__">
+<tt class="descname">__reduce_ex__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__reduce_ex__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>helper for pickle</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__repr__">
+<tt class="descname">__repr__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__setattr__">
+<tt class="descname">__setattr__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__str__">
+<tt class="descname">__str__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.__sub__">
+<tt class="descname">__sub__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__sub__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ModelAdaptor.__weakref__">
+<tt class="descname">__weakref__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.__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.ModelAdaptor.ModelAdaptor.getParamListWithToken">
-<tt class="descname">getParamListWithToken</tt><big>(</big><em>token</em>, <em>member</em><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.getParamListWithToken" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">getParamListWithToken</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.getParamListWithToken" title="Permalink to this definition">Â¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
 <dt id="sans.models.ModelAdaptor.ModelAdaptor.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.ModelAdaptor.ModelAdaptor.getParamWithToken" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">getParamWithToken</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.getParamWithToken" title="Permalink to this definition">Â¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
 <dt id="sans.models.ModelAdaptor.ModelAdaptor.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.ModelAdaptor.ModelAdaptor.setParamWithToken" title="Permalink to this definition">Â¶</a></dt>
+<tt class="descname">setParamWithToken</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ModelAdaptor.setParamWithToken" title="Permalink to this definition">Â¶</a></dt>
 <dd></dd></dl>
 
@@ -90,5 +194,5 @@
 <dl class="class">
 <dt id="sans.models.ModelAdaptor.ParameterDict">
-<em class="property">class </em><tt class="descclassname">sans.models.ModelAdaptor.</tt><tt class="descname">ParameterDict</tt><big>(</big><em>parameters</em><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict" title="Permalink to this definition">Â¶</a></dt>
+<em class="property">class </em><tt class="descclassname">sans.models.ModelAdaptor.</tt><tt class="descname">ParameterDict</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict" title="Permalink to this definition">Â¶</a></dt>
 <dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">dict</span></tt></p>
 <p>Parameter dictionary used for backward 
@@ -97,96 +201,238 @@
 dictionary.</p>
 <dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__class__">
+<tt class="descname">__class__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__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.ModelAdaptor.ParameterDict.__cmp__">
+<tt class="descname">__cmp__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__cmp__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__cmp__(y) &lt;==&gt; cmp(x,y)</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__contains__">
+<tt class="descname">__contains__</tt><big>(</big><em>k</em><big>)</big> &rarr; True if D has a key k, else False<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__contains__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__delattr__">
+<tt class="descname">__delattr__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__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.ModelAdaptor.ParameterDict.__delitem__">
+<tt class="descname">__delitem__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__delitem__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__delitem__(y) &lt;==&gt; del x[y]</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__dict__">
+<tt class="descname">__dict__</tt><em class="property"> = &lt;dictproxy object at 0x0223D470&gt;</em><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__dict__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__eq__">
+<tt class="descname">__eq__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__eq__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__eq__(y) &lt;==&gt; x==y</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__ge__">
+<tt class="descname">__ge__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__ge__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__ge__(y) &lt;==&gt; x&gt;=y</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__getattribute__">
+<tt class="descname">__getattribute__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__getattribute__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__getattribute__(&#8216;name&#8217;) &lt;==&gt; x.name</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__getitem__">
+<tt class="descname">__getitem__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__getitem__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__gt__">
+<tt class="descname">__gt__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__gt__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__gt__(y) &lt;==&gt; x&gt;y</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__hash__">
+<tt class="descname">__hash__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__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.ModelAdaptor.ParameterDict.__init__">
+<tt class="descname">__init__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__init__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>Initialization
+&#64;param parameters: new-style &#8216;parameters&#8217; dictionary</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__iter__">
+<tt class="descname">__iter__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__iter__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__iter__() &lt;==&gt; iter(x)</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__le__">
+<tt class="descname">__le__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__le__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__le__(y) &lt;==&gt; x&lt;=y</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__len__">
+<tt class="descname">__len__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__len__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__len__() &lt;==&gt; len(x)</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__lt__">
+<tt class="descname">__lt__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__lt__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__lt__(y) &lt;==&gt; x&lt;y</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__module__">
+<tt class="descname">__module__</tt><em class="property"> = 'sans.models.ModelAdaptor'</em><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__module__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__ne__">
+<tt class="descname">__ne__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__ne__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__ne__(y) &lt;==&gt; x!=y</p>
+</dd></dl>
+
+<dl class="staticmethod">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__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.ModelAdaptor.ParameterDict.__new__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__reduce__">
+<tt class="descname">__reduce__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__reduce__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>helper for pickle</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__reduce_ex__">
+<tt class="descname">__reduce_ex__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__reduce_ex__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>helper for pickle</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__repr__">
+<tt class="descname">__repr__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__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.ModelAdaptor.ParameterDict.__setattr__">
+<tt class="descname">__setattr__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__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="method">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__setitem__">
+<tt class="descname">__setitem__</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__setitem__" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__str__">
+<tt class="descname">__str__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__str__" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>x.__str__() &lt;==&gt; str(x)</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="sans.models.ModelAdaptor.ParameterDict.__weakref__">
+<tt class="descname">__weakref__</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.__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.ModelAdaptor.ParameterDict.clear">
-<tt class="descname">clear</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.clear" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.clear() -&gt; None.  Remove all items from D.</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">clear</tt><big>(</big><big>)</big> &rarr; None.  Remove all items from D.<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.clear" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.copy">
-<tt class="descname">copy</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.copy" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.copy() -&gt; a shallow copy of D</p>
-</dd></dl>
+<tt class="descname">copy</tt><big>(</big><big>)</big> &rarr; a shallow copy of D<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.copy" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
 
 <dl class="staticmethod">
 <dt id="sans.models.ModelAdaptor.ParameterDict.fromkeys">
-<em class="property">static </em><tt class="descname">fromkeys</tt><big>(</big><big>)</big><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.fromkeys" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>dict.fromkeys(S[,v]) -&gt; New dict with keys from S and values equal to v.
-v defaults to None.</p>
-</dd></dl>
-
-<dl class="attribute">
+<em class="property">static </em><tt class="descname">fromkeys</tt><big>(</big><em>S</em><span class="optional">[</span>, <em>v</em><span class="optional">]</span><big>)</big> &rarr; New dict with keys from S and values equal to v.<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.fromkeys" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>v defaults to None.</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.get">
-<tt class="descname">get</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.get" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.get(k[,d]) -&gt; D[k] if k in D, else d.  d defaults to None.</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">get</tt><big>(</big><em>k</em><span class="optional">[</span>, <em>d</em><span class="optional">]</span><big>)</big> &rarr; D[k] if k in D, else d.  d defaults to None.<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.get" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.has_key">
-<tt class="descname">has_key</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.has_key" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.has_key(k) -&gt; True if D has a key k, else False</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">has_key</tt><big>(</big><em>k</em><big>)</big> &rarr; True if D has a key k, else False<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.has_key" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.items">
-<tt class="descname">items</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.items" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.items() -&gt; list of D&#8217;s (key, value) pairs, as 2-tuples</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">items</tt><big>(</big><big>)</big> &rarr; list of D's (key, value) pairs, as 2-tuples<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.items" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.iteritems">
-<tt class="descname">iteritems</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.iteritems" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.iteritems() -&gt; an iterator over the (key, value) items of D</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">iteritems</tt><big>(</big><big>)</big> &rarr; an iterator over the (key, value) items of D<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.iteritems" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.iterkeys">
-<tt class="descname">iterkeys</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.iterkeys" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.iterkeys() -&gt; an iterator over the keys of D</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">iterkeys</tt><big>(</big><big>)</big> &rarr; an iterator over the keys of D<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.iterkeys" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.itervalues">
-<tt class="descname">itervalues</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.itervalues" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.itervalues() -&gt; an iterator over the values of D</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">itervalues</tt><big>(</big><big>)</big> &rarr; an iterator over the values of D<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.itervalues" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.keys">
-<tt class="descname">keys</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.keys" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.keys() -&gt; list of D&#8217;s keys</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">keys</tt><big>(</big><big>)</big> &rarr; list of D's keys<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.keys" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.pop">
-<tt class="descname">pop</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.pop" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.pop(k[,d]) -&gt; v, remove specified key and return the corresponding value
-If key is not found, d is returned if given, otherwise KeyError is raised</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">pop</tt><big>(</big><em>k</em><span class="optional">[</span>, <em>d</em><span class="optional">]</span><big>)</big> &rarr; v, remove specified key and return the corresponding value<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.pop" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>If key is not found, d is returned if given, otherwise KeyError is raised</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.popitem">
-<tt class="descname">popitem</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.popitem" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.popitem() -&gt; (k, v), remove and return some (key, value) pair as a
-2-tuple; but raise KeyError if D is empty</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">popitem</tt><big>(</big><big>)</big> &rarr; (k, v), remove and return some (key, value) pair as a<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.popitem" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>2-tuple; but raise KeyError if D is empty</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.setdefault">
-<tt class="descname">setdefault</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.setdefault" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.setdefault(k[,d]) -&gt; D.get(k,d), also set D[k]=d if k not in D</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">setdefault</tt><big>(</big><em>k</em><span class="optional">[</span>, <em>d</em><span class="optional">]</span><big>)</big> &rarr; D.get(k,d), also set D[k]=d if k not in D<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.setdefault" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.update">
-<tt class="descname">update</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.update" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.update(E, <a href="#id1"><span class="problematic" id="id2">**</span></a>F) -&gt; None.  Update D from E and F: for k in E: D[k] = E[k]
-(if E has keys else: for (k, v) in E: D[k] = v) then: for k in F: D[k] = F[k]</p>
-</dd></dl>
-
-<dl class="attribute">
+<tt class="descname">update</tt><big>(</big><em>E</em>, <em>**F</em><big>)</big> &rarr; None.  Update D from E and F: for k in E: D[k] = E[k]<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.update" title="Permalink to this definition">Â¶</a></dt>
+<dd><p>(if E has keys else: for (k, v) in E: D[k] = v) then: for k in F: D[k] = F[k]</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="sans.models.ModelAdaptor.ParameterDict.values">
-<tt class="descname">values</tt><a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.values" title="Permalink to this definition">Â¶</a></dt>
-<dd><p>D.values() -&gt; list of D&#8217;s values</p>
-</dd></dl>
+<tt class="descname">values</tt><big>(</big><big>)</big> &rarr; list of D's values<a class="headerlink" href="#sans.models.ModelAdaptor.ParameterDict.values" title="Permalink to this definition">Â¶</a></dt>
+<dd></dd></dl>
 
 </dd></dl>
@@ -204,5 +450,5 @@
   <ul>
 <li><a class="reference internal" href="#">ModelAdaptor</a><ul>
-<li><a class="reference internal" href="#module-sans.models.ModelAdaptor"><tt class="docutils literal"><span class="pre">sans.models.ModelAdaptor</span></tt></a></li>
+<li><a class="reference internal" href="#sans-models-modeladaptor"><tt class="docutils literal"><span class="pre">sans.models.ModelAdaptor</span></tt></a></li>
 </ul>
 </li>
@@ -223,5 +469,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" />
@@ -252,5 +498,5 @@
           <a href="LorentzModel.html" title="LorentzModel"
              >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>
@@ -258,5 +504,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>
