Changeset 2557


Ignore:
Timestamp:
Dec 4, 2016 10:48:59 PM (5 years ago)
Author:
toby
Message:

Fix sequential refinement with not-ready histograms

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2551 r2557  
    37043704    posdict = {}
    37053705    prevVaryList = []
     3706    foundNames = []
    37063707    for i,name in enumerate(histNames):
     3708        if name not in data:
     3709            print("Error: "+name+" not found!")
     3710            continue
     3711        foundNames.append(name)
    37073712        for var,val,sig in zip(data[name]['varyList'],data[name]['variables'],data[name]['sig']):
    37083713            svar = striphist(var,'*') # wild-carded
     
    37253730    #-----------------------------------------------------------------------------------
    37263731    # build up the data table by columns -----------------------------------------------
     3732    histNames = foundNames
    37273733    nRows = len(histNames)
    37283734    colList = [nRows*[True]]
  • trunk/GSASIIstrMain.py

    r2546 r2557  
    296296        calcControls['MFtables'] = MFtables
    297297        calcControls['maxSSwave'] = maxSSwave
     298        if histogram not in Histograms:
     299            print("Error: not found!")
     300            continue
    298301        Histo = {histogram:Histograms[histogram],}
    299302        hapVary,hapDict,controlDict = G2stIO.GetHistogramPhaseData(Phases,Histo,Print=False)
Note: See TracChangeset for help on using the changeset viewer.