Changeset 1503 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Sep 20, 2014 10:55:54 AM (8 years ago)
Author:
vondreele
Message:

begin incommensurate structure stuff -new importers for SHELX HKLF5 and JANA m90 files with superlattice reflection indices. New phase importer for JANA m40 & m50 files. Single crystal reflection lists now have extra columns for superlattitice indices.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r1498 r1503  
    26332633        G2gd.SetDataMenuBar(G2frame)
    26342634        refs = data[1]['RefList']
    2635     else:       
     2635        Super = data[1].get('Super',0)
     2636    else:
     2637        Super = 0   #for now       
    26362638        G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.ReflMenu)
    26372639        if not G2frame.dataFrame.GetStatusBar():
     
    26582660           
    26592661    for i in range(len(refs)): rowLabels.append(str(i))
    2660     Types = 4*[wg.GRID_VALUE_LONG,]+4*[wg.GRID_VALUE_FLOAT+':10,4',]+ \
     2662    Types = (4+Super)*[wg.GRID_VALUE_LONG,]+4*[wg.GRID_VALUE_FLOAT+':10,4',]+ \
    26612663        2*[wg.GRID_VALUE_FLOAT+':10,2',]+[wg.GRID_VALUE_FLOAT+':10,3',]+ \
    26622664        [wg.GRID_VALUE_FLOAT+':10,3',]
     2665    superLabels = ['M1','M2','M3']
    26632666    if HKLF:
    26642667        colLabels = ['H','K','L','mul','d','Fosq','sig','Fcsq','FoTsq','FcTsq','phase','ExtC',]
    26652668        if 'T' in Inst['Type'][0]:
    26662669            colLabels = ['H','K','L','mul','d','Fosq','sig','Fcsq','FoTsq','FcTsq','phase','ExtC','wave','tbar']
    2667             Types += 2*[wg.GRID_VALUE_FLOAT+':10,3',]           
     2670            Types += 2*[wg.GRID_VALUE_FLOAT+':10,3',]
     2671        if Super:
     2672            for i in range(Super):
     2673                colLabels.insert(3+i,superLabels[i])
    26682674    else:
    26692675        if 'C' in Inst['Type'][0]:
Note: See TracChangeset for help on using the changeset viewer.