Changeset 3507


Ignore:
Timestamp:
Jul 25, 2018 11:37:43 AM (3 years ago)
Author:
svnjenkins
Message:

bug fixes: checking phase frac constraint, when histograms not in a phase; SAS plotting

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIconstrGUI.py

    r3470 r3507  
    12171217    if not histograms[hist]['Sample Parameters']['Scale'][1]:
    12181218        return
    1219     # are all phase fractions varied in all used histograms
     1219    # are all phase fractions varied in all used histograms?
    12201220    phaseCount = 0
    12211221    for p in phases:
     1222        if hist not in phases[p]['Histograms']: continue
    12221223        if phases[p]['Histograms'][hist]['Use'] and not phases[p]['Histograms'][hist]['Scale'][1]:
    12231224            return
     
    12511252    constr = []
    12521253    for p in phases:
     1254        if hist not in phases[p]['Histograms']: continue
    12531255        if not phases[p]['Histograms'][hist]['Use']: continue
    12541256        constr += [[1.0,G2obj.G2VarObj(':'.join((str(phases[p]['pId']),histStr,'Scale')))]]
  • trunk/GSASIIplot.py

    r3506 r3507  
    42654265    Plot.set_ylabel(r'$Volume distribution f(D)$',fontsize=14)
    42664266    if data['Size']['logBins']:
    4267         Plot.set_xscale("log",nonposy='mask')
     4267        Plot.set_xscale("log",nonposx='mask')
    42684268        Plot.set_xlim([np.min(2.*Bins)/2.,np.max(2.*Bins)*2.])
    42694269    Plot.bar(2.*Bins-Dbins,BinMag,2.*Dbins,facecolor='green')       #plot diameters
Note: See TracChangeset for help on using the changeset viewer.