diff --git a/experiment/meteo_france_SCM_study/main_visualize.py b/experiment/meteo_france_SCM_study/main_visualize.py
index 2d87709b9e28a0c8bcfd2631b92a9f65bff9c2a0..0df66c6d006c4956e7a90c7a9cce7ee2db2f9553 100644
--- a/experiment/meteo_france_SCM_study/main_visualize.py
+++ b/experiment/meteo_france_SCM_study/main_visualize.py
@@ -33,11 +33,11 @@ def study_iterator(study_class, only_first_one=False, both_altitude=False, verbo
def extended_visualization():
- save_to_file = True
+ save_to_file = False
only_first_one = True
- for study_class in SCM_EXTENDED_STUDIES[:]:
+ for study_class in SCM_EXTENDED_STUDIES[-1:]:
for study in study_iterator(study_class, only_first_one=only_first_one):
- study_visualizer = StudyVisualizer(study, save_to_file=save_to_file, only_one_graph=True, plot_block_maxima_quantiles=True)
+ study_visualizer = StudyVisualizer(study, save_to_file=save_to_file, only_one_graph=True, plot_block_maxima_quantiles=False)
# study_visualizer.visualize_all_mean_and_max_graphs()
study_visualizer.visualize_all_experimental_law()
# for study_class in SCM_EXTENDED_STUDIES[:]:
@@ -73,6 +73,6 @@ def complete_analysis(only_first_one=False):
if __name__ == '__main__':
- normal_visualization()
- # extended_visualization()
+ # normal_visualization()
+ extended_visualization()
# complete_analysis()
diff --git a/experiment/meteo_france_SCM_study/safran/safran_visualizer.py b/experiment/meteo_france_SCM_study/safran/safran_visualizer.py
index bfbb7cdde6f544b76ab5f9a89afb1a8f5a4a72f9..0f5ed77e93b30c9f8b402aa007f684ddec547a8d 100644
--- a/experiment/meteo_france_SCM_study/safran/safran_visualizer.py
+++ b/experiment/meteo_france_SCM_study/safran/safran_visualizer.py
@@ -109,7 +109,9 @@ class StudyVisualizer(object):
ax2 = ax.twiny() if self.vertical_kde_plot else ax.twinx()
color_hist = 'k'
orientation = "horizontal" if self.vertical_kde_plot else 'vertical'
- ax2.hist(all_massif_data, bins=50, density=True, histtype='step', color=color_hist, orientation=orientation)
+ weights = np.ones_like(all_massif_data) / float(len(all_massif_data))
+ ax2.hist(all_massif_data, weights=weights, bins=50,
+ histtype='step', color=color_hist, orientation=orientation)
label_function = ax2.set_xlabel if self.vertical_kde_plot else ax2.set_ylabel
# Do not display this label in the vertical plot
if not self.vertical_kde_plot: