Changeset 3906 for trunk/GSASIIpwdGUI.py

Timestamp:

Apr 16, 2019 9:39:40 PM (4 years ago)

Author:

toby

Message:

implement fixed backgound file in Riteveld Fit; show Rietveld & peak fits with bkg file added to calc bkg, not subtracted

File:

• trunk/GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIpwdGUI.py

@@ -286 +286 @@
     bxye = np.zeros(len(xye[1]))
     if 'BackFile' in Pattern[0]:
-        backfile,mult = Pattern[0]['BackFile']
+        backfile,mult = Pattern[0]['BackFile'][:2]
         if backfile:
             bId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,backfile)
@@ -1565 +1565 @@
         def OnBackPWDR(event):
             data[1]['background PWDR'][0] = back.GetValue()
+            if  data[1]['background PWDR'][0]:
+                curHist = G2frame.GPXtree.GetItemPyData(G2frame.PatternId)
+                Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,data[1]['background PWDR'][0])
+                if not Id:
+                    G2G.G2MessageBox(G2frame,'Histogram not found -- how did this happen?','Missing histogram')
+                    back.SetValue('')
+                    data[1]['background PWDR'][0] = back.GetValue()
+                    return
+                bkgHist = G2frame.GPXtree.GetItemPyData(Id)
+                if len(bkgHist[1][0]) != len(curHist[1][0]):
+                    G2G.G2MessageBox(G2frame,'Histogram have different lengths','Mismatched histograms')
+                    back.SetValue('')
+                    data[1]['background PWDR'][0] = back.GetValue()
+                    return
             G2plt.PlotPatterns(G2frame,plotType='PWDR')
         
@@ -1570 +1584 @@
         fileSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Fixed background file:'),0,WACV)
         if 'background PWDR' not in data[1]:
-            data[1]['background PWDR'] = ['',-1.]
+            data[1]['background PWDR'] = ['',-1.,False]
         backSizer = wx.BoxSizer(wx.HORIZONTAL)
         Choices = ['',]+G2gd.GetGPXtreeDataNames(G2frame,['PWDR',])