Set aspect ratio for density-temperature plots (#277)

* Set aspect ratio for density-temperature plots * Format * Update other scripts * One more
SWIFTSIM · Mar 27, 2024 · f7aa6a5 · f7aa6a5
1 parent c517e4e
commit f7aa6a5
Show file tree

Hide file tree

Showing 21 changed files with 147 additions and 21 deletions.
diff --git a/colibre/scripts/bh_masses.py b/colibre/scripts/bh_masses.py
@@ -51,8 +51,14 @@ def setup_axes(mass_bounds, number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/birth_density_metallicity.py b/colibre/scripts/birth_density_metallicity.py
@@ -74,8 +74,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/birth_density_redshift.py b/colibre/scripts/birth_density_redshift.py
@@ -60,8 +60,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/birth_density_temperature.py b/colibre/scripts/birth_density_temperature.py
@@ -62,8 +62,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/birth_metallicity_redshift.py b/colibre/scripts/birth_metallicity_redshift.py
@@ -72,8 +72,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_internal_energy.py b/colibre/scripts/density_internal_energy.py
@@ -61,8 +61,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_pressure.py b/colibre/scripts/density_pressure.py
@@ -63,8 +63,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_species_depletions.py b/colibre/scripts/density_species_depletions.py
@@ -195,8 +195,14 @@ def setup_axes(number_of_simulations: int, prop_type="hydro"):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_species_diffuse.py b/colibre/scripts/density_species_diffuse.py
@@ -197,8 +197,14 @@ def setup_axes(number_of_simulations: int, prop_type="hydro"):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_species_interp.py b/colibre/scripts/density_species_interp.py
@@ -198,8 +198,14 @@ def setup_axes(number_of_simulations: int, prop_type="hydro"):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_temperature.py b/colibre/scripts/density_temperature.py
@@ -63,8 +63,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_temperature_dust.py b/colibre/scripts/density_temperature_dust.py
@@ -83,8 +83,14 @@ def setup_axes(number_of_simulations: int, prop_type="hydro"):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_temperature_dust2metal.py b/colibre/scripts/density_temperature_dust2metal.py
@@ -90,8 +90,14 @@ def setup_axes(number_of_simulations: int, prop_type="hydro"):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_temperature_dust_to_metals.py b/colibre/scripts/density_temperature_dust_to_metals.py
@@ -92,8 +92,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_temperature_metals.py b/colibre/scripts/density_temperature_metals.py
@@ -75,8 +75,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_temperature_sf_fraction.py b/colibre/scripts/density_temperature_sf_fraction.py
@@ -88,8 +88,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/density_temperature_species.py b/colibre/scripts/density_temperature_species.py
@@ -91,8 +91,14 @@ def setup_axes(number_of_simulations: int, prop_type="hydro"):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/gas_minimal_smoothing_length_redshift.py b/colibre/scripts/gas_minimal_smoothing_length_redshift.py
@@ -120,8 +120,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/max_temperature_redshift.py b/colibre/scripts/max_temperature_redshift.py
@@ -65,8 +65,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/median_temperature_density.py b/colibre/scripts/median_temperature_density.py
@@ -47,8 +47,14 @@
             nlabel % number_of_simulations > 0
         )
 
+    fig_w, fig_h = pl.figaspect(vertical_number / horizontal_number)
     fig, ax = pl.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax

diff --git a/colibre/scripts/particle_updates_step_cost.py b/colibre/scripts/particle_updates_step_cost.py
@@ -71,8 +71,14 @@ def setup_axes(number_of_simulations: int):
     # Ensure >= number_of_simulations plots in a grid
     vertical_number = int(np.ceil(number_of_simulations / horizontal_number))
 
+    fig_w, fig_h = plt.figaspect(vertical_number / horizontal_number)
     fig, ax = plt.subplots(
-        vertical_number, horizontal_number, squeeze=True, sharex=True, sharey=True
+        vertical_number,
+        horizontal_number,
+        squeeze=True,
+        sharex=True,
+        sharey=True,
+        figsize=(fig_w, fig_h),
     )
 
     ax = np.array([ax]) if number_of_simulations == 1 else ax