Changeset 4056

Timestamp:

Jul 9, 2019 8:24:26 AM (2 years ago)

Author:

vondreele

Message:

use config value of default spot size for spot masks

Location:

trunk

Files:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1247 +1247 @@
     return vals,sig,covMatrix
 
-def FitImageSpots(Image,ImMax,ind,pixSize,nxy):
+def FitImageSpots(Image,ImMax,ind,pixSize,nxy,spotSize=1.0):
     
     def calcMean(nxy,pixSize,img):
@@ -1291 +1291 @@
         vals = calcMean(nxy,pixSize,ImBox)
         posx,posy = [px+vals[0],py+vals[1]]
-        return [posx,posy,6.]
+        return [posx,posy,spotSize]
     else:
         result = leastsq(calc2Peak,vals,args=(nxy,pixSize,ImBox),full_output=True)
@@ -1298 +1298 @@
         if 0.5 < ratio < 2.0 and vals[2] < 2. and vals[3] < 2.:
             posx,posy = [px+vals[2],py+vals[3]]
-            return [posx,posy,min(6.*vals[4],6.)]
+            return [posx,posy,min(6.*vals[4],spotSize)]
         else:
             return None

trunk/GSASIIplot.py

@@ -7172 +7172 @@
                         nxy = 15
                         ImMax = np.max(G2frame.ImageZ)
-                        result = G2img.FitImageSpots(G2frame.ImageZ,ImMax,ind,pixelSize,nxy)
+                        result = G2img.FitImageSpots(G2frame.ImageZ,ImMax,ind,pixelSize,nxy,G2frame.spotSize)
                         if result:
                             Xpos,Ypos,sig = result