Changeset 1318
- Timestamp:
- May 2, 2014 1:23:44 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIsasd.py
r1317 r1318 1202 1202 Gmat = G_matrix(Q,R,contrast,FFfxn,Volfxn,FFargs) 1203 1203 Ic += Gmat[0]*parmDict[cid+'Volume']*SFfxn(Q,args=SFargs) 1204 elif 'Bragg' in distFxn:1204 elif 'Bragg' in Type: 1205 1205 Ic += parmDict[cid+'PkInt']*G2pwd.getPsVoigt(parmDict[cid+'PkPos'], 1206 1206 parmDict[cid+'PkSig'],parmDict[cid+'PkGam'],Q) … … 1246 1246 covMatrix = covM*Rvals['GOF'] 1247 1247 return True,result,varyList,sig,Rvals,covMatrix 1248 except ValueError,TypeError: #when bad LS refinement; covM missing or with nans1248 except (ValueError,TypeError): #when bad LS refinement; covM missing or with nans 1249 1249 return False,0,0,0,0,0 1250 1250
Note: See TracChangeset
for help on using the changeset viewer.