Changeset 4072 for trunk/GSASIIsasd.py
 Timestamp:
 Jul 26, 2019 8:37:07 AM (2 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIsasd.py
r3136 r4072 91 91 else: 92 92 cth = np.linspace(0,1.,NP) 93 Rct = R[:,np.newaxis]*np.sqrt(1.+(AR**21.)*cth**2) 93 try: 94 Rct = R[:,np.newaxis]*np.sqrt(1.+(AR**21.)*cth**2) 95 except: 96 Rct = R*np.sqrt(1.+(AR**21.)*cth**2) 94 97 return np.sqrt(np.sum(SphereFF(Q[:,np.newaxis],Rct,0)**2,axis=2)/NP) 95 98 … … 1403 1406 pos = distDict['Mean'] 1404 1407 args = [distDict['StdDev']] 1405 step = 0.02*distDict['StdDev']1406 1408 mode = distDict['Mean'] 1407 minX = np. fmax([mode4.*distDict['StdDev'],1.])1408 maxX = np. fmin([mode+4.*distDict['StdDev'],1.e5])1409 minX = np.max([mode4.*distDict['StdDev'],1.]) 1410 maxX = np.min([mode+4.*distDict['StdDev'],1.e5]) 1409 1411 elif 'LSW' in DistName: 1410 1412 distFxn = 'LSWDist' … … 1418 1420 pos = distDict['Mean'] 1419 1421 args = [distDict['StdDev']] 1420 minX = np. fmax([1.,pos4.*distDict['StdDev']])1421 maxX = np. fmin([pos+4.*distDict['StdDev'],1.e5])1422 minX = np.max([1.,pos4.*distDict['StdDev']]) 1423 maxX = np.min([pos+4.*distDict['StdDev'],1.e5]) 1422 1424 nP = 500 1423 1425 Diam = np.logspace(0.,5.,nP,True)
Note: See TracChangeset
for help on using the changeset viewer.