Changeset 1767


Ignore:
Timestamp:
Mar 30, 2015 7:39:25 AM (7 years ago)
Author:
vondreele
Message:

fix texture calculation - now matches GSAS

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMath.py

    r1766 r1767  
    11461146    cell = G2lat.Gmat2cell(g)
    11471147    Sangls = [parmDict[pfx+'SH omega'],parmDict[pfx+'SH chi'],parmDict[pfx+'SH phi']]
    1148     Gangls = [parmDict[hfx+'Omega'],parmDict[hfx+'Chi'],parmDict[hfx+'Phi'],parmDict[hfx+'Azimuth']]
     1148    Gangls = [parmDict[hfx+'Phi'],parmDict[hfx+'Chi'],parmDict[hfx+'Omega'],parmDict[hfx+'Azimuth']]
    11491149    phi,beta = G2lat.CrsAng(H,cell,SGData)
    11501150    psi,gam,x,x = G2lat.SamAng(tth/2.,Gangls,Sangls,IFCoup) #ignore 2 sets of angle derivs.
     
    11721172    cell = G2lat.Gmat2cell(g)
    11731173    Sangls = [parmDict[pfx+'SH omega'],parmDict[pfx+'SH chi'],parmDict[pfx+'SH phi']]
    1174     Gangls = [parmDict[hfx+'Omega'],parmDict[hfx+'Chi'],parmDict[hfx+'Phi'],parmDict[hfx+'Azimuth']]
     1174    Gangls = [parmDict[hfx+'Phi'],parmDict[hfx+'Chi'],parmDict[hfx+'Omega'],parmDict[hfx+'Azimuth']]
    11751175    phi,beta = G2lat.CrsAng(H,cell,SGData)
    11761176    psi,gam,dPSdA,dGMdA = G2lat.SamAng(tth/2.,Gangls,Sangls,IFCoup)
  • trunk/imports/G2pwd_fxye.py

    r1766 r1767  
    202202        def GetTimeMap(File,Pos,TimeMap):
    203203            File.seek(Pos)
    204             cons = TimeMap.split()
     204            cons = TimeMap[8:].split()
     205            mapNo = int(cons[0])
    205206            Nch = int(cons[1])
    206207            Nrec = int(cons[2])
     
    283284                        Banks.append(S)
    284285                        Pos.append(filepointer.tell())
    285                     if S[:8] == 'TIME_MAP':
     286                    if S[:8] == 'TIME_MAP':     #assumes one time map; HIPPO has multiple time maps
    286287                        if len(Banks) == 0:
    287288                            self.errors = 'Error reading time map before any bank lines'
Note: See TracChangeset for help on using the changeset viewer.