Changeset 3150

Timestamp:

Nov 4, 2017 10:14:33 AM (6 years ago)

Author:

vondreele

Message:

fix plotting of inverse pole figures now h-axis horizontal, k-axis "up" and view down l-axis. Reflection marks on Data IPFs not right yet, but cursor position is correct.

File:

• trunk/GSASIIplot.py (modified) (8 diffs)

trunk/GSASIIplot.py

@@ -3604 +3604 @@
             if r <= 1.0:
                 if 'equal' in G2frame.Projection:
-                    r,p = 2.*npasind(np.sqrt(r)*sq2),npatan2d(ypos,xpos)
+                    r,p = 2.*npasind(np.sqrt(r)*sq2),npatan2d(xpos,ypos)
                 else:
-                    r,p = 2.*npatand(np.sqrt(r)),npatan2d(ypos,xpos)
+                    r,p = 2.*npatand(np.sqrt(r)),npatan2d(xpos,ypos)
                 if p<0.:
                     p += 360.
                 ipf = lut(r*np.pi/180.,p*np.pi/180.)
-                xyz = np.inner(Bmat.T,np.array([rp2xyz(r,p)]))
+                p = 90.-p
+                if p<0.:
+                    p += 360.
+                xyz = np.inner(Bmat,np.array([rp2xyz(r,p)]))
                 x,y,z = list(xyz/np.max(np.abs(xyz)))
                 G2frame.G2plotNB.status.SetStatusText(
@@ -3649 +3652 @@
     PHI = np.linspace(0.,360.,30,True)
     PSI = np.linspace(0.,180.,30,True)
-    X = np.outer(npsind(PHI),npsind(PSI))
-    Y = np.outer(npcosd(PHI),npsind(PSI))
+    X = np.outer(npcosd(PHI),npsind(PSI))
+    Y = np.outer(npsind(PHI),npsind(PSI))
     Z = np.outer(np.ones(np.size(PHI)),npcosd(PSI))
     try:        #temp patch instead of 'mustrain' for old files with 'microstrain'
@@ -3799 +3802 @@
         Rmd = np.where(Rmd<0.,0.,Rmd)
         if 'equal' in G2frame.Projection:
-            x,y = np.tan(Beta/2.)*np.cos(Phi),np.tan(Beta/2.)*np.sin(Phi)        
+            x,y = np.sin(Beta)*np.cos(Phi),np.sin(Beta)*np.sin(Phi)        
         else:
             x,y = np.tan(Beta/2.)*np.cos(Phi),np.tan(Beta/2.)*np.sin(Phi)        
@@ -3805 +3808 @@
         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(X,Y).flatten()
+        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:
@@ -3822 +3825 @@
                     sfac *= 1.05
             Z = [lut(ri*np.pi/180.,p*np.pi/180.) for ri,p in zip(list(R),list(P))]
-            print ('IVP for histogramn: %s: interpolate sfactor: %.2f'%(hist,sfac))
+#            print ('IVP for histogramn: %s: interpolate sfactor: %.2f'%(hist,sfac))
         except AttributeError:
             G2frame.G2plotNB.Delete(plotType)
@@ -3836 +3839 @@
         acolor = mpl.cm.get_cmap(G2frame.ContourColor)
         Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1])
-        Plot.plot(-x,y,'+',picker=3)
+        Plot.plot(y,x,'+',picker=3)
         Page.figure.colorbar(Img)
         Plot.axis('off')
@@ -3882 +3885 @@
                 if r <= 1.0:
                     if 'equal' in G2frame.Projection: 
-                        r,p = 2.*npasind(np.sqrt(r)*sq2),npatan2d(ypos,xpos)
+                        r,p = 2.*npasind(np.sqrt(r)*sq2),npatan2d(xpos,ypos)
                     else:
-                        r,p = 2.*npatand(np.sqrt(r)),npatan2d(ypos,xpos)
+                        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)]))
-                    y,x,z = list(xyz/np.max(np.abs(xyz)))
+                    x,y,z = list(xyz/np.max(np.abs(xyz)))
                     
                     G2frame.G2plotNB.status.SetStatusText(
@@ -3943 +3946 @@
         if 'Inverse' in SHData['PlotType']:
             X,Y = np.meshgrid(np.linspace(1.,-1.,npts),np.linspace(-1.,1.,npts))
-            R,P = np.sqrt(X**2+Y**2).flatten(),npatan2d(X,Y).flatten()
+            R,P = np.sqrt(X**2+Y**2).flatten(),npatan2d(Y,X).flatten()
             if 'equal' in G2frame.Projection:
                 R = np.where(R <= 1.,2.*npasind(R*sq2),0.0)