Changeset 1078


Ignore:
Timestamp:
Oct 3, 2013 1:52:21 PM (8 years ago)
Author:
vondreele
Message:

fix a single crystal blunder

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrIO.py

    r1077 r1078  
    307307
    308308    :param str GPXfile: full .gpx file name
    309     :param str hNames: list of histogram names
     309    :param str hType: list of histogram types
    310310    :return: list of histogram names (types = PWDR & HKLF)
    311311
  • trunk/GSASIIstrMath.py

    r1077 r1078  
    541541    Tdata,Mdata,Fdata,Xdata,dXdata,IAdata,Uisodata,Uijdata = GetAtomFXU(pfx,calcControls,parmDict)
    542542    FF = np.zeros(len(Tdata))
    543     if 'N' in parmDict[hfx+'Type']:
     543    if 'N' in calcControls[hfx+'histType']:
    544544        FP,FPP = G2el.BlenRes(Tdata,BLtables,parmDict[hfx+'Lam'])
    545545    else:
     
    555555        Bab = parmDict[phfx+'BabA']*np.exp(-parmDict[phfx+'BabU']*SQfactor)
    556556        if not len(refl[-1]):                #no form factors
    557             if 'N' in parmDict[hfx+'Type']:
     557            if 'N' in calcControls[hfx+'histType']:
    558558                refl[-1] = G2el.getBLvalues(BLtables)
    559559            else:       #'X'
     
    593593    Tdata,Mdata,Fdata,Xdata,dXdata,IAdata,Uisodata,Uijdata = GetAtomFXU(pfx,calcControls,parmDict)
    594594    FF = np.zeros(len(Tdata))
    595     if 'N' in parmDict[hfx+'Type']:
     595    if 'N' in calcControls[hfx+'histType']:
    596596        FP = 0.
    597597        FPP = 0.
Note: See TracChangeset for help on using the changeset viewer.