223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed ORs

This commit is contained in:
Martin Diehl 2015-06-25 12:00:08 +00:00
parent 81e09cabee
commit f10dfa311a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/damask/orientation.py
View File

@ -895,12 +895,11 @@ class Orientation:
def related(self, relationModel, direction, targetSymmetry = None): def related(self, relationModel, direction, targetSymmetry = None):
if relationModel not in ['KS','GT',"GT'",'NW','Bain']: return None if relationModel not in ['KS','GT',"GT'",'NW','Bain']: return None
if int(direction) == 0: return None
variant = int(abs(direction)) variant = int(abs(direction))-1
(me,other) = (0,1) if direction > 0 else (1,0) (me,other) = (0,1) if direction > 0 else (1,0)
variant -= 1 # why not subtracting two lines above??
planes = {'KS': \ planes = {'KS': \
np.array([[[ 1, 1, 1],[ 0, 1, 1]],\ np.array([[[ 1, 1, 1],[ 0, 1, 1]],\
[[ 1, 1, 1],[ 0, 1, 1]],\ [[ 1, 1, 1],[ 0, 1, 1]],\
@ -1088,17 +1087,18 @@ class Orientation:
[[ 0, 0, 1],[ 1, 0, 1]], [[ 0, 0, 1],[ 1, 0, 1]],
[[ 1, 0, 0],[ 1, 1, 0]]]), [[ 1, 0, 0],[ 1, 1, 0]]]),
} }
myPlane = planes [relationModel][variant,me] myPlane = [float(i) for i in planes[relationModel][variant,me]] # map(float, planes[...]) does not work in python 3
myPlane /= np.linalg.norm(myPlane) myPlane /= np.linalg.norm(myPlane)
myNormal = normals[relationModel][variant,me] myNormal = [float(i) for i in normals[relationModel][variant,me]] # map(float, planes[...]) does not work in python 3
myNormal /= np.linalg.norm(myNormal) myNormal /= np.linalg.norm(myNormal)
myMatrix = np.array([myPlane,myNormal,np.cross(myNormal,myPlane)]) myMatrix = np.array([myPlane,myNormal,np.cross(myNormal,myPlane)])
otherPlane = planes [relationModel][variant,other] otherPlane = [float(i) for i in planes[relationModel][variant,other]] # map(float, planes[...]) does not work in python 3
otherPlane /= np.linalg.norm(otherPlane) otherPlane /= np.linalg.norm(otherPlane)
otherNormal = normals[relationModel][variant,other] otherNormal = [float(i) for i in normals[relationModel][variant,other]] # map(float, planes[...]) does not work in python 3
otherNormal /= np.linalg.norm(otherNormal) otherNormal /= np.linalg.norm(otherNormal)
otherMatrix = np.array([otherPlane,otherNormal,np.cross(otherNormal,otherPlane)]) otherMatrix = np.array([otherPlane,otherNormal,np.cross(otherNormal,otherPlane)])
myMatrix = np.dot(self.asMatrix(),myMatrix)
return Orientation(matrix=np.dot(otherMatrix.T,myMatrix)) # no symmetry information ?? rot=np.dot(otherMatrix,myMatrix.T)
return Orientation(matrix=np.dot(rot,self.asMatrix())) # no symmetry information ??