Changeset 2582


Ignore:
Timestamp:
Dec 15, 2016 9:12:10 AM (5 years ago)
Author:
vondreele
Message:

fix issue with Make PDF & 11BM data - 'formula' found but not expected format
add Flat Bkg correction to PDF Controls - very useful for suppressing G(0) peak

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2581 r2582  
    34813481                    ElList = {}
    34823482                    for item in Comments:           #grab chemical formula from Comments
    3483                         if 'formula' in item:
     3483                        if 'formula' in item[:15].lower():
    34843484                            formula = item.split('=')[1].split()
    34853485                            elems = formula[::2]
  • trunk/GSASIIpwd.py

    r2567 r2582  
    299299                data['Container Bkg.']['Add'])*data['Container Bkg.']['Mult']
    300300        IofQ[1][1] += xycontainer[Ibeg:Ifin]
     301    IofQ[1][1] -= data.get('Flat Bkg',0.)
    301302    #get element data & absorption coeff.
    302303    ElList = data['ElList']
  • trunk/GSASIIpwdGUI.py

    r2581 r2582  
    46024602    if 'Rmax' not in data:
    46034603        data['Rmax'] = 100.
     4604    if 'Flat Bkg' not in data:
     4605        data['Flat Bkg'] = 0.
    46044606   
    46054607    def FillFileSizer(fileSizer,key):
     
    49554957       
    49564958    G2G.HorizontalLine(mainSizer,G2frame.dataDisplay)
    4957     mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' S(Q)->F(Q)->G(R) controls: '),0,WACV)
     4959    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' S(Q)->F(Q)->G(R) controls: '),0,WACV)
    49584960    mainSizer.Add((5,5),0)
    49594961    sqBox = wx.BoxSizer(wx.HORIZONTAL)
     
    49694971            typeHint=float,OnLeave=AfterChangeNoRefresh)
    49704972        sqBox.Add(obliqCoeff,0)
     4973    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Flat Bkg.: '),0,WACV)
     4974    flatBkg = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'Flat Bkg',nDig=(10,0),
     4975            typeHint=float,OnLeave=AfterChangeNoRefresh)
     4976    sqBox.Add(flatBkg,0)   
    49714977    mainSizer.Add(sqBox,0)
    49724978       
Note: See TracChangeset for help on using the changeset viewer.