Changeset 1273 for trunk/GSASIIsasd.py
- Timestamp:
- Apr 7, 2014 1:23:59 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIsasd.py
r1272 r1273 167 167 ''' 168 168 AR = args[0] 169 return UniRodFF(Q,R,args=[ AR*R,])169 return UniRodFF(Q,R,args=[2.*AR*R,]) 170 170 171 171 def UniDiskFF(Q,R,args): … … 313 313 returns float: volume (A^3) of tube wall 314 314 ''' 315 L,T = arg [:2]315 L,T = args[:2] 316 316 return CylinderVol(R,[L,])-CylinderVol(R-T,[L,]) 317 317 … … 868 868 'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol], 869 869 'Unified rod':[UniRodFF,UniRodVol],'Unified rod AR':[UniRodARFF,UniRodARVol], 870 'Unified disk':[UniDiskFF,UniDiskVol]} 870 'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol], 871 'Cylinder diam':[CylinderDFF,CylinderDVol]} 871 872 Shape = data['Size']['Shape'][0] 872 873 Parms = data['Size']['Shape'][1:] … … 933 934 'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol], 934 935 'Unified rod':[UniRodFF,UniRodVol],'Unified rod AR':[UniRodARFF,UniRodARVol], 935 'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol]} 936 'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol], 937 'Unified tube':[UniTubeFF,UniTubeVol],'Cylinder diam':[CylinderDFF,CylinderDVol]} 936 938 # pdb.set_trace() 937 939 partData = sasdData['Particle'] … … 970 972 Dist.append(dist) 971 973 sasdData['Size Calc'] = [Rbins,Dist] 972 return Rbins,Dist973 974 974 975 def MakeDiamDist(DistName,nPoints,cutoff,parmDict):
Note: See TracChangeset
for help on using the changeset viewer.