Changeset 3961 for trunk/GSASIIplot.py

Timestamp:

May 8, 2019 6:16:01 PM (4 years ago)

Author:

vondreele

Message:

set self.tutorialPath = '.\G2tutorial' if others fail. Don't know if this is best?
Add S301 to trigonal to 3m1 list of generalized mustrain terms - seems to improve things but plot is weird. Might need more work.
use get to fix missing Z problem
set up getting better map density from density slice instead of 3/4D full map

File:

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

trunk/GSASIIplot.py

@@ -7675 +7675 @@
 
     # PlotStructure initialization here
-    global mcsaXYZ,mcsaTypes,mcsaBonds,txID,contourSet
+    global mcsaXYZ,mcsaTypes,mcsaBonds,txID,contourSet,Zslice
     global cell, Vol, Amat, Bmat, A4mat, B4mat
     txID = 0
@@ -8904 +8904 @@
                     RenderPlane(plane,color)
         if drawingData.get('showSlice',False):
-            global contourSet
+            global contourSet,Zslice
             if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
                 modQ = np.array(generalData['SuperVec'][0])
@@ -8926 +8926 @@
             if FourD:
                 SXYZT = np.vstack((SXYZ.T,np.inner(SXYZ,modQ)+G2frame.tau)).T
-                Z = np.reshape(map_coordinates(rho,(SXYZT%1.*rho.shape).T,order=1,mode='wrap'),(npts,npts))
+                Zslice = np.reshape(map_coordinates(rho,(SXYZT%1.*rho.shape).T,order=1,mode='wrap'),(npts,npts))
             else:
-                Z = np.reshape(map_coordinates(rho,(SXYZ%1.*rho.shape).T,order=1,mode='wrap'),(npts,npts))
-            Z = np.where(Z<=Rmax,Z,Rmax)
+                Zslice = np.reshape(map_coordinates(rho,(SXYZ%1.*rho.shape).T,order=1,mode='wrap'),(npts,npts))
+            Z = np.where(Zslice<=Rmax,Zslice,Rmax)
             plt.rcParams['figure.facecolor'] = (1.,1.,1.,.5)
             oldSize = plt.rcParams['figure.figsize']