From 7b1e7af3c50688cc89f561f22b6cd9ba057037f3 Mon Sep 17 00:00:00 2001 From: Mayeul Aubin Date: Wed, 9 Apr 2025 14:46:15 +0200 Subject: [PATCH] minor changes --- analysis/slices.py | 31 ++++++++++++++++++++++--------- main.py | 4 ++-- monofonic.py | 1 + parameters_monofonic.py | 1 - 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/analysis/slices.py b/analysis/slices.py index 8b260cc..b3fa8e1 100644 --- a/analysis/slices.py +++ b/analysis/slices.py @@ -83,15 +83,28 @@ def plot_imshow_with_reference( data_list, axes[1, i].text(0.5, 0.9, f"Score: {score(data, reference):.2e}", fontsize=10, transform=axes[1, i].transAxes, color='white') # plt.tight_layout() else: - for i, data in enumerate(data_list): - im = axes[i].imshow(data, cmap=cmap, origin='lower', vmin=vmin, vmax=vmax) - axes[i].set_title(titles[i], fontsize=fs_titles) - axes[i].set_xticks(ticks[i]) - axes[i].set_yticks(ticks[i]) - axes[i].set_xticklabels(tick_labels[i]) - axes[i].set_yticklabels(tick_labels[i]) - axes[i].set_xlabel('Mpc/h') - fig.colorbar(im, ax=axes[:], orientation='vertical') + + if len(data_list) == 1: + data_list = data_list[0] + im = axes.imshow(data_list, cmap=cmap, origin='lower', vmin=vmin, vmax=vmax) + axes.set_title(titles[0], fontsize=fs_titles) + axes.set_xticks(ticks[0]) + axes.set_yticks(ticks[0]) + axes.set_xticklabels(tick_labels[0]) + axes.set_yticklabels(tick_labels[0]) + axes.set_xlabel('Mpc/h') + fig.colorbar(im, ax=axes, orientation='vertical') + + else: + for i, data in enumerate(data_list): + im = axes[i].imshow(data, cmap=cmap, origin='lower', vmin=vmin, vmax=vmax) + axes[i].set_title(titles[i], fontsize=fs_titles) + axes[i].set_xticks(ticks[i]) + axes[i].set_yticks(ticks[i]) + axes[i].set_xticklabels(tick_labels[i]) + axes[i].set_yticklabels(tick_labels[i]) + axes[i].set_xlabel('Mpc/h') + fig.colorbar(im, ax=axes[:], orientation='vertical') return fig, axes diff --git a/main.py b/main.py index 54be5a7..357f93a 100644 --- a/main.py +++ b/main.py @@ -136,7 +136,7 @@ def main(parsed_args): from parameters_card import parse_arguments_card, main_parameter_card from timestepping import main_timestepping from ICs import main_ICs - from scola import main_scola, main_pre_scola, main_post_scola + from scola import main_scola, main_pre_scola, main_post_scola, have_all_tiles card_dict = main_parameter_card(parsed_args) @@ -177,7 +177,7 @@ def main(parsed_args): print_message("Running sCOLA.", 1, "control", verbose=parsed_args.verbose) main_scola(parsed_args) - if parsed_args.execution == "slurm": + if parsed_args.execution == "slurm" and not have_all_tiles(parsed_args): from tqdm import tqdm from low_level import progress_bar_from_logfile for b in tqdm(range(1,parsed_args.N_tiles**3+1), desc="sCOLA", unit="box", disable=(parsed_args.verbose==0)): diff --git a/monofonic.py b/monofonic.py index 6c0da8e..4fe11ee 100644 --- a/monofonic.py +++ b/monofonic.py @@ -9,6 +9,7 @@ def main_monofonic(parsed_args): print_starting_module("monofonic", verbose=parsed_args.verbose) monofonic_dict=main_parameters_monofonic(parsed_args) + # raise SystemExit # Exit the program after writing the config file to avoid running monofonic if parsed_args.execution == "local": print_message("Running monofonic in local mode.", 1, "monofonic", verbose=parsed_args.verbose) diff --git a/parameters_monofonic.py b/parameters_monofonic.py index 5554517..ead1055 100644 --- a/parameters_monofonic.py +++ b/parameters_monofonic.py @@ -140,7 +140,6 @@ def main_parameters_monofonic(parsed_args): return monofonic_dict create_monofonic_config(monofonic_dict["config"], get_config_from_dict(monofonic_dict)) print_message(f"Configuration file written to {monofonic_dict["config"]}", 2, "monofonic", verbose=parsed_args.verbose) - return monofonic_dict