Changeset 1318


Ignore:
Timestamp:
May 2, 2014 1:23:44 PM (8 years ago)
Author:
vondreele
Message:

fix Bragg peak calc in SASD

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIsasd.py

    r1317 r1318  
    12021202                Gmat = G_matrix(Q,R,contrast,FFfxn,Volfxn,FFargs)             
    12031203                Ic += Gmat[0]*parmDict[cid+'Volume']*SFfxn(Q,args=SFargs)
    1204             elif 'Bragg' in distFxn:
     1204            elif 'Bragg' in Type:
    12051205                Ic += parmDict[cid+'PkInt']*G2pwd.getPsVoigt(parmDict[cid+'PkPos'],
    12061206                    parmDict[cid+'PkSig'],parmDict[cid+'PkGam'],Q)
     
    12461246        covMatrix = covM*Rvals['GOF']
    12471247        return True,result,varyList,sig,Rvals,covMatrix
    1248     except ValueError,TypeError:      #when bad LS refinement; covM missing or with nans
     1248    except (ValueError,TypeError):      #when bad LS refinement; covM missing or with nans
    12491249        return False,0,0,0,0,0
    12501250   
Note: See TracChangeset for help on using the changeset viewer.