Skip to content

Commit 1cb7e04

Browse files
committed
add merge details to HKLF Comments,
show total number of HKLF reflections on HKLF page
1 parent aacc1e0 commit 1cb7e04

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

GSASII/GSASIIdataGUI.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8183,12 +8183,16 @@ def OnMergeHKL(event):
81838183
if newHKL[5+Super] > 0.:
81848184
mergeRef.append(list(newHKL))
81858185
dlg.Destroy()
8186-
print(' Duplicate reflection statistics:')
8186+
mtext = ' Duplicate reflection statistics:'
8187+
print(mtext)
8188+
Comments.append(mtext)
81878189
for ihkl in range(MaxN):
81888190
try:
8189-
print('Ndup hkl:',ihkl+1,' Number: ',Nmerge[ihkl+1][0],' Rej:',Nmerge[ihkl+1][1])
8191+
mtext = 'Ndup hkl: %d Number: %d Rej: %d'%(ihkl+1,Nmerge[ihkl+1][0],Nmerge[ihkl+1][1])
81908192
except KeyError:
8191-
print('Ndup hkl:',ihkl+1,' Number: ',0)
8193+
mtext = 'Ndup hkl: %d Number: 0'%(ihkl+1)
8194+
print(mtext)
8195+
Comments.append(mtext)
81928196
if Super:
81938197
mergeRef = G2mth.sortArray(G2mth.sortArray(G2mth.sortArray(G2mth.sortArray(mergeRef,3),2),1),0)
81948198
else:
@@ -8531,6 +8535,8 @@ def OnEditMag(**args):
85318535
Super = 0
85328536
SuperVec = []
85338537
refList = data[1]['RefList']
8538+
nRef = refList.shape[0]
8539+
mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Total Nref: %d'%nRef))
85348540
FoMax = np.max(refList.T[5+data[1].get('Super',0)])
85358541
page = G2frame.G2plotNB.nb.GetSelection()
85368542
tab = ''

0 commit comments

Comments
 (0)