updated scripts that still used formerly valid object properties of quaternions
This commit is contained in:
parent
e48fd338bc
commit
c0f7ae2798
|
@ -855,7 +855,7 @@ class Orientation:
|
||||||
M = closest.quaternion.asM() * n if i == 0 else M + closest.quaternion.asM() * n # noqa add (multiples) of this orientation to average noqa
|
M = closest.quaternion.asM() * n if i == 0 else M + closest.quaternion.asM() * n # noqa add (multiples) of this orientation to average noqa
|
||||||
eig, vec = np.linalg.eig(M/N)
|
eig, vec = np.linalg.eig(M/N)
|
||||||
|
|
||||||
return Orientation(quaternion = Quaternion(quatArray = np.real(vec.T[eig.argmax()])),
|
return Orientation(quaternion = Quaternion(quat = np.real(vec.T[eig.argmax()])),
|
||||||
symmetry = reference.symmetry.lattice)
|
symmetry = reference.symmetry.lattice)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -200,9 +200,9 @@ for name in filenames:
|
||||||
if gID != -1 and gID not in alreadyChecked: # indexed point belonging to a grain not yet tested?
|
if gID != -1 and gID not in alreadyChecked: # indexed point belonging to a grain not yet tested?
|
||||||
alreadyChecked[gID] = True # remember not to check again
|
alreadyChecked[gID] = True # remember not to check again
|
||||||
disorientation = o.disorientation(orientations[gID],SST = False)[0] # compare against other orientation
|
disorientation = o.disorientation(orientations[gID],SST = False)[0] # compare against other orientation
|
||||||
if disorientation.quaternion.w > cos_disorientation: # within threshold ...
|
if disorientation.quaternion.q > cos_disorientation: # within threshold ...
|
||||||
candidates.append(gID) # remember as potential candidate
|
candidates.append(gID) # remember as potential candidate
|
||||||
if disorientation.quaternion.w >= bestDisorientation.w: # ... and better than current best?
|
if disorientation.quaternion.q >= bestDisorientation.q: # ... and better than current best?
|
||||||
matched = True
|
matched = True
|
||||||
matchedID = gID # remember that grain
|
matchedID = gID # remember that grain
|
||||||
bestDisorientation = disorientation.quaternion
|
bestDisorientation = disorientation.quaternion
|
||||||
|
|
|
@ -258,7 +258,7 @@ for name in filenames:
|
||||||
|
|
||||||
if len(grains) > 0: # check immediate neighborhood first
|
if len(grains) > 0: # check immediate neighborhood first
|
||||||
cos_disorientations = np.array([o.disorientation(orientations[grainID],
|
cos_disorientations = np.array([o.disorientation(orientations[grainID],
|
||||||
SST = False)[0].quaternion.w \
|
SST = False)[0].quaternion.q \
|
||||||
for grainID in grains]) # store disorientation per grainID
|
for grainID in grains]) # store disorientation per grainID
|
||||||
closest_grain = np.argmax(cos_disorientations) # grain among grains with closest orientation to myself
|
closest_grain = np.argmax(cos_disorientations) # grain among grains with closest orientation to myself
|
||||||
match = 'local'
|
match = 'local'
|
||||||
|
@ -269,7 +269,7 @@ for name in filenames:
|
||||||
|
|
||||||
if len(grains) > 0:
|
if len(grains) > 0:
|
||||||
cos_disorientations = np.array([o.disorientation(orientations[grainID],
|
cos_disorientations = np.array([o.disorientation(orientations[grainID],
|
||||||
SST = False)[0].quaternion.w \
|
SST = False)[0].quaternion.q \
|
||||||
for grainID in grains]) # store disorientation per grainID
|
for grainID in grains]) # store disorientation per grainID
|
||||||
closest_grain = np.argmax(cos_disorientations) # grain among grains with closest orientation to myself
|
closest_grain = np.argmax(cos_disorientations) # grain among grains with closest orientation to myself
|
||||||
match = 'global'
|
match = 'global'
|
||||||
|
|
Loading…
Reference in New Issue