Changeset 1788

Timestamp:

Apr 13, 2015 1:33:29 PM (8 years ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -2404 +2404 @@
             userReject = data['UsrReject']
             usrRej = {'minF/sig':[' Min obs/sig (0-5): ',[0,5], ],'MinExt':[' Min extinct. (0-.9): ',[0,.9],],
-                'MaxDF/F':[' Max delt-F/sig (3-20): ',[3.,20.],],'MaxD':[' Max d-spacing (3-500): ',[3,500],],
+                'MaxDF/F':[' Max delt-F/sig (3-1000): ',[3.,1000.],],'MaxD':[' Max d-spacing (3-500): ',[3,500],],
                 'MinD':[' Min d-spacing (0.1-1.0): ',[0.1,1.0],]}
 
@@ -3606 +3606 @@
     elif kind in ['HKLF',]:
         SetDataMenuBar(G2frame,G2frame.dataFrame.HKLFMenu)
-#        G2frame.dataFrame.Bind(wx.EVT_MENU, OnErrorAnalysis, id=wxID_PWDANALYSIS)
+        G2frame.dataFrame.Bind(wx.EVT_MENU, OnErrorAnalysis, id=wxID_PWDANALYSIS)
         G2frame.dataFrame.Bind(wx.EVT_MENU, OnPlot3DHKL, id=wxID_PWD3DHKLPLOT)
 #        G2frame.dataFrame.Bind(wx.EVT_MENU, onCopySelectedItems, id=wxID_PWDCOPY)

trunk/GSASIIplot.py

@@ -1786 +1786 @@
         DS = xye[5][xmin:xmax]*np.sqrt(wtFactor*xye[2][xmin:xmax])
     elif kind == 'HKLF':
-        refl = Pattern[1]
+        refl = Pattern[1]['RefList']
+        im = 0
+        if Pattern[1]['Super']:
+            im = 1
         DS = []
         for ref in refl:
-            if ref[6] > 0.:
-                DS.append((ref[5]-ref[7])/ref[6])
+            if ref[6+im] > 0.:
+                DS.append((ref[5+im]-ref[7+im])/ref[6+im])
     Page.SetFocus()
     G2frame.G2plotNB.status.DestroyChildren()