Changeset 2187 for trunk/GSASIIphsGUI.py

Timestamp:

Mar 31, 2016 3:17:43 PM (8 years ago)

Author:

vondreele

Message:

Modify the Cite please banners to add small angle & DIFFaX references
remov
e 'axial' from DIFFaX choices (for now) as it leads to a streak calculation not supported in GSAS-II
replace pylab stuff with use of PlotXYZ which has been improved
fix character Greek 'mu' in Layers GUI
new GSAS-II function for calculating selected area diffraction (still testing)

File:

• trunk/GSASIIphsGUI.py (modified) (6 diffs)

trunk/GSASIIphsGUI.py

@@ -2402 +2402 @@
         
         laueChoice = ['-1','2/m(ab)','2/m(c)','mmm','-3','-3m','4/m','4/mmm',
-            '6/m','6/mmm','axial','unknown']
+            '6/m','6/mmm','unknown']
         colLabels = ['Name','Type','x','y','z','frac','Uiso']
         transLabels = ['Prob','Dx','Dy','Dz','refine','plot']
@@ -2428 +2428 @@
         def OnSadpPlot(event):
             sadpPlot.SetValue(False)
-            import pylab as pl
             labels = Layers['Sadp']['Plane']
             lmax = float(Layers['Sadp']['Lmax'])
-            pl.imshow(Layers['Sadp']['Img'],aspect='auto',extent=[-lmax,lmax,-lmax,lmax])
-            pl.ylabel(labels[-1])
-            pl.xlabel(labels[:-1])
-            pl.title(Layers['Sadp']['Plane'])
-            pl.show()
+            XY = 2*lmax*np.mgrid[0:256:256j,0:256:256j]/256.-lmax
+            G2plt.PlotXYZ(G2frame,XY,Layers['Sadp']['Img'].T,labelX=labels[:-1],
+                labelY=labels[-1],newPlot=False,Title=Layers['Sadp']['Plane'])
             
         def CellSizer():
@@ -2529 +2526 @@
             widthSizer = wx.BoxSizer(wx.HORIZONTAL)
             for i in range(2):
-                widthSizer.Add(wx.StaticText(layerData,label=' layer width(%s) (<= 1\xb5m): '%(Labels[i])),0,WACV)
+                widthSizer.Add(wx.StaticText(layerData,label=u' layer width(%s) (<= 1\xb5m): '%(Labels[i])),0,WACV)
                 widthVal = wx.TextCtrl(layerData,value='%.3f'%(widths[i]),style=wx.TE_PROCESS_ENTER)
                 widthVal.Bind(wx.EVT_TEXT_ENTER,OnWidthChange)        
@@ -2928 +2925 @@
         dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
         if dlg.ShowModal() == wx.ID_OK:
-            ctrls,plane,lmax,x,x,x = dlg.GetSelection()
+            ctrls,plane,lmax,mult,x,x,x = dlg.GetSelection()
             data['Layers']['Sadp'] = {}
             data['Layers']['Sadp']['Plane'] = plane
             data['Layers']['Sadp']['Lmax'] = lmax
+            data['Layers']['Sadp']['Mult'] = mult
         else:
             return
@@ -2969 +2967 @@
         else:   #selected area
             G2pwd.StackSim(data['Layers'],ctrls)
-#            if GSASIIpath.GetConfigValue('debug'):
-#                G2pwd.CalcStackingSADP(data['Layers'])
+#            G2pwd.CalcStackingSADP(data['Layers'])
         wx.CallAfter(UpdateLayerData)
         
@@ -2979 +2976 @@
         dlg = G2gd.DIFFaXcontrols(G2frame,ctrls,Parms)
         if dlg.ShowModal() == wx.ID_OK:
-            ctrls,plane,lmax,parm,parmRange,parmStep = dlg.GetSelection()
+            ctrls,plane,lmax,mult,parm,parmRange,parmStep = dlg.GetSelection()
             data['Layers']['Sadp'] = {}
             data['Layers']['Sadp']['Plane'] = plane
             data['Layers']['Sadp']['Lmax'] = lmax
+            data['Layers']['Sadp']['Mult'] = mult
             data['Layers']['Multi'] = [parm,parmRange,parmStep]
         else: