Changeset 1761 for trunk

Timestamp:

Mar 24, 2015 4:10:52 PM (8 years ago)

Author:

vondreele

Message:

better fix to export csv reflections
change default I/Ib for strain picking
fix bugs in powder extinction calcs.
remove stray line in G2strMath

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (3 diffs)
• exports/G2export_csv.py (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -3523 +3523 @@
                 return
             dsp = G2img.GetDsp(Xpos,Ypos,Data)
-            StrSta['d-zero'].append({'Dset':dsp,'Dcalc':0.0,'pixLimit':10,'cutoff':1.0,
+            StrSta['d-zero'].append({'Dset':dsp,'Dcalc':0.0,'pixLimit':10,'cutoff':0.5,
                 'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0]})
             R,r = G2img.MakeStrStaRing(StrSta['d-zero'][-1],G2frame.ImageZ,Data)

trunk/GSASIIstrMath.py

@@ -1316 +1316 @@
     if 0 < xfac <= 1.:
         xn = np.array([xfac**(i+1) for i in range(6)])
-        exl = np.sum(xn*coef)
+        exl += np.sum(xn*coef)
     elif xfac > 1.:
         xfac2 = 1./np.sqrt(xfac)
@@ -1324 +1324 @@
 def GetPwdrExtDerv(refl,im,pfx,phfx,hfx,calcControls,parmDict):
     'Needs a doc string'
-    delt = 0.01
-    parmDict[phfx+'Extinction'] += delt
-    plus = GetPwdrExt(refl,im,pfx,phfx,hfx,calcControls,parmDict)
-    parmDict[phfx+'Extinction'] -= 2.*delt
-    minus = GetPwdrExt(refl,im,pfx,phfx,hfx,calcControls,parmDict)
-    parmDict[phfx+'Extinction'] += delt
-    return (plus-minus)/(2.*delt)    
+    coef = np.array([-0.5,0.25,-0.10416667,0.036458333,-0.0109375,2.8497409E-3])
+    pi2 = np.sqrt(2./np.pi)
+    if 'T' in calcControls[hfx+'histType']:
+        sth2 = sind(parmDict[hfx+'2-theta']/2.)**2
+        wave = refl[14+im]
+    else:   #'C'W
+        sth2 = sind(refl[5+im]/2.)**2
+        wave = parmDict.get(hfx+'Lam',parmDict.get(hfx+'Lam1',1.0))
+    c2th = 1.-2.0*sth2
+    flv2 = refl[9+im]*(wave/parmDict[pfx+'Vol'])**2
+    if 'X' in calcControls[hfx+'histType']:
+        flv2 *= 0.079411*(1.0+c2th**2)/2.0
+    xfac = flv2*parmDict[phfx+'Extinction']
+    dbde = -500.*flv2
+    if xfac > -1.:
+        dbde = -flv2/(1.+xfac)**3
+    dlde = 0.
+    if 0 < xfac <= 1.:
+        xn = np.array([i*flv2*xfac**i for i in [1,2,3,4,5,6]])
+        dlde = np.sum(xn*coef)
+    elif xfac > 1.:
+        xfac2 = 1./np.sqrt(xfac)
+        dlde = flv2*pi2*xfac2*(-1./xfac+0.375/xfac**2)
+        
+    return dbde*sth2+dlde*(1.-sth2)
+
+
+#    delt = 0.01
+#    parmDict[phfx+'Extinction'] += delt
+#    plus = GetPwdrExt(refl,im,pfx,phfx,hfx,calcControls,parmDict)
+#    parmDict[phfx+'Extinction'] -= 2.*delt
+#    minus = GetPwdrExt(refl,im,pfx,phfx,hfx,calcControls,parmDict)
+#    parmDict[phfx+'Extinction'] += delt
+#    return (plus-minus)/(2.*delt)    
     
 def GetIntensityCorr(refl,im,uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict):
@@ -1716 +1743 @@
         elif uniq == 'c':
             dDijDict[phfx+'D12'] = h*k
-            names.append()
     else:
         dDijDict = {phfx+'D11':h**2,phfx+'D22':k**2,phfx+'D33':l**2,

trunk/exports/G2export_csv.py

@@ -250 +250 @@
                 fmt = "{:.0f},{:.0f},{:.0f},{:.0f},{:.3f},{:.3f},{:.3f},{:.2f},{:.0f},{:d}"
                 refList = phasDict['RefList']
-                for (
-                    h,k,l,m,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr,x,x,x
-                    ) in refList:
+                for refItem in refList:
+                    h,k,l,m,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr = refItem[:12]
                     self.Write(fmt.format(h,k,l,m,pos,Fobs,Fcalc,phase,mult,i))                
             else:
@@ -258 +257 @@
                 fmt = "{:.0f},{:.0f},{:.0f},{:.3f},{:.3f},{:.3f},{:.2f},{:.0f},{:d}"
                 refList = phasDict['RefList']
-                for (
-                    h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr,x,x,x
-                    ) in refList:
+                for refItem in refList:
+                    h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr = refItem[:11]
                     self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,i))
         self.CloseFile()