Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/kanapy/ebsd_hex_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def resample_quat_knn_markley(quat_src, idx, dist, p=2.0):
def resample_ebsd_to_rect_grid(
xy, phase, quat, iq,
dx_out=None, dy_out=None, nx=None, ny=None, bounds=None,
k_phase=7, k_iq=7, k_quat=9,
k_phase=1, k_iq=1, k_quat=1,
p_iq=2.0, p_quat=2.0
):
"""
Expand Down
4 changes: 3 additions & 1 deletion src/kanapy/texture.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ def merge_nodes(G, node1, node2):
"""
# merge pixel lists of node 1 into node 2, delete node 1
G.nodes[node2]['pixels'] = np.concatenate((G.nodes[node1]['pixels'], G.nodes[node2]['pixels']))
ntot = len(G.nodes)
npix1 = G.nodes[node1]['npix']
npix2 = G.nodes[node2]['npix']
ntot = npix1 + npix2
G.nodes[node2]['ori_av'] = (G.nodes[node1]['ori_av'] * G.nodes[node1]['npix'] +
G.nodes[node2]['ori_av'] * G.nodes[node2]['npix']) / ntot
G.nodes[node2]['npix'] = ntot # update length
Expand Down
Loading