Changeset 5140


Ignore:
Timestamp:
Jan 14, 2022 10:28:18 AM (7 months ago)
Author:
vondreele
Message:

fix fitting background points for EDX data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r5114 r5140  
    13501350                insNames.append(parm)
    13511351                insVals.append(Inst[parm][1])
    1352                 if parm in ['U','V','W','X','Y','Z','SH/L','I(L2)/I(L1)','alpha',
     1352                if parm in ['U','V','W','X','Y','Z','SH/L','I(L2)/I(L1)','alpha','A','B','C',
    13531353                    'beta-0','beta-1','beta-q','sig-0','sig-1','sig-2','sig-q',] and Inst[parm][2]:
    13541354                        Inst[parm][2] = False
    13551355#                        insVary.append(parm)
    13561356            instDict = dict(zip(insNames,insVals))
    1357             instDict['X'] = max(instDict['X'],0.01)
    1358             instDict['Y'] = max(instDict['Y'],0.01)
     1357            if 'E' not in dataType:  #exclude EDX
     1358                instDict['X'] = max(instDict['X'],0.01)
     1359                instDict['Y'] = max(instDict['Y'],0.01)
    13591360            if 'SH/L' in instDict:
    13601361                instDict['SH/L'] = max(instDict['SH/L'],0.002)
     
    13671368        inst,inst2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters'))
    13681369        # sort the points for convenience and then separate them; extend the range if needed
    1369         if 'FixedPoints' not in background[1]:
     1370        if 'FixedPoints' not in background[1] or not len(background[1]['FixedPoints']):
    13701371            msg = ("You have not defined any fixed background points. "+
    13711372                    "Use the Fixed Points/Add menu item to define points that will be fit."+
Note: See TracChangeset for help on using the changeset viewer.