Ignore:
Timestamp:
Feb 23, 2017 1:26:52 PM (5 years ago)
Author:
vondreele
Message:

fix pseudo variable issues when some vals are None
fix problem of moved ge multi-image files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMain.py

    r2717 r2721  
    317317        calcControls.update(controlDict)
    318318        varyList = rbVary+redphaseVary+hapVary+histVary
     319#        if not ihst:
     320            # save the initial vary list, but without histogram numbers on parameters
     321        saveVaryList = varyList[:]
     322        for i,item in enumerate(saveVaryList):
     323            items = item.split(':')
     324            if items[1]:
     325                items[1] = ''
     326            item = ':'.join(items)
     327            saveVaryList[i] = item
    319328        if not ihst:
    320             # save the initial vary list, but without histogram numbers on parameters
    321             saveVaryList = varyList[:]
    322             for i,item in enumerate(saveVaryList):
    323                 items = item.split(':')
    324                 if items[1]:
    325                     items[1] = ''
    326                 item = ':'.join(items)
    327                 saveVaryList[i] = item
    328329            SeqResult['varyList'] = saveVaryList
     330        else:
     331            SeqResult['varyList'] = list(set(SeqResult['varyList']+saveVaryList))
    329332        parmDict = {}
    330333        parmDict.update(phaseDict)
Note: See TracChangeset for help on using the changeset viewer.