Changeset 2836


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

fixes to scripts & fxye importer

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2835 r2836  
    355355        if tilt > 0.:
    356356            offset = 2.*radii[1]*ecc+f      #select other branch
    357             xy = [-R*cosd(azm)-offset,R*sind(azm)]
     357            xy = [-R*cosd(azm)-offset,-R*sind(azm)]
    358358        else:
    359359            offset = -f
    360             xy = [-R*cosd(azm)-offset,-R*sind(azm)]
     360            xy = [-R*cosd(azm)-offset,R*sind(azm)]
    361361        xy = -np.array([xy[0]*cosd(phi)+xy[1]*sind(phi),xy[0]*sind(phi)-xy[1]*cosd(phi)])
    362362        xy += cent
  • 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 = []
  • trunk/imports/G2pwd_fxye.py

    r2830 r2836  
    3232        self.TimeMap = {}
    3333        self.dnames = []
     34        self.scriptable = True
    3435
    3536    # Validate the contents -- look for a bank line
Note: See TracChangeset for help on using the changeset viewer.