Changeset 2722


Ignore:
Timestamp:
Feb 23, 2017 3:34:25 PM (5 years ago)
Author:
vondreele
Message:

finish fix of seq. results table, column formats, allow use of initially unrefined parms in pseudoparms

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2721 r2722  
    34543454            if len(key) < 3: continue
    34553455            # remove the dA[xyz] terms, they would only bring confusion
     3456            if key[0] and key[0] not in phaselist: phaselist.append(key[0])
    34563457            if key[2].startswith('dA'):
    34573458                delList.append(item)
    34583459            # compute and update the corrected reciprocal cell terms using the Dij values
    34593460            elif key[2] in Ddict:
    3460                 if key[0] not in phaselist: phaselist.append(key[0])
    34613461                akey = key[0]+'::'+Ddict[key[2]]
    34623462                parmDict[akey] -= parmDict[item]
     
    39543954        G2frame.colSigs += [None]
    39553955        colLabels += [u'\u0394\u03C7\u00B2 (%)']
    3956         Types += [wg.GRID_VALUE_FLOAT,]
     3956        Types += [wg.GRID_VALUE_FLOAT+':10,5',]
    39573957    deltaChiCol = len(colLabels)-1
    39583958    # add changing sample parameters to table
     
    39733973            colLabels += [pfx+cellUlbl[i] for i in uniqCellIndx[pId]]
    39743974            colLabels += [pfx+'Vol']
    3975             Types += (1+len(uniqCellIndx[pId]))*[wg.GRID_VALUE_FLOAT,]
     3975            Types += (len(uniqCellIndx[pId]))*[wg.GRID_VALUE_FLOAT+':10,5',]
     3976            Types += [wg.GRID_VALUE_FLOAT+':10,3',]
    39763977            Albls = [pfx+'A'+str(i) for i in range(6)]
    39773978            for hId,name in enumerate(histNames):
     
    40244025                lbl += posdict[h].get(i)
    40254026        colLabels.append(lbl)
    4026     Types += varcols*[wg.GRID_VALUE_FLOAT]
     4027    Types += varcols*[wg.GRID_VALUE_FLOAT,]
    40274028    vals = []
    40284029    esds = []
     
    40624063            sigwtFrList.append(sig)
    40634064        colLabels.append(str(Phases[phase]['pId'])+':*:WgtFrac')
     4065        Types += [wg.GRID_VALUE_FLOAT+':10,5',]
    40644066        G2frame.colList += [wtFrList]
    40654067        G2frame.colSigs += [sigwtFrList]
     
    40834085        if len(depValDict[var]) != len(histNames): continue
    40844086        colLabels.append(var)
    4085         Types += [wg.GRID_VALUE_FLOAT,]
     4087        Types += [wg.GRID_VALUE_FLOAT+':10,5',]
    40864088        G2frame.colSigs += [depSigDict[var]]
    40874089        G2frame.colList += [depValDict[var]]
     
    40894091    # add atom parameters to table
    40904092    colLabels += atomLookup.keys()
    4091     Types += len(atomLookup)*[wg.GRID_VALUE_FLOAT]
    40924093    for parm in sorted(atomLookup):
    40934094        G2frame.colList += [[data[name]['newAtomDict'][atomLookup[parm]][1] for name in histNames]]
     4095        Types += [wg.GRID_VALUE_FLOAT+':10,5',]
    40944096        if atomLookup[parm] in data[histNames[0]]['varyList']:
    40954097            col = data[histNames[0]]['varyList'].index(atomLookup[parm])
     
    41504152        G2frame.colSigs += [esdList]
    41514153        colLabels += [expr]
    4152         Types += [wg.GRID_VALUE_FLOAT,]
     4154        Types += [wg.GRID_VALUE_FLOAT+':10,3']
    41534155    #---- table build done -------------------------------------------------------------
    41544156
     
    41904192    G2frame.dataFrame.currentGrids = []
    41914193    G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame)
    4192     G2frame.SeqTable = G2G.Table(
    4193         [list(cl) for cl in zip(*G2frame.colList)],     # convert from columns to rows
     4194    G2frame.SeqTable = G2G.Table([list(cl) for cl in zip(*G2frame.colList)],     # convert from columns to rows
    41944195        colLabels=colLabels,rowLabels=histNames,types=Types)
    41954196    G2frame.dataDisplay.SetTable(G2frame.SeqTable, True)
     
    42034204    G2frame.dataDisplay.SetRowLabelSize(8*len(histNames[0]))       #pretty arbitrary 8
    42044205    G2frame.dataDisplay.SetMargins(0,0)
    4205     G2frame.dataDisplay.AutoSizeColumns(True)
     4206    G2frame.dataDisplay.AutoSizeColumns(False)
    42064207    if prevSize:
    42074208        G2frame.dataFrame.setSizePosLeft(prevSize)
Note: See TracChangeset for help on using the changeset viewer.