remove extra columns from reflist from extended microED when merge.

Author: vondreele

GSASII/GSASIIdataGUI.py

@@ -8223,11 +8223,14 @@ def OnMergeHKL(event):
         dlg = wx.ProgressDialog('Build HKL dictonary','',len(refList)+1,
             style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
         HKLdict = {}
+        lenhkl = len(refList[0])
+        if lenhkl == 14+Super:  #remove extra columns from extended microED data
+            lenhkl -= 2
         for ih,hkl in enumerate(refList):
             if str(hkl[:3+Super]) not in HKLdict:
-                HKLdict[str(hkl[:3+Super])] = [hkl[:3+Super],[hkl[3+Super:],]]
+                HKLdict[str(hkl[:3+Super])] = [hkl[:3+Super],[hkl[3+Super:lenhkl],]]
             else:
-                HKLdict[str(hkl[:3+Super])][1].append(hkl[3+Super:])
+                HKLdict[str(hkl[:3+Super])][1].append(hkl[3+Super:lenhkl])
             dlg.Update(ih)
         dlg.Destroy()
         mergeRef = []

GSASII/GSASIIstrMath.py

@@ -2745,7 +2745,7 @@ def SCExtinction(ref,im,phfx,hfx,pfx,calcControls,parmDict,varyList):
         PA = np.exp(-parmDict[phfx+'Ma']*FPone)
         PB = np.exp(-parmDict[phfx+'Mb']*FPone**2)
         PC = np.exp(-parmDict[phfx+'Mc']*FPone**3)
-        extCor = (PA+ + PB + PC)/3.            
+        extCor = (PA + PB + PC)/3.            
         dervDict[phfx+'Ma'] = -4.*PA*FPone**2
         dervDict[phfx+'Mb'] = -PB*FPone**4
         dervDict[phfx+'Mc'] = -PC*FPone**6