Changeset 1339 for trunk/GSASIIsasd.py

Timestamp:

May 9, 2014 2:56:31 PM (9 years ago)

Author:

vondreele

Message:

make single pattern plot the default
begin slit smearing implementation - doesn't work just yet
some tweaking of pattern plotting

File:

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

trunk/GSASIIsasd.py

@@ -1001 +1001 @@
     return (G*P/Rg**P)*np.exp(scsp.gammaln(P/2))
     
-def SmearData(Ic,Q,slitLength):
-    return Ic   #for now
+def SmearData(Ic,Q,slitLen):
+    Qtemp = np.concatenate([Q,20*Q])
+    Ictemp = np.concatenate([Ic,np.zeros_like(Ic)])
+    print Ictemp
+    Icsm = np.zeros_like(Qtemp)
+    Np = Q.shape[0]
+    Qsm = 2*slitLen*(np.interp(np.arange(2*Np)/2.,np.arange(Np),Q)-Q[0])/(Q[-1]-Q[0])
+    Sp = np.searchsorted(Qsm,slitLen)
+    for i in range(Np):
+        Ism = np.interp(np.sqrt(Q[i]**2+Qsm**2),Qtemp,Ictemp)
+        print Ism
+        raise Exception
+        Icsm[i] = np.sum(Ism[:Sp])
+    Icsm /= slitLen
+    return Icsm   #for now
     
 ###############################################################################
@@ -1210 +1223 @@
                     parmDict[cid+'PkSig'],parmDict[cid+'PkGam'],Q)
         Ic += parmDict['Back']  #/parmDict['Scale']
+        slitLen = Sample['SlitLen']
+        if slitLen:
+            Ic = SmearData(Ic,Q,slitLen)
         return Ic
         
@@ -1359 +1375 @@
             Dist.append([])
     Ic[Ibeg:Ifin] += Back[0]
+    slitLen = Sample['SlitLen']
+    if slitLen:
+        Ic[Ibeg:Ifin] = SmearData(Ic,Q,slitLen)[Ibeg:Ifin]
     sasdData['Size Calc'] = [Rbins,Dist]