Changeset 3941


Ignore:
Timestamp:
May 1, 2019 9:50:10 AM (2 years ago)
Author:
vondreele
Message:

fix peak picking problem - missing Z parameter in instparm file. Now does get & defaults to [0.0,0.0]

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImath.py

    r3913 r3941  
    40574057    if 'C' in Parms['Type'][0]:                            #CW data - TOF later in an else
    40584058        for x in ['U','V','W','X','Y','Z']:
    4059             ins[x] = Parms[x][ind]
     4059            ins[x] = Parms.get(x,[0.0,0.0])[ind]
    40604060        if ifQ:                              #qplot - convert back to 2-theta
    40614061            pos = 2.0*asind(pos*getWave(Parms)/(4*math.pi))
     
    40714071        if 'Pdabc' in Parms2:
    40724072            for x in ['sig-0','sig-1','sig-2','sig-q','X','Y','Z']:
    4073                 ins[x] = Parms[x][ind]
     4073                ins[x] = Parms.get(x,[0.0,0.0])[ind]
    40744074            Pdabc = Parms2['Pdabc'].T
    40754075            alp = np.interp(dsp,Pdabc[0],Pdabc[1])
     
    40774077        else:
    40784078            for x in ['alpha','beta-0','beta-1','beta-q','sig-0','sig-1','sig-2','sig-q','X','Y','Z']:
    4079                 ins[x] = Parms[x][ind]
     4079                ins[x] = Parms.get(x,[0.0,0.0])[ind]
    40804080            alp = getTOFalpha(ins,dsp)
    40814081            bet = getTOFbeta(ins,dsp)
Note: See TracChangeset for help on using the changeset viewer.