Changeset 4072 for trunk/GSASIIsasd.py


Ignore:
Timestamp:
Jul 26, 2019 8:37:07 AM (2 years ago)
Author:
vondreele
Message:

fix a missing G2frame.PickId? problem in G2imgGUI
fix SAS plotting issues with background subtraction
fix SAS errors in Spheroid, Schulz & Gauss models
fix of fxye export for TOF data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIsasd.py

    r3136 r4072  
    9191    else:
    9292        cth = np.linspace(0,1.,NP)
    93         Rct = R[:,np.newaxis]*np.sqrt(1.+(AR**2-1.)*cth**2)
     93        try:
     94            Rct = R[:,np.newaxis]*np.sqrt(1.+(AR**2-1.)*cth**2)
     95        except:
     96            Rct = R*np.sqrt(1.+(AR**2-1.)*cth**2)
    9497        return np.sqrt(np.sum(SphereFF(Q[:,np.newaxis],Rct,0)**2,axis=2)/NP)
    9598           
     
    14031406        pos = distDict['Mean']
    14041407        args = [distDict['StdDev']]
    1405         step = 0.02*distDict['StdDev']
    14061408        mode = distDict['Mean']
    1407         minX = np.fmax([mode-4.*distDict['StdDev'],1.])
    1408         maxX = np.fmin([mode+4.*distDict['StdDev'],1.e5])
     1409        minX = np.max([mode-4.*distDict['StdDev'],1.])
     1410        maxX = np.min([mode+4.*distDict['StdDev'],1.e5])
    14091411    elif 'LSW' in DistName:
    14101412        distFxn = 'LSWDist'
     
    14181420        pos = distDict['Mean']
    14191421        args = [distDict['StdDev']]
    1420         minX = np.fmax([1.,pos-4.*distDict['StdDev']])
    1421         maxX = np.fmin([pos+4.*distDict['StdDev'],1.e5])
     1422        minX = np.max([1.,pos-4.*distDict['StdDev']])
     1423        maxX = np.min([pos+4.*distDict['StdDev'],1.e5])
    14221424    nP = 500
    14231425    Diam = np.logspace(0.,5.,nP,True)
Note: See TracChangeset for help on using the changeset viewer.