Merge branch 'chapman' of https://gitea.psi.ch/ext-dorofe_e/dap into chapman

This commit is contained in:
2025-07-07 09:03:20 +02:00

View File

@@ -152,11 +152,14 @@ def _calc_streakfinder_analysis(results, cryst_data: CrystData):
return
streaks = det_obj.to_streaks(detected)
detected_streaks = np.asarray(list(detected.streaks.values()))
streak_lines = streaks.lines
if x_center is not None and y_center is not None:
streaks_mask = streaks.concentric_only(x_center, y_center)
streak_lines = streak_lines[streaks_mask]
detected_streaks = detected_streaks[streaks_mask]
streak_lines = streaks.lines[streaks_mask]
streak_lengths = np.sqrt(
np.pow((streak_lines[..., 2] - streak_lines[..., 0]), 2) +
np.pow((streak_lines[..., 2] - streak_lines[..., 0]), 2)
@@ -168,7 +171,6 @@ def _calc_streakfinder_analysis(results, cryst_data: CrystData):
list_result = [line.tolist() for line in streak_lines] # arr(4, n_lines); 0coord x0, y0, x1, y1
detected_streaks = np.asarray(detected.streaks.values())[streaks_mask]
bragg_counts = [streak.total_mass() for streak in detected_streaks]
results.update({"number_of_streaks": number_of_streaks})