Changeset 3941 for trunk

Timestamp:

May 1, 2019 9:50:10 AM (6 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:

• trunk/GSASIImath.py (modified) (3 diffs)

trunk/GSASIImath.py ¶

@@ -4057 +4057 @@
     if 'C' in Parms['Type'][0]:                            #CW data - TOF later in an else
         for x in ['U','V','W','X','Y','Z']:
-            ins[x] = Parms[x][ind]
+            ins[x] = Parms.get(x,[0.0,0.0])[ind]
         if ifQ:                              #qplot - convert back to 2-theta
             pos = 2.0*asind(pos*getWave(Parms)/(4*math.pi))
@@ -4071 +4071 @@
         if 'Pdabc' in Parms2:
             for x in ['sig-0','sig-1','sig-2','sig-q','X','Y','Z']:
-                ins[x] = Parms[x][ind]
+                ins[x] = Parms.get(x,[0.0,0.0])[ind]
             Pdabc = Parms2['Pdabc'].T
             alp = np.interp(dsp,Pdabc[0],Pdabc[1])
@@ -4077 +4077 @@
         else:
             for x in ['alpha','beta-0','beta-1','beta-q','sig-0','sig-1','sig-2','sig-q','X','Y','Z']:
-                ins[x] = Parms[x][ind]
+                ins[x] = Parms.get(x,[0.0,0.0])[ind]
             alp = getTOFalpha(ins,dsp)
             bet = getTOFbeta(ins,dsp)