From b84d39fe005b8401099b3780551002e63a87e55e Mon Sep 17 00:00:00 2001 From: Jun Xue Date: Thu, 9 Apr 2026 19:29:32 +0200 Subject: [PATCH] Set nearest-neighbor EBSD resampling and fix ntot calculation --- src/kanapy/ebsd_hex_grid.py | 2 +- src/kanapy/texture.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kanapy/ebsd_hex_grid.py b/src/kanapy/ebsd_hex_grid.py index 22774912..7fda9269 100644 --- a/src/kanapy/ebsd_hex_grid.py +++ b/src/kanapy/ebsd_hex_grid.py @@ -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 ): """ diff --git a/src/kanapy/texture.py b/src/kanapy/texture.py index cbfc3131..7d56ff65 100644 --- a/src/kanapy/texture.py +++ b/src/kanapy/texture.py @@ -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