Changeset 2145


Ignore:
Timestamp:
Feb 10, 2016 3:44:21 PM (6 years ago)
Author:
vondreele
Message:

make Comments with merging R values, etc. for HKL Merge result

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2143 r2145  
    30153015        Inst = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,
    30163016            G2frame.PatternId,'Instrument Parameters'))
     3017        CId = GetPatternTreeItemId(G2frame,G2frame.PatternId,'Comments')
     3018        if CId:
     3019            Comments = G2frame.PatternTree.GetItemPyData(CId)
     3020        else:
     3021            Comments = []
    30173022        refList = np.copy(data[1]['RefList'])
     3023        Comments.append(' Merging %d reflections from %s'%(len(refList),Name))
    30183024        dlg = MergeDialog(G2frame,data)
    30193025        try:
     
    30283034        SG = 'P '+Laue
    30293035        SGData = G2spc.SpcGroup(SG)[1]
    3030 #        refList = G2lat.LaueUnique2(SGData,refList)
    30313036        refList = G2lat.LaueUnique(Laue,refList)
    30323037        dlg = wx.ProgressDialog('Build HKL dictonary','',len(refList)+1,
     
    30693074        mergeRef = np.array(mergeRef)
    30703075        if sumFo:
    3071             print 'merge R = %6.2f%s for %d reflections in %s'%(100.*sumDf/sumFo,'%',mergeRef.shape[0],Laue)
     3076            mtext = ' merge R = %6.2f%s for %d reflections in %s'%(100.*sumDf/sumFo,'%',mergeRef.shape[0],Laue)
     3077            print mtext
     3078            Comments.append(mtext)
    30723079        else:
    30733080            print 'nothing to merge for %s reflections'%(mergeRef.shape[0])
     
    30863093        newData[1]['RefList'] = mergeRef
    30873094        Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text=newName)
     3095        G2frame.PatternTree.SetItemPyData(
     3096            G2frame.PatternTree.AppendItem(Id,text='Comments'),Comments)
    30883097        G2frame.PatternTree.SetItemPyData(Id,newData)
    30893098        G2frame.PatternTree.SetItemPyData(
Note: See TracChangeset for help on using the changeset viewer.