Changeset 4970

Timestamp:

Jun 22, 2021 4:50:29 PM (21 months ago)

Author:

vondreele

Message:

fix PlotAAProb bugs - leftover pickradius & an xpos error
fix scale factor bug & set floor as 1.e-12 for PWDR histograms

Location:

trunk

Files:

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

trunk/GSASIIplot.py

@@ -5634 +5634 @@
     def OnMotion(event):
         xpos,ypos = event.xdata,event.ydata
-        if xpos > 1.:
+        if xpos and xpos > 1.:
             if 0 <= xpos < len(resNames):
                 resName = resNames[int(xpos+.5)-1]
@@ -5666 +5666 @@
         colors = list(np.where(np.array(Probs1)>thresh[0][1],'r','b'))
         resNums = np.arange(len(resNames))
-        Plot1.bar(resNums,Probs1,color=colors,linewidth=0,
-                                picker=True,pickradius=1)
+        Plot1.bar(resNums,Probs1,color=colors,linewidth=0,picker=True)
         if thresh is not None:
             for item in thresh[0]:
@@ -5675 +5674 @@
         Plot2.set_xlabel(r'Residue',fontsize=14)        
         colors = list(np.where(np.array(Probs2)>thresh[1][1],'r','b'))
-        Plot2.bar(resNums,Probs2,color=colors,linewidth=0,
-                                picker=True,pickradius=1)
+        Plot2.bar(resNums,Probs2,color=colors,linewidth=0,picker=True)
         if thresh is not None:
             for item in thresh[1]:

trunk/GSASIIstrIO.py

@@ -3075 +3075 @@
                 wtFrSum[hId] = 0.
             if 'PWDR' in histogram:
-                parmDict[pfx+'Scale'] = max(1.e-4,parmDict[pfx+'Scale'])
+                parmDict[pfx+'Scale'] = max(1.e-12,parmDict[pfx+'Scale'])
                 for item in ['Scale','Extinction']:
                     hapData[item][0] = parmDict[pfx+item]
@@ -3711 +3711 @@
         
             Sample = Histogram['Sample Parameters']
-            parmDict[pfx+'Scale'] = max(1.e-4,parmDict[pfx+'Scale'])                        #put floor on phase fraction scale
+            parmDict[pfx+'Scale'] = max(1.e-12,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
+    parmDict[phfx+'Scale'] = max(1.e-12,parmDict[phfx+'Scale'])                        #put floor on phase fraction scale
+    parmDict[hfx+'Scale'] = max(1.e-12,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']: