More fixes to calibration stuff

Author: vondreele

GSASII/GSASIIplot.py

@@ -3461,8 +3461,8 @@ def OnKeyPress(event):
         if len(peaks):
             if G2frame.ErrorBars:
                 if Parms['Type'][0][2] in ['A','B']:
-                    Plot.errorbar(Xp,Ap,xerr=sQp,yerr=sAp,fmt='r+',capsize=2,label=r'$\alpha/1000$ peak')
-                    Plot.errorbar(Xp,Bp,xerr=sQp,yerr=sBp,fmt='+',color='orange',capsize=2,label=r'$\beta/1000$ peak')
+                    Plot.errorbar(Xp,Ap,xerr=sXp,yerr=sAp,fmt='r+',capsize=2,label=r'$\alpha/1000$ peak')
+                    Plot.errorbar(Xp,Bp,xerr=sXp,yerr=sBp,fmt='+',color='orange',capsize=2,label=r'$\beta/1000$ peak')
                 Plot.errorbar(Xp,Yp,xerr=sXp,yerr=sYp,fmt='r+',capsize=2,label='G peak')
                 Plot.errorbar(Xp,Zp,xerr=sXp,yerr=sZp,fmt='g+',capsize=2,label='L peak')                                
             else:

GSASII/GSASIIpwd.py

@@ -2435,7 +2435,7 @@ def errPeakBet(values,peakDsp,peakBet,peakWt,dataType,parmDict,varyList):
         parmDict.update(dict(zip(varyList,values)))
         if dataType[2] in ['A','B']:
             calcPos = G2lat.getPeakPos(dataType,parmDict,peakDsp)
-            calcBet = parmDict['beta-0']+ parmDict['beat-1']*npsind(calcPos/2.)
+            calcBet = parmDict['beta-0']+ parmDict['beta-1']*npsind(calcPos/2.)
         else: #'T'
             calcBet = parmDict['beta-0']+parmDict['beta-1']/peakDsp**4+parmDict['beta-q']/peakDsp**2
         return peakWt*(calcBet-peakBet)

GSASII/GSASIIpwdGUI.py

@@ -2579,6 +2579,7 @@ def OnCalibrate(event):
             return
         if G2pwd.DoCalibInst(IndexPeaks,fitPeaks,data,Sample):
             UpdateInstrumentGrid(G2frame,data)
+            G2plt.PlotPeakWidths(G2frame)
         else:
             G2frame.ErrorDialog('Cannot calibrate','Nothing selected for refinement or refinement failed')
         const = 0.0