Changeset 1311 for trunk/GSASIIsasd.py

Timestamp:

Apr 30, 2014 3:08:00 PM (9 years ago)

Author:

vondreele

Message:

fix errors in mono disperse with non dilute systems - now works

File:

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

trunk/GSASIIsasd.py

@@ -1197 +1197 @@
                     if item in parmDict: 
                         FFargs.append(parmDict[item])
+                for item in [cid+'Dist',cid+'VolFr',cid+'epis',cid+'Sticky',cid+'Depth',cid+'Width']:
+                    if item in parmDict: 
+                        SFargs.append(parmDict[item])
                 rho = parmDict[cid+'XAnom density']
                 contrast = rho**2-rhoMat**2
@@ -1326 +1329 @@
             SFfxn = sfxns[controls['StrFact']]
             FFargs = []
-            SFargs = [parmDict['Volume'][0],R]
-            for item in ['epis','Sticky','Depth','Width',]:
+            SFargs = []
+            for item in ['Dist','VolFr','epis','Sticky','Depth','Width',]:
                 if item in controls.get('SFargs',{}):
                     SFargs.append(controls['SFargs'][item][0])