Changeset 388 for trunk/GSASIIplot.py
- Timestamp:
- Oct 9, 2011 9:34:43 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r383 r388 1083 1083 Z = [] 1084 1084 W = [] 1085 V = []1085 # V = [] 1086 1086 sig = lambda Th,U,V,W: 1.17741*math.sqrt(U*tand(Th)**2+V*tand(Th)+W)*math.pi/18000. 1087 1087 gam = lambda Th,X,Y: (X/cosd(Th)+Y*tand(Th))*math.pi/18000. 1088 1088 gamFW = lambda s,g: math.exp(math.log(s**5+2.69269*s**4*g+2.42843*s**3*g**2+4.47163*s**2*g**3+0.07842*s*g**4+g**5)/5.) 1089 gamFW2 = lambda s,g: math.sqrt(s**2+(0.4654996*g)**2)+.5345004*g #Ubaldo Bafile - private communication1089 # gamFW2 = lambda s,g: math.sqrt(s**2+(0.4654996*g)**2)+.5345004*g #Ubaldo Bafile - private communication 1090 1090 for theta in thetas: 1091 1091 X.append(4.0*math.pi*sind(theta)/lam) #q … … 1093 1093 g = gam(theta,LX,LY) 1094 1094 G = gamFW(g,s) 1095 H = gamFW2(g,s)1095 # H = gamFW2(g,s) 1096 1096 Y.append(s/tand(theta)) 1097 1097 Z.append(g/tand(theta)) 1098 1098 W.append(G/tand(theta)) 1099 V.append(H/tand(theta))1099 # V.append(H/tand(theta)) 1100 1100 Plot.set_title('Instrument and sample peak widths') 1101 1101 Plot.set_ylabel(r'$\Delta q/q, \Delta d/d$',fontsize=14) … … 1104 1104 Plot.plot(X,Z,color='g',label='Lorentzian') 1105 1105 Plot.plot(X,W,color='b',label='G+L') 1106 Plot.plot(X,V,color='k',label='G+L2')1106 # Plot.plot(X,V,color='k',label='G+L2') 1107 1107 X = [] 1108 1108 Y = [] … … 1118 1118 g = peak[6]*math.pi/18000. 1119 1119 G = gamFW(g,s) 1120 H = gamFW2(g,s)1120 # H = gamFW2(g,s) 1121 1121 Y.append(s/tand(peak[0]/2.)) 1122 1122 Z.append(g/tand(peak[0]/2.)) 1123 1123 W.append(G/tand(peak[0]/2.)) 1124 V.append(H/tand(peak[0]/2.))1124 # V.append(H/tand(peak[0]/2.)) 1125 1125 Plot.plot(X,Y,'+',color='r',label='G peak') 1126 1126 Plot.plot(X,Z,'+',color='g',label='L peak') 1127 1127 Plot.plot(X,W,'+',color='b',label='G+L peak') 1128 Plot.plot(X,V,'+',color='k',label='G+L2 peak')1128 # Plot.plot(X,V,'+',color='k',label='G+L2 peak') 1129 1129 Plot.legend(loc='best') 1130 1130 Page.canvas.draw()
Note: See TracChangeset
for help on using the changeset viewer.