Changeset 1494

Timestamp:

Sep 12, 2014 7:27:57 AM (9 years ago)

Author:

vondreele

Message:

add traps for bad peak profiles where iBeg > iFin caused crash

File:

• trunk/GSASIIstrMath.py (modified) (4 diffs)

trunk/GSASIIstrMath.py

@@ -1657 +1657 @@
                 elif not iBeg-iFin:     #peak above high limit - done
                     break
+                elif iBeg > iFin:   #bad peak coeff - skip
+                    continue
                 yc[iBeg:iFin] += refl[11]*refl[9]*G2pwd.getFCJVoigt3(refl[5],refl[6],refl[7],shl,ma.getdata(x[iBeg:iFin]))    #>90% of time spent here
                 if Ka2:
@@ -1667 +1669 @@
                     elif not iBeg-iFin:     #peak above high limit - done
                         return yc,yb
+                    elif iBeg > iFin:   #bad peak coeff - skip
+                        continue
                     yc[iBeg:iFin] += refl[11]*refl[9]*kRatio*G2pwd.getFCJVoigt3(pos2,refl[6],refl[7],shl,ma.getdata(x[iBeg:iFin]))        #and here
             elif 'T' in calcControls[hfx+'histType']:
@@ -1692 +1696 @@
                 elif not iBeg-iFin:     #peak above high limit - done
                     break
+                elif iBeg > iFin:   #bad peak coeff - skip
+                    continue
                 yc[iBeg:iFin] += refl[11]*refl[9]*G2pwd.getEpsVoigt(refl[5],refl[12],refl[13],refl[6],refl[7],ma.getdata(x[iBeg:iFin]))/cw[iBeg:iFin]
 #        print 'profile calc time: %.3fs'%(time.time()-time0)
@@ -1820 +1826 @@
             else:   #'T'OF
                 lenBF = iFin-iBeg
+                if lenBF < 0:   #bad peak coeff
+                    break
                 dMdpk = np.zeros(shape=(6,lenBF))
                 dMdipk = G2pwd.getdEpsVoigt(refl[5],refl[12],refl[13],refl[6],refl[7],ma.getdata(x[iBeg:iFin]))