Changeset 267 for trunk/GSASIIpeak.py
- Timestamp:
- Apr 20, 2011 1:09:53 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIpeak.py
r265 r267 166 166 # return (Pola*npcosd(Azm)**2+(1.-Pola)*npsind(Azm)**2)*npcosd(Tth)**2+ \ 167 167 # Pola*npsind(Azm)**2+(1.-Pola)*npcosd(Azm)**2 168 # return (Pola*npcosd(Azm)**2+npsind(Azm)**2)*npcosd(Tth)**2+ \ 169 # Pola*npsind(Azm)**2+npcosd(Azm)**2 170 return Pola*npcosd(Tth)**2+1.0 168 return ((1.0-Pola)*npcosd(Azm)**2+Pola*npsind(Azm)**2)*npcosd(Tth)**2+ \ 169 (1.0-Pola)*npsind(Azm)**2+Pola*npcosd(Azm)**2 171 170 172 171 def Oblique(ObCoeff,Tth): … … 672 671 dt = (Tth[1]-Tth[0]) 673 672 xydata['IofQ'][1][1] /= Absorb(data['Geometry'],Abs,data['Diam'],Tth) 674 pola = Polarization(inst['Polariz.'],Tth,Azm=inst['Azimuth']) 675 auxPlot.append([Tth,pola,'Pola']) 676 xydata['IofQ'][1][1] /= pola 673 xydata['IofQ'][1][1] /= Polarization(inst['Polariz.'],Tth,Azm=inst['Azimuth']) 677 674 xydata['IofQ'][1][1] *= Oblique(data['ObliqCoeff'],Tth) 678 675 XY = xydata['IofQ'][1] … … 706 703 Q = xydata['SofQ'][1][0] 707 704 ruland = Ruland(data['Ruland'],wave,Q,CF) 708 auxPlot.append([Q,ruland,'Ruland'])705 # auxPlot.append([Q,ruland,'Ruland']) 709 706 CF *= ruland 710 auxPlot.append([Q,CF,'Compton*Ruland'])711 scale = 707 # auxPlot.append([Q,CF,'Compton*Ruland']) 708 scale = np.sum((FFSq+CF)[minQ:maxQ])/np.sum(xydata['SofQ'][1][1][minQ:maxQ]) 712 709 xydata['SofQ'][1][1] *= scale 713 710 xydata['SofQ'][1][1] -= CF 714 711 xydata['SofQ'][1][1] = xydata['SofQ'][1][1]/SqFF 712 715 713 716 714 xydata['FofQ'] = copy.deepcopy(xydata['SofQ'])
Note: See TracChangeset
for help on using the changeset viewer.