Changeset 4958

Timestamp:

Jun 15, 2021 10:17:24 AM (3 months ago)

Author:

vondreele

Message:

put floor onn histogram scale = 1e-4 (might be too big?)
set pixilation for pole figures & inverse pole figures to 101; use interpolation to smooth. Now faster.

Location:

trunk

Files:

• GSASIIplot.py (modified) (5 diffs)
• GSASIIstrIO.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -6366 +6366 @@
         if 'Type' not in RefData or 'RefList' not in RefData:
             generalData['Data plot type'] = 'None'
-#            G2G.G2MessageBox(G2frame,'Reflection list not ready','RefData error')
             return
         Type = RefData['Type']
@@ -6438 +6437 @@
             pass
         acolor = mpl.cm.get_cmap(G2frame.ContourColor)
-        Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1])
+        Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1],interpolation='bilinear')
         Plot.plot(y,x,'+',picker=True,pickradius=3)
         Page.figure.colorbar(Img)
@@ -6546 +6545 @@
         
     else:       
-        npts = 201
+        npts = 101
         if 'Inverse' in SHData['PlotType']:
             X,Y = np.meshgrid(np.linspace(1.,-1.,npts),np.linspace(-1.,1.,npts))
@@ -6563 +6562 @@
                 pass
             acolor = mpl.cm.get_cmap(G2frame.ContourColor)
-            Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1])
+            Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1],interpolation='bilinear')
             Page.figure.colorbar(Img)
             x,y,z = SHData['PFxyz']
@@ -6618 +6617 @@
                 pass
             acolor = mpl.cm.get_cmap(G2frame.ContourColor)
-            Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1])
+            Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1],interpolation='bilinear')
             Page.figure.colorbar(Img)
             if 'det Angles' in textureData and textureData['ShoDet']:

trunk/GSASIIstrIO.py

@@ -3711 +3711 @@
         
             Sample = Histogram['Sample Parameters']
+            parmDict[pfx+'Scale'] = max(1.e-4,parmDict[pfx+'Scale'])                        #put floor on phase fraction scale
             sampSig = SetSampleParms(pfx,Sample,parmDict,sigDict)
 

trunk/GSASIIstrMath.py

@@ -2599 +2599 @@
 def GetIntensityCorr(refl,im,uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict):
     'Needs a doc string'    #need powder extinction!
+    parmDict[phfx+'Scale'] = max(1.e-4,parmDict[hfx+'Scale'])                        #put floor on phase fraction scale
     parmDict[hfx+'Scale'] = max(1.e-4,parmDict[hfx+'Scale'])                        #put floor on phase fraction scale
     Icorr = parmDict[phfx+'Scale']*parmDict[hfx+'Scale']*refl[3+im]               #scale*multiplicity