Changeset 2660 for trunk/GSASIIpwd.py


Ignore:
Timestamp:
Jan 25, 2017 4:06:39 PM (5 years ago)
Author:
vondreele
Message:

fix issues with new pdf creation & fully trap missing elements problem
progress on pdf peak display, selection & limit changes
remove Add from background, dark & container PDF stuff

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r2659 r2660  
    295295    IofQ[1] = np.array(IofQ[1])[:,Ibeg:Ifin]
    296296    if data['Sample Bkg.']['Name']:
    297         IofQ[1][1] += (xydata['Sample Bkg.'][1][1][Ibeg:Ifin]+
    298             data['Sample Bkg.']['Add'])*data['Sample Bkg.']['Mult']
     297        IofQ[1][1] += xydata['Sample Bkg.'][1][1][Ibeg:Ifin]*data['Sample Bkg.']['Mult']
    299298    if data['Container']['Name']:
    300         xycontainer = (xydata['Container'][1][1]+data['Container']['Add'])*data['Container']['Mult']
     299        xycontainer = xydata['Container'][1][1]*data['Container']['Mult']
    301300        if data['Container Bkg.']['Name']:
    302             xycontainer += (xydata['Container Bkg.'][1][1][Ibeg:Ifin]+
    303                 data['Container Bkg.']['Add'])*data['Container Bkg.']['Mult']
     301            xycontainer += xydata['Container Bkg.'][1][1][Ibeg:Ifin]*data['Container Bkg.']['Mult']
    304302        IofQ[1][1] += xycontainer[Ibeg:Ifin]
    305     data['IofQmin'] = IofQ[1][1][Ifin-1]
     303    data['IofQmin'] = IofQ[1][1][-1]
    306304    IofQ[1][1] -= data.get('Flat Bkg',0.)
    307305    #get element data & absorption coeff.
Note: See TracChangeset for help on using the changeset viewer.