Changeset 5269

Timestamp:

May 3, 2022 11:27:16 AM (19 months ago)

Author:

toby

Message:

add config var for pdffit2 and show err message

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIpwd.py (modified) (1 diff)
• config_example.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -6452 +6452 @@
         wx.GetApp().Yield()
         #print('wx Yield called')
-        print('Update:',value,newmsg)
+        #print('Update:',value,newmsg)
         return super(self.__class__,self).Update(value, newmsg)
         

trunk/GSASIIphsGUI.py

@@ -6357 +6357 @@
         PDFfit_exec = G2pwd.findPDFfit()  #returns location of python (not pdffit!)
         if not PDFfit_exec:
-            wx.MessageBox(''' PDFfit2 is currently not available for this platform. 
+            wx.MessageBox(''' PDFfit2 is not currently installed for this platform. 
     Please contact us for assistance''',caption='No PDFfit2',style=wx.ICON_INFORMATION)
             return

trunk/GSASIIpwd.py

@@ -3159 +3159 @@
     :returns: the full path to a python executable or None, if it was not found.
     '''
+    if GSASIIpath.GetConfigValue('pdffit2_exec') is not None and is_exe(
+            GSASIIpath.GetConfigValue('pdffit2_exec')):
+        return GSASIIpath.GetConfigValue('pdffit2_exec')
     try:
-        sys.path.append('%s'%GSASIIpath.path2GSAS2) 
+        if GSASIIpath.path2GSAS2 not in sys.path:
+            sys.path.insert(0,GSASIIpath.path2GSAS2)
         from diffpy.pdffit2 import PdfFit
         return sys.executable
-    except:
+    except Exception as msg:
+        print('Error from PDFfit2 access:\n',msg)
         return None
     

trunk/config_example.py

@@ -255 +255 @@
 '''
 
+pdffit2_exec = None
+'''Defines the full path to a Python executable that has been configured 
+with the PDFfit2 (diffpy) package. If None (the default), GSAS-II will see 
+if PDFfit2 can be imported into the current Python.
+'''
+
 lastUpdateNotice = 0
 '''Defines the version number for the last update notice that has been