bring kvec branch up to date

Merge remote-tracking branch 'origin/main' into kvec_isodistort_zyp

Author: briantoby

GSASII/GSASIIplot.py

@@ -290,16 +290,10 @@ def SetToolTipString(self,text):
             self.canvas.SetToolTipString(text)
 
     def ToolBarDraw(self):
-        mplv = eval(mpl.__version__.replace('.',','))
-        if mplv[0] >= 3 and mplv[1] >= 3:
+        try:
             self.toolbar.canvas.draw_idle()
-        else:
+        except: # patch: used for MLP <3.3
             self.toolbar.draw()
-        # mplv = eval(mpl.__version__.replace('.',','))
-        # if mplv[0] >= 3 and mplv[1] >= 3:
-        #     self.toolbar.draw_idle()
-        # else:
-        #     self.toolbar.draw()
 
 class G2PlotNoteBook(wx.Panel):
     'create a tabbed panel to hold a GSAS-II graphics window'

GSASII/GSASIIstrMath.py

@@ -3502,7 +3502,6 @@ def GetReflPosDerv(refl,im,wave,A,pfx,hfx,phfx,calcControls,parmDict):
 def GetHStrainShift(refl,im,SGData,phfx,hfx,calcControls,parmDict):
     '''Computes the shifts in peak position due to the Hydrostatic strain
     (HStrain, Dij terms).
-    This routine is not used anywhere
     '''
     laue = SGData['SGLaue']
     uniq = SGData['SGUniq']
@@ -4034,7 +4033,7 @@ def SavePartial(phase,y):
                 Uniq = np.inner(refl[:3],SGMT)
                 refl[5+im] = GetReflPos(refl,im,0.0,A,pfx,hfx,phfx,calcControls,parmDict)         #corrected reflection position - #TODO - what about tabluated offset?
                 Lorenz = sind(abs(parmDict[hfx+'2-theta'])/2)*refl[4+im]**4                                                #TOF Lorentz correction
-#                refl[5+im] += GetHStrainShift(refl,im,SGData,phfx,hfx,calcControls,parmDict)               #apply hydrostatic strain shift
+                refl[5+im] += GetHStrainShift(refl,im,SGData,phfx,hfx,calcControls,parmDict)               #apply hydrostatic strain shift
                 refl[6+im:8+im] = GetReflSigGamTOF(refl,im,G,GB,phfx,calcControls,parmDict)    #peak sig & gam
                 refl[12+im:14+im] = GetReflAlpBet(refl,im,hfx,parmDict)             #TODO - skip if alp, bet tabulated?
                 refl[11+im],refl[15+im],refl[16+im],refl[17+im] = GetIntensityCorr(refl,im,Uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict)

LICENSE

@@ -32,15 +32,11 @@ that the following conditions are met:
 Also note that GSAS-II is normally distributed with the following
 included software:
 
-pybaselines: for license see GSASII/pybaselines/LICENSE.txt and
-	GSASII/pybaselines/LICENSES_bundled.txt.
-
 NIST_profile (Fundamental Parameters Python Code): U.S. Government work,
         not subject to copyright
 
-PDFfit2: see PDFfit2/LICENSE.txt for license.
-
-DIFFaX: Not copyrighted; Distributed with direct permission of M. Treacy
+DIFFaX: Not copyrighted; Distributed with direct permission of
+        author (M. Treacy)
 
 NIST*LATTICE: U.S. Government work, not subject to copyright