Changeset 1313 for trunk/GSASIIpwdGUI.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/GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIpwdGUI.py

@@ -2500 +2500 @@
         dlg.Destroy()
         
-        
     def OnDeleteElement(event):
         TextList = []
@@ -2565 +2564 @@
             data['Substances'][name]['XAnom density'] = contrst
             data['Substances'][name]['XAbsorption'] = absorb
-            UpdateSubstanceGrid(G2frame,data)
+            wx.CallAfter(UpdateSubstanceGrid,G2frame,data)
         
         Indx = {}
@@ -3097 +3096 @@
                 sizeSizer.Add(matSel,0,WACV) #do neutron test here?
                 rho = Substances['Substances'][level['Controls']['Material']].get('XAnom density',0.0)
-                contrast = rho**2-rhoMat**2
+                contrast = (rho-rhoMat)**2
                 sizeSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Resonant X-ray contrast: '),0,WACV)
                 sizeSizer.Add(wx.StaticText(G2frame.dataDisplay,label='  %.2f 10%scm%s'%(contrast,Pwr20,Pwrm4)),0,WACV)