Changeset 3153

Timestamp:

Nov 13, 2017 2:31:44 PM (6 years ago)

Author:

vondreele

Message:

Add choice of setero projection & equal area inv. pole figures in Phase/Data? window
make inv. pole fig plotting/tool tip & cursor position all agree. Use proper coordinate system for cursor position.
NB: k-axis horizontal; h-axis up, so one is looking down l-axis for inv. pole figs.

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (8 diffs)

trunk/GSASIIddataGUI.py

@@ -74 +74 @@
         
         plotSizer = wx.BoxSizer(wx.VERTICAL)
-        choice = ['None','Mustrain','Size','Preferred orientation','Inv. pole figure']
+        choice = ['None','Mustrain','Size','Preferred orientation','St. proj. Inv. pole figure','Eq. area Inv. pole figure']
         plotSel = wx.RadioBox(DData,wx.ID_ANY,'Select plot type:',choices=choice,
             majorDimension=1,style=wx.RA_SPECIFY_COLS)
@@ -1012 +1012 @@
         topSizer = wx.FlexGridSizer(1,2,5,5)
         DData.select = wx.ListBox(DData,choices=G2frame.dataWindow.HistsInPhase,
-                            style=wx.LB_SINGLE,size=(-1,120))
+                            style=wx.LB_SINGLE,size=(-1,160))
         DData.select.SetSelection(G2frame.dataWindow.HistsInPhase.index(G2frame.hist))
         DData.select.SetFirstItem(G2frame.dataWindow.HistsInPhase.index(G2frame.hist))

trunk/GSASIIplot.py

@@ -3583 +3583 @@
     
     def OnPick(event):
-        if plotType not in ['Inv. pole figure',]:
+        if 'Inv. pole figure' not in plotType:
             return
         ind = event.ind[0]
@@ -3596 +3596 @@
         
     def OnMotion(event):
-        if plotType not in ['Inv. pole figure',]:
+        if 'Inv. pole figure' not in plotType:
             return
         if event.xdata and event.ydata:                 #avoid out of frame errors
@@ -3603 +3603 @@
             r = xpos**2+ypos**2
             if r <= 1.0:
-                if 'equal' in G2frame.Projection:
+                if 'Eq. area' in plotType:
                     r,p = 2.*npasind(np.sqrt(r)*sq2),npatan2d(xpos,ypos)
                 else:
@@ -3613 +3613 @@
                 if p<0.:
                     p += 360.
-                xyz = np.inner(Bmat,np.array([rp2xyz(r,p)]))
-                x,y,z = list(xyz/np.max(np.abs(xyz)))
+                xyz = np.inner(Amat,np.array([rp2xyz(r,p)]))
+                y,x,z = list(xyz/np.max(np.abs(xyz)))
                 G2frame.G2plotNB.status.SetStatusText(
                     'psi =%9.3f, beta =%9.3f, MRD =%9.3f hkl=%5.2f,%5.2f,%5.2f'%(r,p,ipf,x,y,z),1)
@@ -3629 +3629 @@
     phase = generalData['Name']
     plotType = generalData['Data plot type']
-    plotDict = {'Mustrain':'Mustrain','Size':'Size','Preferred orientation':'Pref.Ori.','Inv. pole figure':''}
+    plotDict = {'Mustrain':'Mustrain','Size':'Size','Preferred orientation':'Pref.Ori.',
+        'St. proj. Inv. pole figure':'','Eq. area Inv. pole figure':''}
     for ptype in plotDict:
         G2frame.G2plotNB.Delete(ptype)
@@ -3759 +3760 @@
             Plot.set_xlabel(r'$\psi$',fontsize=16)
             Plot.set_ylabel('MRD',fontsize=14)
-    elif plotType in ['Inv. pole figure',]:
+    elif 'Inv. pole figure' in plotType:
+        sq2 = 1.0/math.sqrt(2.0)
         Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,hist)
         rId = G2gd.GetGPXtreeItemId(G2frame,Id,'Reflection Lists')
@@ -3801 +3803 @@
         Rmd = np.array(Rmd)
         Rmd = np.where(Rmd<0.,0.,Rmd)
-        if 'equal' in G2frame.Projection:
-            x,y = np.sin(Beta)*np.cos(Phi),np.sin(Beta)*np.sin(Phi)        
+        if 'Eq. area' in plotType:
+            x,y = np.sin(Beta/2.)*np.cos(Phi)/sq2,np.sin(Beta/2.)*np.sin(Phi)/sq2        
         else:
             x,y = np.tan(Beta/2.)*np.cos(Phi),np.tan(Beta/2.)*np.sin(Phi)        
-        sq2 = 1.0/math.sqrt(2.0)
         npts = 201
         X,Y = np.meshgrid(np.linspace(1.,-1.,npts),np.linspace(-1.,1.,npts))
         R,P = np.sqrt(X**2+Y**2).flatten(),npatan2d(Y,X).flatten()
         P=np.where(P<0.,P+360.,P)
-        if 'equal' in G2frame.Projection:
+        if 'Eq. area' in plotType:
             R = np.where(R <= 1.,2.*npasind(R*sq2),0.0)
         else:
             R = np.where(R <= 1.,2.*npatand(R),0.0)
         Z = np.zeros_like(R)
-#        GSASIIpath.IPyBreak()
         try:
             sfac = 0.1
@@ -3889 +3889 @@
                         r,p = 2.*npatand(np.sqrt(r)),npatan2d(xpos,ypos)
                     ipf = G2lat.invpolfcal(IODFln,SGData,np.array([r,]),np.array([p,]))
-                    xyz = np.inner(Bmat,np.array([rp2xyz(r,p)]))
-                    x,y,z = list(xyz/np.max(np.abs(xyz)))
+                    xyz = np.inner(Amat,np.array([rp2xyz(r,p)]))
+                    y,x,z = list(xyz/np.max(np.abs(xyz)))
                     
                     G2frame.G2plotNB.status.SetStatusText(