Ignore:
Timestamp:
May 17, 2017 3:06:18 PM (5 years ago)
Author:
vondreele
Message:

fixes to scripts & fxye importer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIscriptable.py

    r2835 r2836  
    103103def ImportPowder(reader,filename):
    104104    '''Use a reader to import a powder diffraction data file
    105     param: str reader: one of 'G2pwd_fxye','G2pwd_xye','G2pwd_BrukerRAW','G2pwd_csv','G2pwd_FP',
    106         'G2pwd_Panalytical','G2pwd_rigaku'
     105    param: str reader: a scriptable reader
    107106    param: str filename: full name of powder data file; can be "multi-Bank" data
    108107    returns: list rdlist: list of rrader objects containing powder data, one for each
     
    115114                for a PWDR entry in  GSASII data tree.       
    116115    '''
    117     if not reader.scriptable:
    118         print '**** ERROR: not a scriptable reader ',reader
    119         return None
    120116    rdfile,rdpath,descr = imp.find_module(reader)
    121117    rdclass = imp.load_module(reader,rdfile,rdpath,descr)
    122118    rd = rdclass.GSAS_ReaderClass()   
     119    if not rd.scriptable:
     120        print '**** ERROR: ',reader,' is not a scriptable reader'
     121        return None
    123122    fl = open(filename,'rb')
    124123    rdlist = []
Note: See TracChangeset for help on using the changeset viewer.