Changeset 1788


Ignore:
Timestamp:
Apr 13, 2015 1:33:29 PM (7 years ago)
Author:
vondreele
Message:

fix error analysis for HKLF data
raise upper limit on delt-F/sig to 1000

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r1787 r1788  
    24042404            userReject = data['UsrReject']
    24052405            usrRej = {'minF/sig':[' Min obs/sig (0-5): ',[0,5], ],'MinExt':[' Min extinct. (0-.9): ',[0,.9],],
    2406                 'MaxDF/F':[' Max delt-F/sig (3-20): ',[3.,20.],],'MaxD':[' Max d-spacing (3-500): ',[3,500],],
     2406                'MaxDF/F':[' Max delt-F/sig (3-1000): ',[3.,1000.],],'MaxD':[' Max d-spacing (3-500): ',[3,500],],
    24072407                'MinD':[' Min d-spacing (0.1-1.0): ',[0.1,1.0],]}
    24082408
     
    36063606    elif kind in ['HKLF',]:
    36073607        SetDataMenuBar(G2frame,G2frame.dataFrame.HKLFMenu)
    3608 #        G2frame.dataFrame.Bind(wx.EVT_MENU, OnErrorAnalysis, id=wxID_PWDANALYSIS)
     3608        G2frame.dataFrame.Bind(wx.EVT_MENU, OnErrorAnalysis, id=wxID_PWDANALYSIS)
    36093609        G2frame.dataFrame.Bind(wx.EVT_MENU, OnPlot3DHKL, id=wxID_PWD3DHKLPLOT)
    36103610#        G2frame.dataFrame.Bind(wx.EVT_MENU, onCopySelectedItems, id=wxID_PWDCOPY)
  • trunk/GSASIIplot.py

    r1787 r1788  
    17861786        DS = xye[5][xmin:xmax]*np.sqrt(wtFactor*xye[2][xmin:xmax])
    17871787    elif kind == 'HKLF':
    1788         refl = Pattern[1]
     1788        refl = Pattern[1]['RefList']
     1789        im = 0
     1790        if Pattern[1]['Super']:
     1791            im = 1
    17891792        DS = []
    17901793        for ref in refl:
    1791             if ref[6] > 0.:
    1792                 DS.append((ref[5]-ref[7])/ref[6])
     1794            if ref[6+im] > 0.:
     1795                DS.append((ref[5+im]-ref[7+im])/ref[6+im])
    17931796    Page.SetFocus()
    17941797    G2frame.G2plotNB.status.DestroyChildren()
Note: See TracChangeset for help on using the changeset viewer.