Changeset 2731 for trunk/GSASIIimage.py
- Timestamp:
- Mar 1, 2017 9:08:17 AM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/GSASIIimage.py ¶
r2725 r2731 214 214 ypix = int(Ypix) 215 215 if not w: 216 ZMax = np.sum(image[ypix- 1:ypix+1,xpix-1:xpix+1])216 ZMax = np.sum(image[ypix-2:ypix+2,xpix-2:xpix+2]) 217 217 return xpix,ypix,ZMax,0.0001 218 218 if (w2 < xpix < sizex-w2) and (w2 < ypix < sizey-w2) and image[ypix,xpix]: … … 1030 1030 ringint = np.array([float(Image[int(x*scalex),int(y*scaley)]) for y,x in np.array(ringxy)[:,:2]]) 1031 1031 ringint /= np.mean(ringint) 1032 print ' %s %.3f %s %.3f'%('d-spacing',ring['Dcalc'],' var(MRD):',np.var(ringint))1032 print ' %s %.3f %s %.3f'%('d-spacing',ring['Dcalc'],'sig(MRD):',np.sqrt(np.var(ringint))) 1033 1033 RingsAI.append(np.array(zip(ringazm,ringint)).T) 1034 # GSASIIpath.IPyBreak()1035 1034 return RingsAI 1036 1035 … … 1056 1055 else: #compression 1057 1056 ring['Dcalc'] = dmin+3.*(dmax-dmin)/4. 1058 # ring['Dcalc'] = np.mean(ring['ImtaCalc'][0])1059 1057 1060 1058 def calcFij(omg,phi,azm,th):
Note: See TracChangeset
for help on using the changeset viewer.