using new names

This commit is contained in:
Martin Diehl 2020-05-16 11:17:12 +02:00
parent 235f3c0df7
commit 9fa1539163
6 changed files with 13 additions and 13 deletions

View File

@ -84,9 +84,9 @@ if [options.angleaxis,options.quaternion].count(None) == 0:
parser.error('more than one rotation specified.') parser.error('more than one rotation specified.')
if options.angleaxis is not None: if options.angleaxis is not None:
rotation = damask.Rotation.fromAxisAngle(np.array(options.angleaxis),options.degrees,normalise=True) rotation = damask.Rotation.from_axis_angle(np.array(options.angleaxis),options.degrees,normalise=True)
elif options.quaternion is not None: elif options.quaternion is not None:
rotation = damask.Rotation.fromQuaternion(options.quaternion) rotation = damask.Rotation.from_quaternion(options.quaternion)
else: else:
rotation = damask.Rotation() rotation = damask.Rotation()

View File

@ -97,7 +97,7 @@ for name in filenames:
dataset = os.path.join(group_pointwise,options.quaternion) dataset = os.path.join(group_pointwise,options.quaternion)
try: try:
quats = np.reshape(inFile[dataset][...],(np.product(grid),4)) quats = np.reshape(inFile[dataset][...],(np.product(grid),4))
rot = [damask.Rotation.fromQuaternion(q,True,P=+1) for q in quats] rot = [damask.Rotation.from_quaternion(q,True,P=+1) for q in quats]
except KeyError: except KeyError:
errors.append('Pointwise orientation (quaternion) data ({}) not readable'.format(dataset)) errors.append('Pointwise orientation (quaternion) data ({}) not readable'.format(dataset))
@ -123,7 +123,7 @@ for name in filenames:
dataset = os.path.join(group_average,options.quaternion) dataset = os.path.join(group_average,options.quaternion)
try: try:
rot = [damask.Rotation.fromQuaternion(q,True,P=+1) for q in inFile[dataset][...][1:]] # skip first entry (unindexed) rot = [damask.Rotation.from_quaternion(q,True,P=+1) for q in inFile[dataset][...][1:]] # skip first entry (unindexed)
except KeyError: except KeyError:
errors.append('Average orientation data ({}) not readable'.format(dataset)) errors.append('Average orientation data ({}) not readable'.format(dataset))

View File

@ -59,13 +59,13 @@ if [options.rotation,options.eulers,options.matrix,options.quaternion].count(Non
parser.error('no rotation specified.') parser.error('no rotation specified.')
if options.quaternion is not None: if options.quaternion is not None:
rot = damask.Rotation.fromQuaternion(np.array(options.quaternion)) # we might need P=+1 here, too... rot = damask.Rotation.from_quaternion(np.array(options.quaternion)) # we might need P=+1 here, too...
if options.rotation is not None: if options.rotation is not None:
rot = damask.Rotation.fromAxisAngle(np.array(options.rotation),degrees=options.degrees,normalise=True,P=+1) rot = damask.Rotation.from_axis_angle(np.array(options.rotation),degrees=options.degrees,normalise=True,P=+1)
if options.matrix is not None: if options.matrix is not None:
rot = damask.Rotation.fromMatrix(np.array(options.Matrix)) rot = damask.Rotation.from_matrix(np.array(options.Matrix))
if options.eulers is not None: if options.eulers is not None:
rot = damask.Rotation.fromEulers(np.array(options.eulers),degrees=options.degrees) rot = damask.Rotation.from_Eulers(np.array(options.eulers),degrees=options.degrees)
eulers = rot.asEulers(degrees=True) eulers = rot.asEulers(degrees=True)

View File

@ -634,6 +634,6 @@ class Lattice:
otherDir = miller[otherDir_id]/ np.linalg.norm(miller[otherDir_id]) otherDir = miller[otherDir_id]/ np.linalg.norm(miller[otherDir_id])
otherMatrix = np.array([otherDir,np.cross(otherPlane,otherDir),otherPlane]) otherMatrix = np.array([otherDir,np.cross(otherPlane,otherDir),otherPlane])
r['rotations'].append(Rotation.fromMatrix(np.dot(otherMatrix.T,myMatrix))) r['rotations'].append(Rotation.from_matrix(np.dot(otherMatrix.T,myMatrix)))
return r return r

View File

@ -36,7 +36,7 @@ class Orientation:
if isinstance(rotation, Rotation): if isinstance(rotation, Rotation):
self.rotation = rotation self.rotation = rotation
else: else:
self.rotation = Rotation.fromQuaternion(rotation) # assume quaternion self.rotation = Rotation.from_quaternion(rotation) # assume quaternion
if self.rotation.quaternion.shape != (4,): if self.rotation.quaternion.shape != (4,):
raise NotImplementedError('Support for multiple rotations missing') raise NotImplementedError('Support for multiple rotations missing')

View File

@ -14,7 +14,7 @@ n = 1000
@pytest.fixture @pytest.fixture
def default(): def default():
"""A set of n random rotations.""" """A set of n random rotations."""
return [Rotation.fromRandom() for r in range(n)] return [Rotation.from_random() for r in range(n)]
@pytest.fixture @pytest.fixture
def reference_dir(reference_dir_base): def reference_dir(reference_dir_base):
@ -36,7 +36,7 @@ class TestOrientation:
@pytest.mark.parametrize('lattice',Lattice.lattices) @pytest.mark.parametrize('lattice',Lattice.lattices)
def test_IPF(self,lattice): def test_IPF(self,lattice):
direction = np.random.random(3)*2.0-1 direction = np.random.random(3)*2.0-1
for rot in [Rotation.fromRandom() for r in range(n//100)]: for rot in [Rotation.from_random() for r in range(n//100)]:
R = damask.Orientation(rot,lattice) R = damask.Orientation(rot,lattice)
color = R.IPFcolor(direction) color = R.IPFcolor(direction)
for equivalent in R.equivalentOrientations(): for equivalent in R.equivalentOrientations():
@ -45,7 +45,7 @@ class TestOrientation:
@pytest.mark.parametrize('model',['Bain','KS','GT','GT_prime','NW','Pitsch']) @pytest.mark.parametrize('model',['Bain','KS','GT','GT_prime','NW','Pitsch'])
@pytest.mark.parametrize('lattice',['fcc','bcc']) @pytest.mark.parametrize('lattice',['fcc','bcc'])
def test_relationship_forward_backward(self,model,lattice): def test_relationship_forward_backward(self,model,lattice):
ori = Orientation(Rotation.fromRandom(),lattice) ori = Orientation(Rotation.from_random(),lattice)
for i,r in enumerate(ori.relatedOrientations(model)): for i,r in enumerate(ori.relatedOrientations(model)):
ori2 = r.relatedOrientations(model)[i] ori2 = r.relatedOrientations(model)[i]
misorientation = ori.rotation.misorientation(ori2.rotation) misorientation = ori.rotation.misorientation(ori2.rotation)