Changeset 1767
- Timestamp:
- Mar 30, 2015 7:39:25 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIstrMath.py
r1766 r1767 1146 1146 cell = G2lat.Gmat2cell(g) 1147 1147 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']] 1149 1149 phi,beta = G2lat.CrsAng(H,cell,SGData) 1150 1150 psi,gam,x,x = G2lat.SamAng(tth/2.,Gangls,Sangls,IFCoup) #ignore 2 sets of angle derivs. … … 1172 1172 cell = G2lat.Gmat2cell(g) 1173 1173 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']] 1175 1175 phi,beta = G2lat.CrsAng(H,cell,SGData) 1176 1176 psi,gam,dPSdA,dGMdA = G2lat.SamAng(tth/2.,Gangls,Sangls,IFCoup) -
trunk/imports/G2pwd_fxye.py
r1766 r1767 202 202 def GetTimeMap(File,Pos,TimeMap): 203 203 File.seek(Pos) 204 cons = TimeMap.split() 204 cons = TimeMap[8:].split() 205 mapNo = int(cons[0]) 205 206 Nch = int(cons[1]) 206 207 Nrec = int(cons[2]) … … 283 284 Banks.append(S) 284 285 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 286 287 if len(Banks) == 0: 287 288 self.errors = 'Error reading time map before any bank lines'
Note: See TracChangeset
for help on using the changeset viewer.