Changeset 2960 for branch/2frame/GSASIIpwdGUI.py

Timestamp:

Aug 2, 2017 9:30:14 AM (8 years ago)

Author:

vondreele

Message:

remove spaces from Instprm GUI display & check & correct special wavelengths (add 1 place the Ka mean values).

File:

• branch/2frame/GSASIIpwdGUI.py (modified) (10 diffs)

branch/2frame/GSASIIpwdGUI.py ¶

@@ -1666 +1666 @@
     def MakeParameterWindow():
         'Displays the Instrument parameters in the dataWindow frame'
-        #G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Instrument Parameters')
         G2frame.SetTitle('Instrument Parameters')
         G2frame.dataWindow.ClearData()
         mainSizer = G2frame.dataWindow.GetSizer()
-        #instSizer = wx.FlexGridSizer(0,6,5,5)
         instSizer = wx.FlexGridSizer(0,3,5,5)
         subSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -1704 +1702 @@
                     subSizer.Add(waveSizer,0)
                     mainSizer.Add(subSizer)
-                    instSizer.Add(wx.StaticText(
-                        G2frame.dataWindow,-1,
-                        lblWdef('I(L2)/I(L1)',4,insDef['I(L2)/I(L1)'])),
-                        0,WACV)
+                    instSizer.Add(wx.StaticText(G2frame.dataWindow,-1,lblWdef('I(L2)/I(L1)',4,insDef['I(L2)/I(L1)'])),0,WACV)
                     key = 'I(L2)/I(L1)'
                     labelLst.append(key)
@@ -1716 +1711 @@
                     instSizer.Add(ratVal,0)
                     instSizer.Add(RefineBox(key),0,WACV)
-                    [instSizer.Add((5,5),0) for i in range(3)]
                 else: # single wavelength
                     instSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Azimuth: '),0,WACV)
@@ -1723 +1717 @@
                     instSizer.Add((5,5),0)
                     key = 'Lam'
-                    instSizer.Add(wx.StaticText(G2frame.dataWindow,-1,u' Lam (\xc5): (%10.6f)'%(insDef[key])),
-                        0,WACV)
+                    instSizer.Add(wx.StaticText(G2frame.dataWindow,-1,u' Lam (\xc5): (%10.6f)'%(insDef[key])),0,WACV)
                     waveVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,insVal,key,nDig=(10,6),typeHint=float,OnLeave=AfterChange)
                     labelLst.append(u'Lam (\xc5)')
@@ -1732 +1725 @@
                     refFlgElem.append([key,2])                   
                     instSizer.Add(RefineBox(key),0,WACV)
-#                    if ifHisto:
-#                        refFlgElem.append([key,2])                   
-#                        instSizer.Add(RefineBox(key),0,WACV)
-#                    else:
-#                        refFlgElem.append(None)                   
-#                        instSizer.Add((5,5),0)
                 for item in ['Zero','Polariz.']:
                     if item in insDef:
@@ -1743 +1730 @@
                         elemKeysLst.append([item,1])
                         dspLst.append([10,4])
-                        instSizer.Add(
-                            wx.StaticText(G2frame.dataWindow,-1,lblWdef(item,4,insDef[item])),
-                            0,WACV)
+                        instSizer.Add(wx.StaticText(G2frame.dataWindow,-1,lblWdef(item,4,insDef[item])),0,WACV)
                         itemVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,insVal,item,nDig=(10,4),typeHint=float,OnLeave=AfterChange)
                         instSizer.Add(itemVal,0,WACV)
                         refFlgElem.append([item,2])
                         instSizer.Add(RefineBox(item),0,WACV)
-#                        if ifHisto:
-#                            refFlgElem.append([item,2])
-#                            instSizer.Add(RefineBox(item),0,WACV)
-#                        else:
-#                            refFlgElem.append(None)                   
-#                            instSizer.Add((5,5),0)
-                    else:                           #skip Polariz. for neutrons
-                        [instSizer.Add((5,5),0) for i in range(3)]
-                for item in ['','U','V','W','','X','Y','','SH/L']:
-                    if item == '':
-                        [instSizer.Add((5,5),0) for i in range(3)]
-                        continue
+                for item in ['U','V','W','X','Y','SH/L']:
                     nDig = (10,3)
                     if item == 'SH/L':
@@ -1769 +1743 @@
                     dspLst.append(nDig)
                     refFlgElem.append([item,2])
-                    instSizer.Add(
-                        wx.StaticText(G2frame.dataWindow,-1,lblWdef(item,nDig[1],insDef[item])),
-                        0,WACV)
+                    instSizer.Add(wx.StaticText(G2frame.dataWindow,-1,lblWdef(item,nDig[1],insDef[item])),0,WACV)
                     itemVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,insVal,item,nDig=nDig,typeHint=float,OnLeave=AfterChange)
                     instSizer.Add(itemVal,0,WACV)
@@ -1835 +1807 @@
                 instSizer.Add(waveVal,0,WACV)
                 refFlgElem.append([key,2])                   
-#                    instSizer.Add(RefineBox(key),0,WACV)
                 for item in ['Zero',]:
                     if item in insDef:
@@ -1847 +1818 @@
                         instSizer.Add(itemVal,0,WACV)
                         refFlgElem.append([item,2])
-#                        instSizer.Add(RefineBox(item),0,WACV)
-                
                 
         elif 'S' in insVal['Type']:                       #single crystal data
@@ -1925 +1894 @@
         insRef = {}
     RefObj = {}
+    #These from Intl. Tables C, Table 4.2.2.1, p. 177-179
     waves = {'CuKa':[1.54051,1.54433],'TiKa':[2.74841,2.75207],'CrKa':[2.28962,2.29351],
         'FeKa':[1.93597,1.93991],'CoKa':[1.78892,1.79278],'MoKa':[0.70926,0.713543],
         'AgKa':[0.559363,0.563775]}
-    meanwaves = {'CuKa':1.5418,'TiKa':2.7496,'CrKa':2.2909,'FeKa':1.9373,
-        'CoKa':1.7902,'MoKa':0.7107,'AgKa':0.5608}
+    # meanwaves computed as (2*Ka1+Ka2)/3
+    meanwaves = {'CuKa':1.54178,'TiKa':2.74963,'CrKa':2.29092,'FeKa':1.93728,
+        'CoKa':1.79021,'MoKa':0.71069,'AgKa':0.56083}
     Inst2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
             G2frame.PatternId,'Instrument Parameters'))[1]