Changeset 2374 for trunk/GSASIIplot.py

Timestamp:

Jul 13, 2016 10:19:55 AM (7 years ago)

Author:

vondreele

Message:

more work on histogram IVP plotting

File:

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

trunk/GSASIIplot.py

@@ -3033 +3033 @@
             r = xpos**2+ypos**2
             if r <= 1.0:
-                r,p = 2.*npatand(np.sqrt(r)),npatan2d(ypos,xpos)    #stereoproj.
+                if 'equal' in G2frame.Projection:
+                    r,p = 2.*npasind(np.sqrt(r)*sq2),npatan2d(ypos,xpos)
+                else:
+                    r,p = 2.*npatand(np.sqrt(r)),npatan2d(ypos,xpos)
                 if p<0.:
                     p += 360.
@@ -3235 +3238 @@
         Rmd = np.array(Rmd)
         Rmd = np.where(Rmd<0.,0.,Rmd)
-        x,y = np.tan(Beta/2.)*np.cos(Phi),np.tan(Beta/2.)*np.sin(Phi)        
+        if 'equal' in G2frame.Projection:
+            x,y = np.tan(Beta/2.)*np.cos(Phi),np.tan(Beta/2.)*np.sin(Phi)        
+        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
@@ -3241 +3247 @@
         R,P = np.sqrt(X**2+Y**2).flatten(),npatan2d(X,Y).flatten()
         P=np.where(P<0.,P+360.,P)
-        R = np.where(R <= 1.,2.*npatand(R),0.0)
+        if 'equal' in G2frame.Projection:
+            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.5
+            sfac = 0.1
             while True:
                 try:
@@ -3253 +3262 @@
                     sfac *= 1.05
             Z = [lut(r*np.pi/180.,p*np.pi/180.) for r,p in zip(list(R),list(P))]
+            print 'IVP for histogramn: %s: interpolate sfactor: %.2f'%(hist,sfac)
         except AttributeError:
-            print 'scipy needs to be 0.11.0 or newer'
+            G2frame.G2plotNB.Delete(plotType)
+            G2G.G2MessageBox(G2frame,'IVP interpolate error: scipy needs to be 0.11.0 or newer',
+                    'IVP error')
             return        
         Z = np.reshape(Z,(npts,npts))