Changeset 2644


Ignore:
Timestamp:
Jan 18, 2017 10:46:30 AM (5 years ago)
Author:
vondreele
Message:

fix background fixed point refinement to eliminate inst parms from variables

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r2634 r2644  
    920920
    921921    def OnBkgFit(event):
     922       
    922923        def SetInstParms(Inst):
    923924            dataType = Inst['Type'][0]
     
    930931                if parm in ['U','V','W','X','Y','SH/L','I(L2)/I(L1)','alpha',
    931932                    'beta-0','beta-1','beta-q','sig-0','sig-1','sig-2','sig-q',] and Inst[parm][2]:
    932                         insVary.append(parm)
     933                        Inst[parm][2] = False
     934#                        insVary.append(parm)
    933935            instDict = dict(zip(insNames,insVals))
    934936            instDict['X'] = max(instDict['X'],0.01)
     
    964966
    965967        # load instrument and background params
     968        print ' NB: Any instrument parameter refinement flags will be cleared'
    966969        dataType,insDict,insVary = SetInstParms(inst)
    967970        bakType,bakDict,bakVary = G2pwd.SetBackgroundParms(background)
     
    986989        parmDict.update(bakDict)
    987990        parmDict.update(insDict)
    988         pwddata[3] *= 0
    989         pwddata[5] *= 0
     991        pwddata[3][xBeg:xFin] *= 0.
     992        pwddata[5][xBeg:xFin] *= 0.
    990993        pwddata[4][xBeg:xFin] = G2pwd.getBackground(
    991994            '',parmDict,bakType,dataType,xdata)[0]
Note: See TracChangeset for help on using the changeset viewer.