Changeset 4056
- Timestamp:
- Jul 9, 2019 8:24:26 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimage.py
r4035 r4056 1247 1247 return vals,sig,covMatrix 1248 1248 1249 def FitImageSpots(Image,ImMax,ind,pixSize,nxy ):1249 def FitImageSpots(Image,ImMax,ind,pixSize,nxy,spotSize=1.0): 1250 1250 1251 1251 def calcMean(nxy,pixSize,img): … … 1291 1291 vals = calcMean(nxy,pixSize,ImBox) 1292 1292 posx,posy = [px+vals[0],py+vals[1]] 1293 return [posx,posy, 6.]1293 return [posx,posy,spotSize] 1294 1294 else: 1295 1295 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.: 1299 1299 posx,posy = [px+vals[2],py+vals[3]] 1300 return [posx,posy,min(6.*vals[4], 6.)]1300 return [posx,posy,min(6.*vals[4],spotSize)] 1301 1301 else: 1302 1302 return None -
trunk/GSASIIplot.py
r4046 r4056 7172 7172 nxy = 15 7173 7173 ImMax = np.max(G2frame.ImageZ) 7174 result = G2img.FitImageSpots(G2frame.ImageZ,ImMax,ind,pixelSize,nxy )7174 result = G2img.FitImageSpots(G2frame.ImageZ,ImMax,ind,pixelSize,nxy,G2frame.spotSize) 7175 7175 if result: 7176 7176 Xpos,Ypos,sig = result
Note: See TracChangeset
for help on using the changeset viewer.