Changeset 5096


Ignore:
Timestamp:
Nov 22, 2021 10:38:52 AM (2 years ago)
Author:
vondreele
Message:

add stripped down windows version (no Tests) of diffpy to GSAS-II directory; includes license

Location:
trunk
Files:
13 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/GSASIIfiles.py

    r5071 r5096  
    393393            pkg = os.path.splitext(os.path.split(filename)[1])[0]
    394394            if pkg in import_files:
    395                 G2Print('Warning: file {} hidden by {}'
    396                                   .format(os.path.abspath(filename),import_files[pkg]))
     395                G2Print('Warning: file {} hidden by {}'.format(os.path.abspath(filename),import_files[pkg]))
    397396            else:
    398397                import_files[pkg] = filename           

  • trunk/GSASIIphsGUI.py

    r5094 r5096  
    61796179
    61806180        bigSizer.Add(mainSizer,1,wx.EXPAND)
    6181         # add help button to bring up help web page - at right side of window
    61826181        bigSizer.Add(G2G.HelpButton(G2frame.FRMC,helpIndex=G2frame.dataWindow.helpKey))
    61836182        SetPhaseWindow(G2frame.FRMC,bigSizer)
    … …  
    63986397           
    63996398        elif G2frame.RMCchoice == 'PDFfit':
    6400             PDFfit_exec = G2pwd.findPDFfit()
     6399            PDFfit_exec = G2pwd.findPDFfit()  #returns location of python (not pdffit!)
    64016400            print(PDFfit_exec)
    64026401            pName = generalData['Name'].replace(' ','_')

  • trunk/GSASIIpwd.py

    r5094 r5096  
    29652965       
    29662966def findPDFfit():
    2967     '''Find where PDFfit2 is installed. Does the following:
    2968     :returns: the full path to a python executable that is assumed to
    2969       have PDFfit2 installed or None, if it was not found.
     2967    '''Find if PDFfit2 is installed (may be local to GSAS-II). Does the following:
     2968    :returns: the full path to a python executable or None, if it was not found.
    29702969    '''
    29712970    try:
    2972         import diffpy.pdffit2
     2971        from diffpy.pdffit2 import PdfFit
    29732972        return sys.executable
    29742973    except:
    … …  
    30593058    General = Phase['General']
    30603059    Cell = General['Cell'][1:7]
     3060    G2path = GSASIIpath.path2GSAS2
    30613061    rundata = '''
    30623062#!/usr/bin/env python
    30633063# -*- coding: utf-8 -*-
     3064import sys
     3065sys.path.append('%s')
    30643066from diffpy.pdffit2 import PdfFit
    30653067pf = PdfFit()
    3066 '''
     3068'''%G2path
    30673069    Nd = 0
    30683070    Np = 0
Note: See TracChangeset for help on using the changeset viewer.