Changeset 1318

Timestamp:

May 2, 2014 1:23:44 PM (8 years ago)

Author:

vondreele

Message:

fix Bragg peak calc in SASD

File:

• trunk/GSASIIsasd.py (modified) (2 diffs)

trunk/GSASIIsasd.py

@@ -1202 +1202 @@
                 Gmat = G_matrix(Q,R,contrast,FFfxn,Volfxn,FFargs)             
                 Ic += Gmat[0]*parmDict[cid+'Volume']*SFfxn(Q,args=SFargs)
-            elif 'Bragg' in distFxn:
+            elif 'Bragg' in Type:
                 Ic += parmDict[cid+'PkInt']*G2pwd.getPsVoigt(parmDict[cid+'PkPos'],
                     parmDict[cid+'PkSig'],parmDict[cid+'PkGam'],Q)
@@ -1246 +1246 @@
         covMatrix = covM*Rvals['GOF']
         return True,result,varyList,sig,Rvals,covMatrix
-    except ValueError,TypeError:      #when bad LS refinement; covM missing or with nans
+    except (ValueError,TypeError):      #when bad LS refinement; covM missing or with nans
         return False,0,0,0,0,0