Changeset 1313 for trunk/GSASIIsasd.py


Ignore:
Timestamp:
May 1, 2014 8:54:41 AM (7 years ago)
Author:
vondreele
Message:

fix contrast calculation for sasd.
put in a wx.CallAfter?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIsasd.py

    r1311 r1313  
    11721172                        distDict[item.split(':')[1]] = parmDict[item]
    11731173                rho = parmDict[cid+'XAnom density']
    1174                 contrast = rho**2-rhoMat**2
     1174                contrast = (rho-rhoMat)**2
    11751175                rBins,dBins,dist = MakeDiamDist(Type,parmDict[cid+'NumPoints'],parmDict[cid+'Cutoff'],distDict)
    11761176                Gmat = G_matrix(Q,rBins,contrast,FFfxn,Volfxn,FFargs).T
     
    12011201                        SFargs.append(parmDict[item])
    12021202                rho = parmDict[cid+'XAnom density']
    1203                 contrast = rho**2-rhoMat**2
     1203                contrast = (rho-rhoMat)**2
    12041204                R = parmDict[cid+'Radius']
    12051205                Gmat = G_matrix(Q,R,contrast,FFfxn,Volfxn,FFargs)             
     
    12951295                    FFargs.append(controls['FFargs'][item][0])
    12961296            rho = Substances['Substances'][level['Controls']['Material']].get('XAnom density',0.0)
    1297             contrast = rho**2-rhoMat**2
     1297            contrast = (rho-rhoMat)**2
    12981298            distDict = {}
    12991299            for item in parmDict:
     
    13371337                    FFargs.append(controls['FFargs'][item][0])
    13381338            rho = Substances['Substances'][level['Controls']['Material']].get('XAnom density',0.0)
    1339             contrast = rho**2-rhoMat**2
     1339            contrast = (rho-rhoMat)**2
    13401340            Gmat = G_matrix(Q[Ibeg:Ifin],R,contrast,FFfxn,Volfxn,FFargs)             
    13411341            Ic[Ibeg:Ifin] += Gmat[0]*level[distFxn]['Volume'][0]*SFfxn(Q[Ibeg:Ifin],args=SFargs)
Note: See TracChangeset for help on using the changeset viewer.