Commit d04bbc18 authored by Félix Hartmann's avatar Félix Hartmann
Browse files

[bugfix] Corrects problems with how organ radii were handled.

parent 6657eec1
......@@ -1409,7 +1409,7 @@ def show_time_series(tige_id=None):
tige_hdf_id = get_hdf5_tigeid(hdf5file, cur_tige)
# Retrieving useful data as time-indexed arrays
radii = tiges_data.diam[cur_tige].mean(axis=1) # space-averaged tige radii
radii = tiges_data.diam[cur_tige].mean(axis=1) / 2 # space-averaged tige radii
x, y, s, lengths, angles, tip_angles, measure_zone, lines = \
load_postprocessed_data(hdf5file, tige_hdf_id)
......@@ -1561,7 +1561,7 @@ def show_heatmaps():
tige_hdf_id = get_hdf5_tigeid(hdf5file, cur_tige)
# Retrieving useful data as spacetime 2D-arrays
radii = tiges_data.diam[cur_tige]
radii = tiges_data.diam[cur_tige] / 2
s, angles = load_postprocessed_data(hdf5file, tige_hdf_id)[2:5:2]
# Scaling
......@@ -1570,6 +1570,7 @@ def show_heatmaps():
if scale_cmpix is not None:
length_unit, inv_length_unit = "cm", r"cm$^{-1}$"
s *= scale_cmpix
radii *= scale_cmpix
times, time_units, time_label, graduation, excluded_image, mask = get_time_data()
cur_time = times[cur_image]
......@@ -1588,7 +1589,7 @@ def show_heatmaps():
detection_step = DETECTION_STEP_DEFAULT
# Size of the averaging window
W = int(4 * round(radii.mean() / detection_step))
W = int(4 * round(2 * radii.mean() / detection_step))
# Smoothing and computation of the curvatures
smooth_s = zeros_like(angles) - 3000
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment