Remove PDFgui dependency.

Author: Ainamacar

LICENSE.txt

@@ -2,14 +2,16 @@ If you use this program to do productive scientific research that
 leads to publication, we ask that you acknowledge use of the
 program by citing the following paper in your publication:
 
-    L. Granlund, S.J.B. Billinge, P.D. Duxbury, Automated Peak
-    Extraction from Atomic Pair Distribution Functions, Acta
-    Crystallographica A.  Submitted (2014)
+    L. Granlund, S.J.B. Billinge, P.M. Duxbury, Algorithm for
+    systematic peak extraction from atomic pair distribution
+    functions, Acta Crystallographica A 71(4), ???-??? (2015).
 
-Copyright 2014, Board of Trustees of Michigan State University
+Copyright 2015, Board of Trustees of Michigan State University
 
-For more information please email Luke Granlund at
-    [email protected]
+For more information please visit the diffpy web-page at
+    http://www.diffpy.org
+or email Luke Granlund at [email protected], or Prof. Simon
+Billinge at [email protected].
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

LICENSE_PDFgui.txt

@@ -0,0 +1,56 @@
+SrMise incorporates source code from the PDFgui program in the file
+pdfdataset.py. The PDFgui license is reproduced in full below.
+===================================================================
+
+This program is part of the DiffPy and DANSE open-source projects
+and is available subject to the conditions and terms laid out
+below.
+
+If you use this program to do productive scientific research that
+leads to publication, we ask that you acknowledge use of the
+program by citing the following paper in your publication:
+
+    C. L. Farrow, P. Juhas, J. W. Liu, D. Bryndin, E. S. Bozin,
+    J. Bloch, Th. Proffen and S. J. L. Billinge, PDFfit2 and
+    PDFgui: computer programs for studying nanostructure in
+    crystals, J. Phys.: Condens.  Matter 19, 335219 (2007)
+
+Copyright 2006-2007, Board of Trustees of Michigan State
+University, Copyright 2008-2009, Board of Trustees of Columbia
+University in the city of New York. (Copyright holder indicated in
+each source file).
+
+For more information please visit the project web-page:
+    http://www.diffpy.org/
+or email Prof. Simon Billinge at [email protected]
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS". COPYRIGHT
+HOLDER EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS,
+EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, TITLE, FITNESS, ADEQUACY OR
+SUITABILITY FOR A PARTICULAR PURPOSE, AND ANY WARRANTIES OF FREEDOM
+FROM INFRINGEMENT OF ANY DOMESTIC OR FOREIGN PATENT, COPYRIGHTS,
+TRADE SECRETS OR OTHER PROPRIETARY RIGHTS OF ANY PARTY. IN NO EVENT
+SHALL COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE OR RELATING TO
+THIS AGREEMENT, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diffpy/srmise/mise/miseerrors.py

@@ -127,3 +127,11 @@ def __init__(self, info):
 
         info -- description string"""
         MiseError.__init__(self, info)
+        
+class MisePDFKeyError(MiseError):
+    """diffpy.srmise.mise exception class.  Requested PDF key can't be found."""
+    def __init__(self, info):
+        """initialize
+
+        info -- description string"""
+        MiseError.__init__(self, info)

diffpy/srmise/mise/pdfpeakextraction.py

@@ -19,7 +19,8 @@
 from diffpy.srmise.mise.modelcluster import ModelCluster, ModelCovariance
 from diffpy.srmise.mise.miseerrors import *
 
-from diffpy.pdfgui.control.pdfdataset import PDFDataSet
+#from diffpy.pdfgui.control.pdfdataset import PDFDataSet
+from diffpy.srmise.mise.pdfdataset import PDFDataSet
 
 import matplotlib.pyplot as plt
 

setup.py

@@ -59,11 +59,10 @@ def getversioncfg():
     zip_safe = False,
 
     # Dependencies
-    # pdfgui
     # numpy
     # scipy
     # matplotlib >= 1.1.0
-    install_requires = ['diffpy.pdfgui', 'matplotlib >= 1.1.0', 'numpy', 'scipy'],
+    install_requires = ['matplotlib >= 1.1.0', 'numpy', 'scipy'],
 
     # other arguments here...
     entry_points = {