Changeset 267 for trunk/GSASIIpeak.py

Timestamp:

Apr 20, 2011 1:09:53 PM (12 years ago)

Author:

vondreele

Message:

removed azm rotation - didn't work
fix azimuthal polarization

File:

• trunk/GSASIIpeak.py (modified) (3 diffs)

trunk/GSASIIpeak.py

@@ -166 +166 @@
 #    return (Pola*npcosd(Azm)**2+(1.-Pola)*npsind(Azm)**2)*npcosd(Tth)**2+ \
 #        Pola*npsind(Azm)**2+(1.-Pola)*npcosd(Azm)**2
-#    return (Pola*npcosd(Azm)**2+npsind(Azm)**2)*npcosd(Tth)**2+   \
-#        Pola*npsind(Azm)**2+npcosd(Azm)**2
-    return Pola*npcosd(Tth)**2+1.0
+    return ((1.0-Pola)*npcosd(Azm)**2+Pola*npsind(Azm)**2)*npcosd(Tth)**2+   \
+        (1.0-Pola)*npsind(Azm)**2+Pola*npcosd(Azm)**2
     
 def Oblique(ObCoeff,Tth):
@@ -672 +671 @@
     dt = (Tth[1]-Tth[0])
     xydata['IofQ'][1][1] /= Absorb(data['Geometry'],Abs,data['Diam'],Tth)
-    pola = Polarization(inst['Polariz.'],Tth,Azm=inst['Azimuth'])
-    auxPlot.append([Tth,pola,'Pola'])      
-    xydata['IofQ'][1][1] /= pola
+    xydata['IofQ'][1][1] /= Polarization(inst['Polariz.'],Tth,Azm=inst['Azimuth'])
     xydata['IofQ'][1][1] *= Oblique(data['ObliqCoeff'],Tth)
     XY = xydata['IofQ'][1]    
@@ -706 +703 @@
     Q = xydata['SofQ'][1][0]
     ruland = Ruland(data['Ruland'],wave,Q,CF)
-    auxPlot.append([Q,ruland,'Ruland'])      
+#    auxPlot.append([Q,ruland,'Ruland'])      
     CF *= ruland
-    auxPlot.append([Q,CF,'Compton*Ruland'])
-    scale =       np.sum((FFSq+CF)[minQ:maxQ])/np.sum(xydata['SofQ'][1][1][minQ:maxQ])
+#    auxPlot.append([Q,CF,'Compton*Ruland'])
+    scale = np.sum((FFSq+CF)[minQ:maxQ])/np.sum(xydata['SofQ'][1][1][minQ:maxQ])
     xydata['SofQ'][1][1] *= scale
     xydata['SofQ'][1][1] -= CF
     xydata['SofQ'][1][1] = xydata['SofQ'][1][1]/SqFF
+    
 
     xydata['FofQ'] = copy.deepcopy(xydata['SofQ'])