From 079e683dd181be27bf26c6fd7b4860555793899f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 17 Apr 2019 10:48:18 +0200 Subject: [PATCH] disorientation returns Orientation, not Rotation --- python/damask/orientation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/damask/orientation.py b/python/damask/orientation.py index 4a6d4e05d..94ce9c416 100644 --- a/python/damask/orientation.py +++ b/python/damask/orientation.py @@ -899,8 +899,8 @@ class Orientation: (Currently requires same symmetry for both orientations. Look into A. Heinz and P. Neumann 1991 for cases with differing sym.) """ - #if self.lattice.symmetry != other.lattice.symmetry: - # raise NotImplementedError('disorientation between different symmetry classes not supported yet.') + if self.lattice.symmetry != other.lattice.symmetry: + raise NotImplementedError('disorientation between different symmetry classes not supported yet.') mySymEqs = self.equivalentOrientations() if SST else self.equivalentOrientations([0]) # take all or only first sym operation otherSymEqs = other.equivalentOrientations() @@ -918,7 +918,7 @@ class Orientation: if breaker: break if breaker: break - return (r, i,j, k == 1) if symmetries else r # disorientation ... + return (Orientation(r,self.lattice), i,j, k == 1) if symmetries else Orientation(r,self.lattice)# disorientation ... # ... own sym, other sym, # self-->other: True, self<--other: False