Changeset 4030


Ignore:
Timestamp:
Jun 17, 2019 2:24:27 PM (2 years ago)
Author:
vondreele
Message:

fix defaults for ka1-Ka2 powder data to be Bragg-Brentano for both GUI & scriptable G2

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r4021 r4030  
    13421342            newVals.append(val)
    13431343            il += 1
     1344        if 'Lam1' in newItems:
     1345            rd.Sample.update({'Type':'Bragg-Brentano','Shift':[0.,False],'Transparency':[0.,False],
     1346                'SurfRoughA':[0.,False],'SurfRoughB':[0.,False]})
     1347        else:
     1348            rd.Sample.update({'Type':'Debye-Scherrer','Absorption':[0.,False],'DisplaceX':[0.,False],'DisplaceY':[0.,False]})
    13441349        return [G2fil.makeInstDict(newItems,newVals,len(newVals)*[False,]),{}]
    13451350       
  • trunk/GSASIIpwd.py

    r4021 r4030  
    31283128        try:
    31293129            refId = reflDict[hash('%5d%5d%5d'%(h,k,l))]
    3130         except KeyError:    #added reflections
    3131             break
     3130        except KeyError:    #added reflections at end skipped
     3131            continue
    31323132        reflData[refId][8] = Fosq
    31333133        reflData[refId][10] = phase
Note: See TracChangeset for help on using the changeset viewer.