change to fo-fc vs fo for extinction check plot

remove (commented out) microED small F extinction correction - didn't help

Author: vondreele

GSASII/GSASIIdataGUI.py

@@ -8199,13 +8199,14 @@ def OnErrorAnalysis(event):
         '''Plots an "Abrams" plot - sorted delta/sig across data set.
         Should be straight line of slope 1 - never is'''
         def OnPlotFoFcVsFc(kind):
-            ''' Extinction check, plots Fo-Fc & 1/ExtC vs Fc for single crystal data '''
-            iFo,iFc,iExt = 8,9,11
+            ''' Extinction check, plots Fo-Fc & 1/ExtC vs Fo for single crystal data '''
+            iFo,iFc,iExt = 5,7,11
             refList = data[1]['RefList']
-            XY = np.array([xy[iFo+Super:1+iFc+Super] for xy in refList if xy[3+Super]>0])
-            XE = np.array([[np.sqrt(xy[iFc+Super]),1./xy[iExt+Super]] for xy in refList if xy[3+Super]>0]).T
+            XY = np.array([[xy[iFo+Super],xy[iFo+Super]-xy[iFc+Super]] for xy in refList if xy[3+Super]>0])
             XY = np.sqrt(np.abs(XY)).T
-            G2plt.PlotXY(G2frame,[[XY[1],XY[0]-XY[1]],],XY2=[XE,],labelX='|Fc|',labelY='|Fo|-|Fc|, 1/ExtC',newPlot=False,
+            XE = [[xy[iFo+Super],xy[iExt+Super]] for xy in refList if xy[3+Super]>0]
+            XE = np.array([[np.sqrt(xe[0]),1./xe[1]] for xe in XE]).T
+            G2plt.PlotXY(G2frame,[[XY[0],XY[0]-XY[1]],],XY2=[XE,],labelX='|Fo|',labelY='|Fo|-|Fc|, 1/ExtC',newPlot=False,
                Title='Extinction check',lines=False,points2=True,names=['|Fo|-|Fc|',],names2=['1/ExtC',])
         G2plt.PlotDeltSig(G2frame,kind)
         if kind in ['HKLF',]:

GSASII/GSASIIddataGUI.py

@@ -631,11 +631,11 @@ def ExtVal(Ekey,valSizer,fmt,lim):
                 else:
                     Ekey = ['Eg','Es']
                 extSizer.Add(ExtVal(Ekey,val2Sizer,'g',[0.,100.]),0)
-                extSizer.Add(wx.StaticText(DData,label=' Small F dynamical scattering correction:'))
-                val3Sizer =wx.BoxSizer(wx.HORIZONTAL)
-                if 'Primary' in UseList[G2frame.hist]['Extinction'][1]:
-                    Ekey = ['Ma','Mb',]
-                    extSizer.Add(ExtVal(Ekey,val3Sizer,'f',[-1.,10.]),0,)
+                # extSizer.Add(wx.StaticText(DData,label=' Small F dynamical scattering correction:'))
+                # val3Sizer =wx.BoxSizer(wx.HORIZONTAL)
+                # if 'Primary' in UseList[G2frame.hist]['Extinction'][1]:
+                #     Ekey = ['Ma','Mb',]
+                #     extSizer.Add(ExtVal(Ekey,val3Sizer,'f',[-1.,10.]),0,)
         else:   #PWDR
             extSizer = wx.BoxSizer(wx.HORIZONTAL)
             extRef = wx.CheckBox(DData,wx.ID_ANY,label=' Extinction: ')

GSASII/GSASIIstrMath.py

@@ -2751,7 +2751,7 @@ def SCExtinction(ref,im,phfx,hfx,pfx,calcControls,parmDict,varyList):
         DScorr = 1.0
         if 'Primary' in calcControls[phfx+'EType']:
             PLZ *= 1.5
-            DScorr = 1.+parmDict[phfx+'Ma']/ref[4+im]+parmDict[phfx+'Mb']/ref[4+im]**2
+#            DScorr = 1.+parmDict[phfx+'Ma']/ref[4+im]+parmDict[phfx+'Mb']/ref[4+im]**2
         else:
             if 'C' in parmDict[hfx+'Type']:
                 PLZ *= calcControls[phfx+'Tbar']
@@ -2790,10 +2790,10 @@ def SCExtinction(ref,im,phfx,hfx,pfx,calcControls,parmDict,varyList):
         if 'Primary' in calcControls[phfx+'EType']:
             if phfx+'Ep' in varyList:
                 dervDict[phfx+'Ep'] = -ref[7+im]*PLZ*PF3/DScorr
-            if phfx+'Ma' in varyList:
-                dervDict[phfx+'Ma'] = -extCor/ref[4+im]
-            if phfx+'Mb' in varyList:
-                dervDict[phfx+'Mb'] = -extCor/ref[4+im]**2
+            # if phfx+'Ma' in varyList:
+            #     dervDict[phfx+'Ma'] = -extCor/ref[4+im]
+            # if phfx+'Mb' in varyList:
+            #     dervDict[phfx+'Mb'] = -extCor/ref[4+im]**2
             extCor  /= DScorr
         if 'II' in calcControls[phfx+'EType'] and phfx+'Es' in varyList:
             dervDict[phfx+'Es'] = -ref[7+im]*PLZ*PF3*(PSIG/parmDict[phfx+'Es'])**3