Changeset 4950

Timestamp:

Jun 11, 2021 7:49:24 AM (20 months ago)

Author:

vondreele

Message:

remove aspect='eual' from a plot contour call - no longer allowed
put floor on phase fraction of 1e-4 - avoid negatives.

Location:

trunk

Files:

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

trunk/GSASIIplot.py

@@ -6406 +6406 @@
         else:
             x,y = np.tan(Beta/2.)*np.cos(Phi),np.tan(Beta/2.)*np.sin(Phi)        
-        npts = 201
+        npts = 101
         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()
@@ -6557 +6557 @@
             Z = np.reshape(Z,(npts,npts))
             try:
-                CS = Plot.contour(Y,X,Z,aspect='equal')
+                CS = Plot.contour(Y,X,Z)
                 Plot.clabel(CS,fontsize=9,inline=1)
             except ValueError:

trunk/GSASIIstrIO.py

@@ -3075 +3075 @@
                 wtFrSum[hId] = 0.
             if 'PWDR' in histogram:
+                parmDict[pfx+'Scale'] = max(1.e-4,parmDict[pfx+'Scale'])
                 for item in ['Scale','Extinction']:
                     hapData[item][0] = parmDict[pfx+item]

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[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
     if 'X' in parmDict[hfx+'Type']: