Changeset 1767

Timestamp:

Mar 30, 2015 7:39:25 AM (8 years ago)

Author:

vondreele

Message:

fix texture calculation - now matches GSAS

Location:

trunk

Files:

• GSASIIstrMath.py (modified) (2 diffs)
• imports/G2pwd_fxye.py (modified) (2 diffs)

trunk/GSASIIstrMath.py

@@ -1146 +1146 @@
     cell = G2lat.Gmat2cell(g)
     Sangls = [parmDict[pfx+'SH omega'],parmDict[pfx+'SH chi'],parmDict[pfx+'SH phi']]
-    Gangls = [parmDict[hfx+'Omega'],parmDict[hfx+'Chi'],parmDict[hfx+'Phi'],parmDict[hfx+'Azimuth']]
+    Gangls = [parmDict[hfx+'Phi'],parmDict[hfx+'Chi'],parmDict[hfx+'Omega'],parmDict[hfx+'Azimuth']]
     phi,beta = G2lat.CrsAng(H,cell,SGData)
     psi,gam,x,x = G2lat.SamAng(tth/2.,Gangls,Sangls,IFCoup) #ignore 2 sets of angle derivs.
@@ -1172 +1172 @@
     cell = G2lat.Gmat2cell(g)
     Sangls = [parmDict[pfx+'SH omega'],parmDict[pfx+'SH chi'],parmDict[pfx+'SH phi']]
-    Gangls = [parmDict[hfx+'Omega'],parmDict[hfx+'Chi'],parmDict[hfx+'Phi'],parmDict[hfx+'Azimuth']]
+    Gangls = [parmDict[hfx+'Phi'],parmDict[hfx+'Chi'],parmDict[hfx+'Omega'],parmDict[hfx+'Azimuth']]
     phi,beta = G2lat.CrsAng(H,cell,SGData)
     psi,gam,dPSdA,dGMdA = G2lat.SamAng(tth/2.,Gangls,Sangls,IFCoup)

trunk/imports/G2pwd_fxye.py

@@ -202 +202 @@
         def GetTimeMap(File,Pos,TimeMap):
             File.seek(Pos)
-            cons = TimeMap.split()
+            cons = TimeMap[8:].split()
+            mapNo = int(cons[0])
             Nch = int(cons[1])
             Nrec = int(cons[2])
@@ -283 +284 @@
                         Banks.append(S)
                         Pos.append(filepointer.tell())
-                    if S[:8] == 'TIME_MAP':
+                    if S[:8] == 'TIME_MAP':     #assumes one time map; HIPPO has multiple time maps
                         if len(Banks) == 0:
                             self.errors = 'Error reading time map before any bank lines'