Changeset 1405


Ignore:
Timestamp:
Jul 2, 2014 3:45:13 PM (7 years ago)
Author:
vondreele
Message:

fix strain math - remove extra tan(theta) term now [111] & [222] match

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r1404 r1405  
    48404840                G2frame.dataDisplay.SetCellStyle(row,deltaChiCol,color=wx.Colour(255,255,0))
    48414841    G2frame.dataDisplay.InstallGridToolTip(GridSetToolTip,GridColLblToolTip)
    4842     #======================================================================
    4843     # end UpdateSeqResults; done processing sequential results
    4844     #======================================================================
    48454842   
    48464843################################################################################
  • trunk/GSASIIimage.py

    r1399 r1405  
    972972    for ring in StrSta['d-zero']:
    973973        Eij = ring['Emat']
    974         E = [[Eij[2],Eij[1],0],[Eij[1],Eij[0],0],[0,0,0]]
     974        E = [[Eij[0],Eij[1],0],[Eij[1],Eij[2],0],[0,0,0]]
    975975        th,azm = ring['ImtaObs']
    976976        th0 = np.ones_like(azm)*npasind(wave/(2.*ring['Dset']))
     
    996996    b = -npcosd(azm)*npcosd(th)
    997997    c = npsind(th)*npsind(omg)-npsind(azm)*npcosd(th)*npcosd(omg)
    998     d = a*npcosd(phi)-b*npsind(phi)
    999     e = a*npsind(phi)+b*npcosd(phi)
     998    d = a*npsind(phi)+b*npcosd(phi)
     999    e = a*npcosd(phi)-b*npsind(phi)
    10001000    Fij = np.array([
    10011001        [d**2,d*e,c*d],
    10021002        [d*e,e**2,c*e],
    10031003        [c*d,c*e,c**2]])
    1004     return -Fij*nptand(th)
     1004    return -Fij
    10051005
    10061006def FitStrain(rings,p0,dset,wave,phi,StaType):
     
    10231023       
    10241024    def strainCalc(p,xyd,dset,wave,phi,StaType):
    1025         E = np.array([[p[2],p[1],0],[p[1],p[0],0],[0,0,0]])
     1025        E = np.array([[p[0],p[1],0],[p[1],p[2],0],[0,0,0]])
    10261026        dspo,azm,dsp = xyd
    10271027        th = npasind(wave/(2.0*dspo))
Note: See TracChangeset for help on using the changeset viewer.