Changeset 2187 for trunk/GSASIIphsGUI.py


Ignore:
Timestamp:
Mar 31, 2016 3:17:43 PM (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r2184 r2187  
    24022402       
    24032403        laueChoice = ['-1','2/m(ab)','2/m(c)','mmm','-3','-3m','4/m','4/mmm',
    2404             '6/m','6/mmm','axial','unknown']
     2404            '6/m','6/mmm','unknown']
    24052405        colLabels = ['Name','Type','x','y','z','frac','Uiso']
    24062406        transLabels = ['Prob','Dx','Dy','Dz','refine','plot']
     
    24282428        def OnSadpPlot(event):
    24292429            sadpPlot.SetValue(False)
    2430             import pylab as pl
    24312430            labels = Layers['Sadp']['Plane']
    24322431            lmax = float(Layers['Sadp']['Lmax'])
    2433             pl.imshow(Layers['Sadp']['Img'],aspect='auto',extent=[-lmax,lmax,-lmax,lmax])
    2434             pl.ylabel(labels[-1])
    2435             pl.xlabel(labels[:-1])
    2436             pl.title(Layers['Sadp']['Plane'])
    2437             pl.show()
     2432            XY = 2*lmax*np.mgrid[0:256:256j,0:256:256j]/256.-lmax
     2433            G2plt.PlotXYZ(G2frame,XY,Layers['Sadp']['Img'].T,labelX=labels[:-1],
     2434                labelY=labels[-1],newPlot=False,Title=Layers['Sadp']['Plane'])
    24382435           
    24392436        def CellSizer():
     
    25292526            widthSizer = wx.BoxSizer(wx.HORIZONTAL)
    25302527            for i in range(2):
    2531                 widthSizer.Add(wx.StaticText(layerData,label=' layer width(%s) (<= 1\xb5m): '%(Labels[i])),0,WACV)
     2528                widthSizer.Add(wx.StaticText(layerData,label=u' layer width(%s) (<= 1\xb5m): '%(Labels[i])),0,WACV)
    25322529                widthVal = wx.TextCtrl(layerData,value='%.3f'%(widths[i]),style=wx.TE_PROCESS_ENTER)
    25332530                widthVal.Bind(wx.EVT_TEXT_ENTER,OnWidthChange)       
     
    29282925        dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
    29292926        if dlg.ShowModal() == wx.ID_OK:
    2930             ctrls,plane,lmax,x,x,x = dlg.GetSelection()
     2927            ctrls,plane,lmax,mult,x,x,x = dlg.GetSelection()
    29312928            data['Layers']['Sadp'] = {}
    29322929            data['Layers']['Sadp']['Plane'] = plane
    29332930            data['Layers']['Sadp']['Lmax'] = lmax
     2931            data['Layers']['Sadp']['Mult'] = mult
    29342932        else:
    29352933            return
     
    29692967        else:   #selected area
    29702968            G2pwd.StackSim(data['Layers'],ctrls)
    2971 #            if GSASIIpath.GetConfigValue('debug'):
    2972 #                G2pwd.CalcStackingSADP(data['Layers'])
     2969#            G2pwd.CalcStackingSADP(data['Layers'])
    29732970        wx.CallAfter(UpdateLayerData)
    29742971       
     
    29792976        dlg = G2gd.DIFFaXcontrols(G2frame,ctrls,Parms)
    29802977        if dlg.ShowModal() == wx.ID_OK:
    2981             ctrls,plane,lmax,parm,parmRange,parmStep = dlg.GetSelection()
     2978            ctrls,plane,lmax,mult,parm,parmRange,parmStep = dlg.GetSelection()
    29822979            data['Layers']['Sadp'] = {}
    29832980            data['Layers']['Sadp']['Plane'] = plane
    29842981            data['Layers']['Sadp']['Lmax'] = lmax
     2982            data['Layers']['Sadp']['Mult'] = mult
    29852983            data['Layers']['Multi'] = [parm,parmRange,parmStep]
    29862984        else:
Note: See TracChangeset for help on using the changeset viewer.