Changeset 1273 for trunk/GSASIIsasd.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIsasd.py

    r1272 r1273  
    167167    '''
    168168    AR = args[0]
    169     return UniRodFF(Q,R,args=[AR*R,])
     169    return UniRodFF(Q,R,args=[2.*AR*R,])
    170170   
    171171def UniDiskFF(Q,R,args):
     
    313313    returns float: volume (A^3) of tube wall
    314314    '''
    315     L,T = arg[:2]
     315    L,T = args[:2]
    316316    return CylinderVol(R,[L,])-CylinderVol(R-T,[L,])
    317317   
     
    868868        'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol],
    869869        '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]}
    871872    Shape = data['Size']['Shape'][0]
    872873    Parms = data['Size']['Shape'][1:]
     
    933934        'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol],
    934935        '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]}
    936938#    pdb.set_trace()
    937939    partData = sasdData['Particle']
     
    970972        Dist.append(dist)
    971973    sasdData['Size Calc'] = [Rbins,Dist]
    972     return Rbins,Dist
    973974   
    974975def MakeDiamDist(DistName,nPoints,cutoff,parmDict):
Note: See TracChangeset for help on using the changeset viewer.