Changeset 1880

Timestamp:

Jun 5, 2015 2:21:06 PM (7 years ago)

Author:

vondreele

Message:

fix wx bug in SetMapPeaksText? - 'GridWindow?' vs 'grid window'
add characteristic source choice to single crystal instrument parameters -
select mean Ka = (2*Ka1+Ka2)/3
change default single crystal wavelength to MoKa?

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (4 diffs)
• GSASIIstrMath.py (modified) (1 diff)
• imports/G2sfact_CIF.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -4457 +4457 @@
                 panel = G2frame.dataDisplay.GetPage(page).GetChildren()
                 names = [child.GetName() for child in panel]
-                panel[names.index('grid window')].Refresh()
+                try:
+                    panel[names.index('GridWindow')].Refresh()
+                except ValueError:  #different wx versions!
+                    panel[names.index('grid window')].Refresh()
             
     def ClearSelectedAtoms():

trunk/GSASIIpwdGUI.py

@@ -1156 +1156 @@
         else:
             G2frame.ErrorDialog('Can not calibrate','Nothing selected for refinement')
-            
 
     def OnLoad(event):
@@ -1311 +1310 @@
     def OnLamPick(event):
         data['Source'][1] = lamType = event.GetEventObject().GetValue()
-        insVal['Lam1'] = waves[lamType][0]
-        insVal['Lam2'] = waves[lamType][1]
+        if 'P' in insVal['Type']:
+            insVal['Lam1'] = waves[lamType][0]
+            insVal['Lam2'] = waves[lamType][1]
+        elif 'S' in insVal['Type'] and 'synch' not in lamType:
+            insVal['Lam'] = meanwaves[lamType]
         updateData(insVal,insRef)
         i,j= wx.__version__.split('.')[0:2]
@@ -1520 +1522 @@
                 instSizer.Add(waveVal,0,WACV)
                 labelLst.append(u'Lam (\xc5)')
+                waveSizer = wx.BoxSizer(wx.HORIZONTAL)
+                waveSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Source type: '),0,WACV)
+                # PATCH?: for now at least, Source is not saved anywhere before here
+                if 'Source' not in data: data['Source'] = ['CuKa','?']
+                choice = ['synchrotron','TiKa','CrKa','FeKa','CoKa','CuKa','MoKa','AgKa']
+                lamPick = wx.ComboBox(G2frame.dataDisplay,value=data['Source'][1],choices=choice,style=wx.CB_READONLY|wx.CB_DROPDOWN)
+                lamPick.Bind(wx.EVT_COMBOBOX, OnLamPick)
+                waveSizer.Add(lamPick,0,WACV)
+                instSizer.Add(waveSizer,0,WACV)
                 elemKeysLst.append(['Lam',1])
                 dspLst.append([10,6])
@@ -1582 +1593 @@
         '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}
     Inst2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
             G2frame.PatternId,'Instrument Parameters'))[1]        

trunk/GSASIIstrMath.py

@@ -875 +875 @@
         fas = np.sum(np.sum(fa,axis=2),axis=2)        #real sum over atoms & unique hkl
         fb = np.array([((FF+FP).T-Bab).T*sinp*Tcorr,Flack*FPP*cosp*Tcorr])
-        fb = np.reshape(fb,(2,len(refl),len(SGT),len(Mdata)))   #imag -B,+a
+        fb = np.reshape(fb,(2,len(refl),len(SGT),len(Mdata)))   #imag -B,+a        
         fbs = np.sum(np.sum(fb,axis=2),axis=2)  #imag sum over atoms & uniq hkl
         if SGData['SGInv']: #centrosymmetric; B=0

trunk/imports/G2sfact_CIF.py

@@ -335 +335 @@
                 wave = float(blk['_diffrn_radiation.wavelength'])
             else:
-                wave = 1.5418
+                wave = 0.70926
             self.UpdateParameters(Type=Type,Wave=wave) # histogram type
             return True