diff --git a/processing/pre/geom_fromDREAM3D.py b/processing/pre/geom_fromDREAM3D.py index b000aa811..c48698e53 100755 --- a/processing/pre/geom_fromDREAM3D.py +++ b/processing/pre/geom_fromDREAM3D.py @@ -140,7 +140,7 @@ for name in filenames: config_header = [''] for i in range(np.nanmax(microstructure)): config_header += ['[{}{}]'.format(label,i+1), - '(gauss)\tphi1 {:.2f}\tPhi {:.2f}\tphi2 {:.2f}'.format(*rot[i].asEulers(degrees = True)), + '(gauss)\tphi1 {:.2f}\tPhi {:.2f}\tphi2 {:.2f}'.format(*rot[i].as_Eulers(degrees = True)), ] config_header += [''] for i in range(np.nanmax(microstructure)): diff --git a/processing/pre/geom_fromTable.py b/processing/pre/geom_fromTable.py index f6c9ba38e..be5b3a23c 100755 --- a/processing/pre/geom_fromTable.py +++ b/processing/pre/geom_fromTable.py @@ -89,7 +89,7 @@ for name in filenames: for i,data in enumerate(unique): ori = damask.Rotation(data[0:4]) config_header += ['[Grain{}]'.format(i+1), - '(gauss)\tphi1 {:.2f}\tPhi {:.2f}\tphi2 {:.2f}'.format(*ori.asEulers(degrees = True)), + '(gauss)\tphi1 {:.2f}\tPhi {:.2f}\tphi2 {:.2f}'.format(*ori.as_Eulers(degrees = True)), ] if options.axes is not None: config_header += ['axes\t{} {} {}'.format(*options.axes)] diff --git a/processing/pre/geom_rotate.py b/processing/pre/geom_rotate.py index 7a774200b..dc2e8e2a3 100755 --- a/processing/pre/geom_rotate.py +++ b/processing/pre/geom_rotate.py @@ -67,7 +67,7 @@ if options.matrix is not None: if options.eulers is not None: rot = damask.Rotation.from_Eulers(np.array(options.eulers),degrees=options.degrees) -eulers = rot.asEulers(degrees=True) +eulers = rot.as_Eulers(degrees=True) if filenames == []: filenames = [None] diff --git a/python/damask/_rotation.py b/python/damask/_rotation.py index 44484ccd9..bf5a2a4f3 100644 --- a/python/damask/_rotation.py +++ b/python/damask/_rotation.py @@ -305,15 +305,6 @@ class Rotation: """ return np.einsum('...i,...j',self.quaternion,self.quaternion) - # for compatibility (old names do not follow convention) - asM = M - asQuaternion = as_quaternion - asEulers = as_Eulers - asAxisAngle = as_axis_angle - asMatrix = as_matrix - asRodrigues = as_Rodrigues - asHomochoric = as_homochoric - asCubochoric = as_cubochoric ################################################################################################ # Static constructors. The input data needs to follow the conventions, options allow to @@ -505,13 +496,8 @@ class Rotation: # for compatibility (old names do not follow convention) fromQuaternion = from_quaternion fromEulers = from_Eulers - fromAxisAngle = from_axis_angle - fromBasis = from_basis - fromMatrix = from_matrix - fromRodrigues = from_Rodrigues - fromHomochoric = from_homochoric - fromCubochoric = from_cubochoric - fromRandom = from_random + asAxisAngle = as_axis_angle + #################################################################################################### # Code below available according to the following conditions on https://github.com/MarDiehl/3Drotations