Changeset 4065

Timestamp:

Jul 17, 2019 11:48:22 AM (4 years ago)

Author:

vondreele

Message:

background plotting stuff (incomplete)

Location:

trunk

Files:

• GSASIIplot.py (modified) (5 diffs)
• GSASIIpwdGUI.py (modified) (9 diffs)

trunk/GSASIIplot.py

@@ -1846 +1846 @@
         elif event.key == 'b':
             G2frame.SubBack = not G2frame.SubBack
-            if not G2frame.SubBack:
-                G2frame.SinglePlot = True                
+#            if not G2frame.SubBack:
+#                G2frame.SinglePlot = True                
         elif event.key == 'n':
             if G2frame.Contour:
@@ -2811 +2811 @@
     DifLine = ['']
     if G2frame.Contour:
-        Page.Choice = (' key press',
+        Page.Choice = (' key press','b: toggle subtract background',
             'd: lower contour max','u: raise contour max',
             'D: lower contour min','U: raise contour min',
@@ -2950 +2950 @@
     elif Page.plotStyle.get('WgtDiagnostic',False):
         Title = 'Scaling diagnostic for '+Title
+    if G2frame.SubBack:
+        Title += ' - background'
     if Page.plotStyle['qPlot'] or plottype in ['SASD','REFD'] and not G2frame.Contour:
         xLabel = r'$Q, \AA^{-1}$'
@@ -3087 +3089 @@
             multArray = ma.getdata(multArray)
         if 'PWDR' in plottype:
+            YI = xye[1]
+            if G2frame.SubBack:
+                YI -= xye[5]
             if Page.plotStyle['sqrtPlot']:
                 olderr = np.seterr(invalid='ignore') #get around sqrt(-ve) error
-                Y = np.where(xye[1]>=0.,np.sqrt(xye[1]),-np.sqrt(-xye[1]))+NoffY*Ymax/100.0
+                Y = np.where(YI>=0.,np.sqrt(YI),-np.sqrt(-YI))+NoffY*Ymax/100.0
                 np.seterr(invalid=olderr['invalid'])
             elif Page.plotStyle.get('WgtDiagnostic',False):
                 Y = xye[1]*xye[2]
-            elif 'PWDR' in plottype and G2frame.SinglePlot and not (
-                Page.plotStyle['logPlot'] or Page.plotStyle['sqrtPlot'] or G2frame.Contour):
-                Y = xye[1]*multArray+NoffY*Ymax/100.0
+            elif 'PWDR' in plottype and G2frame.SinglePlot and not \
+                (Page.plotStyle['logPlot'] or Page.plotStyle['sqrtPlot'] or G2frame.Contour):
+                Y = YI*multArray+NoffY*Ymax/100.0
             else:
-                Y = xye[1]+NoffY*Ymax/100.0
+                Y = YI+NoffY*Ymax/100.0
         elif plottype in ['SASD','REFD']:
             if plottype == 'SASD':
@@ -3123 +3128 @@
             if lenX == len(X):
                 ContourY.append(N)
-                ContourZ.append(Y)
+                if G2frame.SubBack:
+                    ContourZ.append(Y)
+                else:
+                    ContourZ.append(Y)
                 if 'C' in ParmList[0]['Type'][0]:        
                     ContourX = X

trunk/GSASIIpwdGUI.py

@@ -1195 +1195 @@
             G2frame.GPXtree.SetItemPyData(
                 G2gd.GetGPXtreeItemId(G2frame,Id,'Background'),copy.deepcopy(data))
+            CalcBack(Id)
             
     def OnBackSave(event):
@@ -1254 +1255 @@
         finally:
             dlg.Destroy()
+        CalcBack(G2frame.PatternId)
         G2plt.PlotPatterns(G2frame,plotType='PWDR')
         wx.CallLater(100,UpdateBackground,G2frame,newback)
@@ -1409 +1411 @@
         def AfterChange(invalid,value,tc):
             if invalid: return
-            CalcBack()
+            CalcBack(G2frame.PatternId)
             G2plt.PlotPatterns(G2frame,plotType='PWDR')
             
@@ -1454 +1456 @@
                     del(data[1]['debyeTerms'][-1])
             if N == 0:
-                CalcBack()
+                CalcBack(G2frame.PatternId)
                 G2plt.PlotPatterns(G2frame,plotType='PWDR')                
             wx.CallAfter(UpdateBackground,G2frame,data)
@@ -1477 +1479 @@
         
         def OnCellChange(event):
-            CalcBack()
+            CalcBack(G2frame.PatternId)
             G2plt.PlotPatterns(G2frame,plotType='PWDR')                
 
@@ -1520 +1522 @@
                     del(data[1]['peaksList'][-1])
             if N == 0:
-                CalcBack()
+                CalcBack(G2frame.PatternId)
                 G2plt.PlotPatterns(G2frame,plotType='PWDR')                
             wx.CallAfter(UpdateBackground,G2frame,data)
@@ -1543 +1545 @@
                             
         def OnCellChange(event):
-            CalcBack()
+            CalcBack(G2frame.PatternId)
             G2plt.PlotPatterns(G2frame,plotType='PWDR')                
 
@@ -1619 +1621 @@
         return fileSizer
     
-    def CalcBack():
-            PatternId = G2frame.PatternId
+    def CalcBack(PatternId=G2frame.PatternId):
             limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits'))[1]
             inst,inst2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters'))
+            backData = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Background'))
             dataType = inst['Type'][0]
             insDict = {inskey:inst[inskey][1] for inskey in inst}
@@ -1629 +1631 @@
             parmDict.update(bakDict)
             parmDict.update(insDict)
-            limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits'))[1]
-            pwddata = G2frame.GPXtree.GetItemPyData(PatternId)[1]
-            xBeg = np.searchsorted(pwddata[0],limits[0])
-            xFin = np.searchsorted(pwddata[0],limits[1])
-            fixBack = data[1]['background PWDR']
-            Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,data[1]['background PWDR'][0])
+            pwddata = G2frame.GPXtree.GetItemPyData(PatternId)
+            xBeg = np.searchsorted(pwddata[1][0],limits[0])
+            xFin = np.searchsorted(pwddata[1][0],limits[1])
+            fixBack = backData[1]['background PWDR']
+            Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,fixBack[0])
             fixData = G2frame.GPXtree.GetItemPyData(Id)
             fixedBkg = {'_fixedVary':False,'_fixedMult':fixBack[1],'_fixedValues':fixData[1][1][xBeg:xFin]} 
             try:    #typically bad grid value
-                pwddata[4][xBeg:xFin] = G2pwd.getBackground('',parmDict,bakType,dataType,pwddata[0][xBeg:xFin],fixedBkg)[0]
+                pwddata[1][4][xBeg:xFin] = G2pwd.getBackground('',parmDict,bakType,dataType,pwddata[1][0][xBeg:xFin],fixedBkg)[0]
             except:
                 pass