From 86dfb58732f489d4068b4782f5ae8ee8efb9a38d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 18 Nov 2020 14:18:05 -0500 Subject: [PATCH] adjust to renaming of from_Eulers/Rodrigues --- PRIVATE | 2 +- processing/post/addOrientations.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PRIVATE b/PRIVATE index 2d00aa541..dd29f2cc9 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 2d00aa541f071dbfc200f32e358d324995a061f5 +Subproject commit dd29f2cc9ad2c5310840fabbfb7b5ab3ffadf07a diff --git a/processing/post/addOrientations.py b/processing/post/addOrientations.py index 6a02cca08..cb5361599 100755 --- a/processing/post/addOrientations.py +++ b/processing/post/addOrientations.py @@ -115,10 +115,10 @@ for name in filenames: if options.eulers is not None: label = options.eulers print(np.max(table.get(options.eulers),axis=0)) - o = damask.Rotation.from_Eulers(table.get(options.eulers), options.degrees) + o = damask.Rotation.from_Euler_angles(table.get(options.eulers), options.degrees) elif options.rodrigues is not None: label = options.rodrigues - o = damask.Rotation.from_Rodrigues(table.get(options.rodrigues)) + o = damask.Rotation.from_Rodrigues_vector(table.get(options.rodrigues)) elif options.matrix is not None: label = options.matrix o = damask.Rotation.from_matrix(table.get(options.matrix).reshape(-1,3,3)) @@ -137,14 +137,14 @@ for name in filenames: if 'rodrigues' in options.output: - table = table.add('ro({})'.format(label),o.as_Rodrigues(), scriptID+' '+' '.join(sys.argv[1:])) + table = table.add('ro({})'.format(label),o.as_Rodrigues_vector(), scriptID+' '+' '.join(sys.argv[1:])) if 'eulers' in options.output: - table = table.add('eu({})'.format(label),o.as_Eulers(options.degrees), scriptID+' '+' '.join(sys.argv[1:])) + table = table.add('eu({})'.format(label),o.as_Euler_angles(options.degrees),scriptID+' '+' '.join(sys.argv[1:])) if 'quaternion' in options.output: - table = table.add('qu({})'.format(label),o.as_quaternion(), scriptID+' '+' '.join(sys.argv[1:])) + table = table.add('qu({})'.format(label),o.as_quaternion(), scriptID+' '+' '.join(sys.argv[1:])) if 'matrix' in options.output: - table = table.add('om({})'.format(label),o.as_matrix(), scriptID+' '+' '.join(sys.argv[1:])) + table = table.add('om({})'.format(label),o.as_matrix(), scriptID+' '+' '.join(sys.argv[1:])) if 'axisangle' in options.output: - table = table.add('om({})'.format(label),o.as_axisangle(options.degrees), scriptID+' '+' '.join(sys.argv[1:])) + table = table.add('om({})'.format(label),o.as_axis_angle(options.degrees), scriptID+' '+' '.join(sys.argv[1:])) table.save((sys.stdout if name is None else name), legacy=True)