Changeset 1578 for trunk/GSASIIpwd.py


Ignore:
Timestamp:
Nov 21, 2014 3:25:30 PM (7 years ago)
Author:
vondreele
Message:

add wx.Yield in RefineBox?
refactor indexing for normal & superlattice PeaksPrint?
remove splitter window in Unit Cells Data display - didn't work in newer wxPythons

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r1572 r1578  
    796796    return lenR,dRdS
    797797
    798 def getHKLpeak(dmin,SGData,A):
     798def getHKLpeak(dmin,Inst,SGData,A):
    799799    'needs a doc string'
    800800    HKL = G2lat.GenHLaue(dmin,SGData,A)       
     
    803803        ext = G2spc.GenHKLf([h,k,l],SGData)[0]
    804804        if not ext:
    805             HKLs.append([h,k,l,d,-1])
     805            HKLs.append([h,k,l,d,G2lat.Dsp2pos(Inst,d),-1])
    806806    return HKLs
    807807
    808 def getHKLMpeak(dmin,SGData,SSGData,Vec,maxH,A):
     808def getHKLMpeak(dmin,Inst,SGData,SSGData,Vec,maxH,A):
    809809    'needs a doc string'
    810810    HKLs = []
     
    818818        ext = G2spc.GenHKLf([h,k,l],SGData)[0]
    819819        if not ext and d >= dmin:
    820             HKLs.append([h,k,l,0,d,-1])
     820            HKLs.append([h,k,l,0,d,G2lat.Dsp2pos(Inst,d),-1])
    821821        for dH in SSdH:
    822822            if dH:
     
    827827                    HKLM = np.array([h,k,l,dH])
    828828                    if G2spc.checkSSextc(HKLM,SSGData[1]):
    829                         HKLs.append([h,k,l,dH,d,-1])
    830     return HKLs
     829                        HKLs.append([h,k,l,dH,d,G2lat.Dsp2pos(Inst,d),-1])   
     830    return G2lat.sortHKLd(HKLs,True,True,True)
    831831
    832832def getPeakProfile(dataType,parmDict,xdata,varyList,bakType):
Note: See TracChangeset for help on using the changeset viewer.