Changeset 1107 for trunk/GSASIIphsGUI.py


Ignore:
Timestamp:
Oct 15, 2013 3:01:21 PM (8 years ago)
Author:
vondreele
Message:

make reflist np.array
fix bug - hfx+'Type' needs to be in parmDict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r1106 r1107  
    31143114        G,g = G2lat.cell2Gmat(Cell)
    31153115        for iref,ref in enumerate(reflData['RefList']):
    3116             H = ref[:3]
     3116            H = list(ref[:3])
    31173117            ref[4] = np.sqrt(1./G2lat.calc_rDsq2(H,G))
    31183118            iabsnt,ref[3],Uniq,phi = G2spc.GenHKLf(H,SGData)
     
    48914891            reflSets = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
    48924892            reflData = reflSets[phaseName]
    4893             if isinstance(reflDict,list):       #patch for old reflection data
     4893            if isinstance(reflData,list):       #patch for old reflection data
    48944894                RefData = {'RefList':[],'Uniq':[],'Phi':[],'FF':[]}
    4895                 for ref in reflDict:
     4895                for ref in reflData:
    48964896                    RefData['RefList'].append(ref[:11]+[ref[13],])
    48974897                    RefData['Uniq'].append(ref[11])
    48984898                    RefData['Phi'].append(ref[12])
    48994899                    RefData['FF'].append(ref[14])
    4900                 reflDict = RefData
     4900                RefData['RefList'] = np.array(RefData['RefList'])
     4901                reflData = RefData
    49014902        elif 'HKLF' in reflName:
    49024903            PatternId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, reflName)
     
    49914992                    RefData['Phi'].append(ref[12])
    49924993                    RefData['FF'].append(ref[14])
     4994                RefData['RefList'] = np.array(RefData['RefList'])
    49934995                reflDict = RefData
    49944996        elif 'HKLF' in reflName:
Note: See TracChangeset for help on using the changeset viewer.