Ignore:
Timestamp:
Sep 21, 2017 2:42:50 PM (4 years ago)
Author:
vondreele
Message:

add new confit parm: Show_timing
enable editing of the Use column in seq results table; doesn't seem to affect plot tho.
always print Found SVD zeros in seq refinement as well
add local directory to path for finding fit equation functions
add a pretranslate vector to atom transformations - still needs work tho.
couple of TODOs in G2strMain for fix parameters in seq refinements
change 'debug' to 'Show_timing' in G2strMath

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMath.py

    r3093 r3095  
    29292929    Multiprocessing support added
    29302930    '''
    2931     if GSASIIpath.GetConfigValue('debug'):
     2931    if GSASIIpath.GetConfigValue('Show_timing',False):
    29322932        starttime = time.time() #; print 'start GetFobsSq'
    29332933    histoList = Histograms.keys()
     
    30603060            Histogram = Histograms[histogram]
    30613061            Histogram['Residuals']['hId'] = Histograms[histogram]['hId']
    3062     if GSASIIpath.GetConfigValue('debug'):
     3062    if GSASIIpath.GetConfigValue('Show_timing',False):
    30633063        print 'GetFobsSq t=',time.time()-starttime
    30643064               
    30653065def getPowderProfile(parmDict,x,varylist,Histogram,Phases,calcControls,pawleyLookup):
    30663066    'Computes the powder pattern for a histogram based on contributions from all used phases'
    3067     if GSASIIpath.GetConfigValue('debug'): starttime = time.time()
     3067    if GSASIIpath.GetConfigValue('Show_timing',False): starttime = time.time()
    30683068   
    30693069    def GetReflSigGamCW(refl,im,wave,G,GB,phfx,calcControls,parmDict):
     
    32483248    if badPeak:
    32493249        print 'ouch #4 bad profile coefficients yield negative peak width; some reflections skipped'
    3250     if GSASIIpath.GetConfigValue('debug'):
     3250    if GSASIIpath.GetConfigValue('Show_timing',False):
    32513251        print 'getPowderProfile t=',time.time()-starttime
    32523252    return yc,yb
     
    41324132            xF = np.searchsorted(x,Limits[1])+1
    41334133            useMP,ncores = G2mp.InitMP()
    4134             if GSASIIpath.GetConfigValue('debug'): starttime = time.time()
     4134            if GSASIIpath.GetConfigValue('Show_timing',False): starttime = time.time()
    41354135            if useMP:
    41364136                MPpool = mp.Pool(ncores)
     
    41534153                #    varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars)
    41544154            G2mv.Dict2Deriv(varylist,depDerivDict,dMdvh)
    4155             if GSASIIpath.GetConfigValue('debug'): print 'getPowderProfileDerv t=',time.time()-starttime
     4155            if GSASIIpath.GetConfigValue('Show_timing',False): print 'getPowderProfileDerv t=',time.time()-starttime
    41564156            Wt = ma.sqrt(W[xB:xF])[nxs,:]
    41574157            Dy = dy[xB:xF][nxs,:]
Note: See TracChangeset for help on using the changeset viewer.