Changeset 2787


Ignore:
Timestamp:
Apr 17, 2017 9:29:27 AM (5 years ago)
Author:
vondreele
Message:

recover code removed in error from MakeDiamDist? in GSASIIsasd.py v#2546 Nov 22, 2016!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIsasd.py

    r2755 r2787  
    13901390        distFxn = 'LogNormalDist'
    13911391        cumeFxn = 'LogNormalCume'
     1392        pos = distDict['MinSize']
     1393        args = [distDict['Mean'],distDict['StdDev']]
     1394        step = 4.*np.sqrt(np.exp(distDict['StdDev']**2)*(np.exp(distDict['StdDev']**2)-1.))
     1395        mode = distDict['MinSize']+distDict['Mean']/np.exp(distDict['StdDev']**2)
     1396        minX = 1. #pos
     1397        maxX = 1.e4 #np.min([mode+nPoints*step*40,1.e5])
    13921398    elif 'Gauss' in DistName:
    13931399        distFxn = 'GaussDist'
    13941400        cumeFxn = 'GaussCume'
     1401        pos = distDict['Mean']
     1402        args = [distDict['StdDev']]
     1403        step = 0.02*distDict['StdDev']
     1404        mode = distDict['Mean']
     1405        minX = np.max([mode-4.*distDict['StdDev'],1.])
     1406        maxX = np.min([mode+4.*distDict['StdDev'],1.e5])
    13951407    elif 'LSW' in DistName:
    13961408        distFxn = 'LSWDist'
    13971409        cumeFxn = 'LSWCume'
     1410        pos = distDict['Mean']
     1411        args = []
     1412        minX,maxX = [0.,2.*pos]
    13981413    elif 'Schulz' in DistName:
    13991414        distFxn = 'SchulzZimmDist'
    14001415        cumeFxn = 'SchulzZimmCume'
     1416        pos = distDict['Mean']
     1417        args = [distDict['StdDev']]
     1418        minX = np.max([1.,pos-4.*distDict['StdDev']])
     1419        maxX = np.min([pos+4.*distDict['StdDev'],1.e5])
    14011420    nP = 500
    14021421    Diam = np.logspace(0.,5.,nP,True)
Note: See TracChangeset for help on using the changeset viewer.