Changeset 1313 for trunk/GSASIIsasd.py

Timestamp:

May 1, 2014 8:54:41 AM (9 years ago)

Author:

vondreele

Message:

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

File:

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

trunk/GSASIIsasd.py

@@ -1172 +1172 @@
                         distDict[item.split(':')[1]] = parmDict[item]
                 rho = parmDict[cid+'XAnom density']
-                contrast = rho**2-rhoMat**2
+                contrast = (rho-rhoMat)**2
                 rBins,dBins,dist = MakeDiamDist(Type,parmDict[cid+'NumPoints'],parmDict[cid+'Cutoff'],distDict)
                 Gmat = G_matrix(Q,rBins,contrast,FFfxn,Volfxn,FFargs).T
@@ -1201 +1201 @@
                         SFargs.append(parmDict[item])
                 rho = parmDict[cid+'XAnom density']
-                contrast = rho**2-rhoMat**2
+                contrast = (rho-rhoMat)**2
                 R = parmDict[cid+'Radius']
                 Gmat = G_matrix(Q,R,contrast,FFfxn,Volfxn,FFargs)             
@@ -1295 +1295 @@
                     FFargs.append(controls['FFargs'][item][0])
             rho = Substances['Substances'][level['Controls']['Material']].get('XAnom density',0.0)
-            contrast = rho**2-rhoMat**2
+            contrast = (rho-rhoMat)**2
             distDict = {}
             for item in parmDict:
@@ -1337 +1337 @@
                     FFargs.append(controls['FFargs'][item][0])
             rho = Substances['Substances'][level['Controls']['Material']].get('XAnom density',0.0)
-            contrast = rho**2-rhoMat**2
+            contrast = (rho-rhoMat)**2
             Gmat = G_matrix(Q[Ibeg:Ifin],R,contrast,FFfxn,Volfxn,FFargs)             
             Ic[Ibeg:Ifin] += Gmat[0]*level[distFxn]['Volume'][0]*SFfxn(Q[Ibeg:Ifin],args=SFargs)