Changeset 1273 for trunk/GSASIIsasd.py

Timestamp:

Apr 7, 2014 1:23:59 PM (8 years ago)

Author:

vondreele

Message:

clean up SASD Model plotting
clean up form factor functions

File:

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

trunk/GSASIIsasd.py

@@ -167 +167 @@
     '''
     AR = args[0]
-    return UniRodFF(Q,R,args=[AR*R,])
+    return UniRodFF(Q,R,args=[2.*AR*R,])
     
 def UniDiskFF(Q,R,args):
@@ -313 +313 @@
     returns float: volume (A^3) of tube wall
     '''
-    L,T = arg[:2]
+    L,T = args[:2]
     return CylinderVol(R,[L,])-CylinderVol(R-T,[L,])
     
@@ -868 +868 @@
         'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol],
         'Unified rod':[UniRodFF,UniRodVol],'Unified rod AR':[UniRodARFF,UniRodARVol],
-        'Unified disk':[UniDiskFF,UniDiskVol]}
+        'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol],
+        'Cylinder diam':[CylinderDFF,CylinderDVol]}
     Shape = data['Size']['Shape'][0]
     Parms = data['Size']['Shape'][1:]
@@ -933 +934 @@
         'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol],
         'Unified rod':[UniRodFF,UniRodVol],'Unified rod AR':[UniRodARFF,UniRodARVol],
-        'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol]}
+        'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol],
+        'Unified tube':[UniTubeFF,UniTubeVol],'Cylinder diam':[CylinderDFF,CylinderDVol]}
 #    pdb.set_trace()
     partData = sasdData['Particle']
@@ -970 +972 @@
         Dist.append(dist)
     sasdData['Size Calc'] = [Rbins,Dist]
-    return Rbins,Dist
     
 def MakeDiamDist(DistName,nPoints,cutoff,parmDict):