Changeset 4325 for trunk

Timestamp:

Feb 22, 2020 11:14:33 AM (4 years ago)

Author:

vondreele

Message:

small RMCProfile fixes
New auto spot mask version - works

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1478 +1478 @@
     for it,TTh in enumerate(TThs):
         band.mask = ma.masked_outside(TA,TTh,TTh+dtth).mask+tam
-        pcmax = np.percentile(band,prob)
+        pcmax = np.percentile(band.compressed(),prob)
         mband = ma.masked_greater(band,pcmax)
-        mean = ma.median(mband)
+        mean = ma.mean(mband)
         std = ma.std(mband)
         anom = ma.masked_greater((band-mean)/std,esdMul)
         mask ^= (anom.mask^band.mask)
         if not dlg is None:
-            dlg.Raise()
             GoOn = dlg.Update(it,newmsg='Processed 2-theta rings = %d'%(it))
             if not GoOn[0]:

trunk/GSASIIimgGUI.py

@@ -1947 +1947 @@
     spotSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Select n*sigma spot rejection (n=1-10): '),0,WACV)
     spotSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,loc=data['SpotMask'],
-        key='esdMul',min=1,max=10,size=(40,25)),0,WACV)
+        key='esdMul',min=1.,max=10.,size=(40,25)),0,WACV)
     numPix = 0
     if data['SpotMask']['spotMask'] is not None:

trunk/GSASIIphsGUI.py

@@ -5379 +5379 @@
                     OutFile.close()
                     print('RMCProfile file %s read'%(pName+item))
-                else:
-                    print('RMCProfile file %s not found'%(pName+item))
+#                else:
+#                    print('RMCProfile file %s not found'%(pName+item))
 #total result plots
             Labels = {'_PDF1.csv':[r'$\mathsf{R,\AA}$','G(R)','RMCP G(R) for '],
@@ -5502 +5502 @@
                         numx,numy = odfData[:2]
                         G2plt.Plot3dXYZ(G2frame,int(numx),int(numy),odfData[2:],
-                            newPlot=False,Title='Bond %s-%s'%(bond[0],bond[1]),Centro=True)        
+                            newPlot=False,Title='Bond %s-%s'%(bond[0],bond[1]),Centro=True)  
+                    OutFile.close()
         
             

trunk/GSASIIplot.py

@@ -5233 +5233 @@
     if np.any(X) and np.any(Y) and np.any(Z):
         np.seterr(all='ignore')
-        Plot.plot_surface(X,Y,Z,rstride=1,cstride=1,color='g',linewidth=1)
+        try:
+            Plot.plot_surface(X,Y,Z,rstride=1,cstride=1,color='g',linewidth=1)
+        except:
+            pass
         xyzlim = np.array([Plot.get_xlim3d(),Plot.get_ylim3d(),Plot.get_zlim3d()]).T
         XYZlim = [min(xyzlim[0]),max(xyzlim[1])]