Synchronized with the source at d10b85f.

Author: Ainamacar

NSFnugget.html

@@ -80,8 +80,8 @@
       <li><a href="products/xPDFsuite.html">xPDFsuite</a></li>
       <li><a href="products/pdfgetx3.html">PDFgetX3</a></li>
       <li><a href="products/pdfgui.html">PDFgui</a></li>
-      <li><a href="products/pythonpackages.html">Python Packages</a></li>
       <li><a href="products/SrMise.html">SrMise</a></li>
+      <li><a href="products/pythonpackages.html">Python Packages</a></li>
   </ul>
 </li>
 

_images/srmise_screenshot.png

@@ -9,7 +9,9 @@ criterion (AIC) to generate and rank physically plausible sets of peaks even in
 the absence of a constraining structural model.  This approach to peak
 extraction is premised upon PDFs reporting accurate experimentally-determined
 uncertainties, and when these are unavailable results are contingent on a
-user-specified *ad hoc* uncertainty.
+user-specified *ad hoc* uncertainty. PDFs mixing positive and negative
+peaks, such as some neutron PDFs, are compatible with the SrMise peak fitting,
+but not peak extraction, capability.
 
 The software aids rapid analysis of crystalline and nanostructured
 materials. Reasonable values for nearly all program parameters can be
@@ -34,20 +36,75 @@ feedback and suggestions.
 
 
 Getting Started
-------------------------------------------------------------------------
+=================
 
-The diffpy.srfit package requires Python 2.6 or 2.7 and the following software:
+The diffpy.srmise package requires Python 2.6 or 2.7 and the following software:
 
 * ``setuptools`` - software distribution tools for Python
 * ``NumPy`` - numerical mathematics and fast array operations for Python
 * ``SciPy`` - scientific libraries for Python
 * ``matplotlib`` - python plotting library
 
-On Ubuntu Linux, the required software can easily be installed using
-the system package manager::
+See the :doc:`SrMise license <SrMiselicense>` for terms and conditions of use.
+Detailed installation instructions for the :ref:`Windows <windows_install>`, 
+:ref:`Mac OS X <macosx_install>`, and :ref:`Linux <linux_install>`
+platforms follow.
+
+.. _windows_install:
+
+Windows
+-------
+
+Several prebuilt Python distributions for Windows include all the
+prerequisite software required to run SrMise, and installing one of these is the
+simplest way to get started.  These distributions are usually free for
+individual and/or academic use, but some also have commercial version.  Links to
+executables, installation instructions, and licensing information
+for some popular options are listed below.
+
+* `Anaconda <http://www.continuum.io/downloads>`_
+* `Enthought Canopy <https://www.enthought.com/products/canopy/>`_
+* `Python(x,y) <https://code.google.com/p/pythonxy/>`_
+* `WinPython <http://winpython.github.io>`_
+
+Alternately, individual Windows executables for Python and the required
+components can be downloaded and installed.  The official Windows releases of
+Numpy and SciPy do not currently support 64-bit Python installations, so be
+sure to download the 32-bit versions of these packages.
+
+* `Python 2.6/2.7 <https://www.python.org/downloads/windows/>`_
+* `NumPy <http://sourceforge.net/projects/numpy/files/NumPy/>`_
+* `SciPy <http://sourceforge.net/projects/scipy/files/scipy/>`_
+* `matplotlib <http://matplotlib.org/downloads.html>`_
+
+After installing Python and the required packages, we can install SrMise.
+The simplest way to obtain diffpy.srmise on Windows systems
+is using ``pip`` to download and install the latest release from the
+`Python Package Index <https://pypi.python.org>`_ (PyPI).  To do so, open a
+command window by running ``cmd`` from the Start Menu's application search box
+(Windows 7/8/10) or Run command (Windows Vista and earlier).  Verify that the
+``pip`` program is installed by running ::
+
+    pip --version
+
+If this command is not found, download and run
+`get-pip.py <https://bootstrap.pypa.io/get-pip.py>`_, which will install both it
+and setuptools.  For example, if your Windows user name is ``MyName`` and you
+download the file to the desktop, you would run the following from the command
+line: ::
+
+    cd C:\Users\MyName\Desktop
+    python get-pip.py
 
-   sudo apt-get install \
-      python-setuptools python-numpy python-scipy python-matplotlib
+Finally, install the latest version of SrMise by running ::
+
+    pip install diffpy.srmise
+
+
+.. _macosx_install:
+
+Mac OS X
+--------
 
 For Mac OS X systems with the MacPorts package manager, the required
 software can be installed with ::
@@ -61,31 +118,51 @@ in MacPorts::
 
    sudo port select --set python python27
 
-For Windows systems, the easiest way to obtain ``setuptools`` if not already 
-installed is downloading the ``pip`` setup script `get-pip.py 
-<https://bootstrap.pypa.io/get-pip.py>`_ and running :: 
+The simplest way to obtain diffpy.srmise on Mac OS X systems
+is using ``pip`` to download and install the latest release from
+`PyPI <https://pypi.python.org>`_. :: 
 
-    python get-pip.py
-    
-It is recommended to install all other dependencies using prebuilt binaries.  
-Visit http://www.scipy.org and http://www.matplotlib.org for instructions.  
-Alternately, install a full Python distribution such as Python(x,y) or 
-Enthought Canopy which already includes the required components. 
+   sudo pip install diffpy.srmise
 
-Installation
-------------------------------------------------------------------------
+If you prefer to install from sources, download them from the
+`GitHub <https://github.com/diffpy/diffpy.srmise/releases>`__ or
+`PyPI <https://pypi.python.org/pypi/diffpy.srmise>`__ pages for SrMise.
+Uncompress them to a directory, and from that directory run ::
 
-The simplest way to obtain diffpy.srmise on Unix, Linux, and Mac systems
-(see the :doc:`license <SrMiselicense>` for terms and conditions of use) is 
-using ``pip`` to download and install the latest release from the
-`Python Package Index <https://pypi.python.org>`_ (PyPI). :: 
+   sudo python setup.py install
+
+This installs diffpy.srmise for all users in the default system location. If 
+administrator (root) access is not available, see the usage info from 
+``python setup.py install --help`` for options to install to user-writable 
+directories.
+
+.. _linux_install:
+
+Linux
+-----
+
+On Ubuntu and Debian Linux, the required software can easily be installed using
+the system package manager::
+
+   sudo apt-get install \
+      python-setuptools python-numpy python-scipy python-matplotlib
+
+Similarly, on Fedora::
+
+    sudo yum install python-setuptools numpy scipy python-matplotlib
+
+For other Linux distributions consult the appropriate package manager.
+
+The simplest way to obtain diffpy.srmise on Linux systems
+is using ``pip`` to download and install the latest release from the
+`PyPI <https://pypi.python.org>`_. :: 
 
    sudo pip install diffpy.srmise
 
 If you prefer to install from sources, download them from the
-`GitHub <https://github.com/diffpy/diffpy.srmise/releases>`_ or
-`PyPI <https://pypi.python.org/pypi/diffpy.srmise>`_ pages for SrMise.  Then
-run ::
+`GitHub <https://github.com/diffpy/diffpy.srmise/releases>`__ or
+`PyPI <https://pypi.python.org/pypi/diffpy.srmise>`__ pages for SrMise.
+Uncompress them to a directory, and from that directory run ::
 
    sudo python setup.py install
 
@@ -94,11 +171,9 @@ administrator (root) access is not available, see the usage info from
 ``python setup.py install --help`` for options to install to user-writable 
 directories.
 
-To install on Windows run either of the commands above omitting ``sudo``.  
-
 
 What next?
-----------
+============
 
 Explore the SrMise tutorial
 `examples <http://diffpy.github.io/diffpy.srmise/examples.html>`_!

_sources/products/SrMise.txt

@@ -80,8 +80,8 @@
       <li><a href="products/xPDFsuite.html">xPDFsuite</a></li>
       <li><a href="products/pdfgetx3.html">PDFgetX3</a></li>
       <li><a href="products/pdfgui.html">PDFgui</a></li>
-      <li><a href="products/pythonpackages.html">Python Packages</a></li>
       <li><a href="products/SrMise.html">SrMise</a></li>
+      <li><a href="products/pythonpackages.html">Python Packages</a></li>
   </ul>
 </li>
 

acknowledgements.html

@@ -80,8 +80,8 @@
       <li><a href="products/xPDFsuite.html">xPDFsuite</a></li>
       <li><a href="products/pdfgetx3.html">PDFgetX3</a></li>
       <li><a href="products/pdfgui.html">PDFgui</a></li>
-      <li><a href="products/pythonpackages.html">Python Packages</a></li>
       <li><a href="products/SrMise.html">SrMise</a></li>
+      <li><a href="products/pythonpackages.html">Python Packages</a></li>
   </ul>
 </li>
 

community.html

@@ -79,8 +79,8 @@
       <li><a href="products/xPDFsuite.html">xPDFsuite</a></li>
       <li><a href="products/pdfgetx3.html">PDFgetX3</a></li>
       <li><a href="products/pdfgui.html">PDFgui</a></li>
-      <li><a href="products/pythonpackages.html">Python Packages</a></li>
       <li><a href="products/SrMise.html">SrMise</a></li>
+      <li><a href="products/pythonpackages.html">Python Packages</a></li>
   </ul>
 </li>
 

index.html

@@ -2,4 +2,4 @@
 # Project: DiffPy
 # Version: 
 # The remainder of this file is compressed using zlib.
-xڝ��j�0��z���X5�ګC P��z����$������6���=I�;�iXq�������g�Έȃ_�4v�\�"|�B�V�I��D�zU����Kx��I���3��c�Ō���R}���[D�E-Ps��?"�L�9���
L�4a`�FZ�2�=u�f�wҙ�e7�P���Nt\�"+,T��9zt�Y^����{�t��C����*+�6�9�a�M����W����Z$Q�q�+�$|L�c:j�I����E,2�e�a��=k�0,�
+xڝ�]k�0���+�K;��nA�NVd�+19miR����tI��d�����}��ʡr�㯒QB��Ѽg�.�����Z�`Q�ܸV>�`���l�o`�Ȥ1��;,-3��ۊG�PUc@�@�Y�SP��ء⨘���e�2��ց����� \�H�J�`���l`�fz�F�x-��� #R�~,c�m&6���ϒ~;E��L�G �p���[
�������S�>�l�gJ�#*�ޢ��%�7޵6��
SDJ����:^սHKܯ�>���!�a͵5�b�E�i��Wb�����a��ic��8u��-d����}֏�M���3'�I�a