Update Colibre config for SOAP-HBT (#289)

* Update structure type * Plot centrals and satellite ages * Add PDF of dust to metal fraction * Add Traina and Scholte data * Add plots from PR#284 * Clean up MZR plots * Add Sommovigo and Sarkar data * Add dust mass density data * Update dust mass evolution axis limits * Fix broken plots * Squash structure type bug * Add Van Der Wel data * Fix scripts for high-z data * Fix mask for particles heated by SNII * Use seed mass to determine merger mass * Format * Add Mg/H plots (#286) * Calculate satellite fractions (#287) * Add satellite fraction script * Determine passive galaxies in script * Fix various warnings * Remove pycache * Add satellite fractions (#288) * Add satellite fraction script * Determine passive galaxies in script * Fix various warnings * Format * Convert new SOAP quantities back to original (#290) * Consistent format version * Format * Update submodule --------- Co-authored-by: Evgenii Chaikin <[email protected]>
SWIFTSIM · Nov 11, 2024 · 19b35c0 · 19b35c0
1 parent 49eee8a
commit 19b35c0
Show file tree

Hide file tree

Showing 47 changed files with 964 additions and 242 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
 
       # Installs required Python modules
       - name: Install Python modules
-        run: python3 -m pip install black==22.1.0
+        run: python3 -m pip install click==8.0.4 black==19.3b0
 
       # Runs the formatting script
       - name: Formatting

diff --git a/colibre/auto_plotter/ages.yml b/colibre/auto_plotter/ages.yml
@@ -60,3 +60,67 @@ stellar_mass_ages_50:
     caption: Median age of stars within the 50 kpc 3D aperture of each galaxy.
   observational_data:
     - filename: GalaxyStellarMassStellarAges/Gallazzi2005_Data.hdf5
+
+stellar_mass_ages_centrals_50:
+  type: "scatter"
+  legend_loc: "lower right"
+  select_structure_type: 1
+  y:
+    quantity: "stellar_age.tage_star"
+    units: yr
+    start: 1e8
+    end: 3e10
+  x:
+    quantity: "apertures.mass_star_50_kpc"
+    units: solar_mass
+    start: 1e7
+    end: 1e12
+  median:
+    plot: true
+    log: true
+    number_of_bins: 25
+    adaptive: true
+    start:
+      value: 1e7
+      units: solar_mass
+    end:
+      value: 1e12
+      units: solar_mass
+  metadata:
+    title: "Stellar mass - Stellar age relation (50 kpc aperture, centrals only)"
+    section: Ages
+    caption: Median age of stars within the 50 kpc 3D aperture of each galaxy, showing central galaxies only.
+  observational_data:
+    - filename: GalaxyStellarMassStellarAges/Gallazzi2005_Data.hdf5
+
+stellar_mass_ages_satellites_50:
+  type: "scatter"
+  legend_loc: "lower right"
+  select_structure_type: 0
+  y:
+    quantity: "stellar_age.tage_star"
+    units: yr
+    start: 1e8
+    end: 3e10
+  x:
+    quantity: "apertures.mass_star_50_kpc"
+    units: solar_mass
+    start: 1e7
+    end: 1e12
+  median:
+    plot: true
+    log: true
+    number_of_bins: 25
+    adaptive: true
+    start:
+      value: 1e7
+      units: solar_mass
+    end:
+      value: 1e12
+      units: solar_mass
+  metadata:
+    title: "Stellar mass - Stellar age relation (50 kpc aperture, satellites only)"
+    section: Ages
+    caption: Median age of stars within the 50 kpc 3D aperture of each galaxy, showing satellite galaxies only.
+  observational_data:
+    - filename: GalaxyStellarMassStellarAges/Gallazzi2005_Data.hdf5
diff --git a/colibre/auto_plotter/baryon_fractions.yml b/colibre/auto_plotter/baryon_fractions.yml
@@ -1,6 +1,6 @@
 baryon_fraction_500:
-  type: "2dhistogram"
-  select_structure_type: 10
+  type: "scatter"
+  select_structure_type: 1
   comment: "Centrals only"
   legend_loc: "upper left"
   x:
@@ -34,8 +34,8 @@ baryon_fraction_500:
     - filename: HaloMassBaryonFractions/Zhang2011.hdf5
 
 gas_fraction_500_no_bias:
-  type: "2dhistogram"
-  select_structure_type: 10
+  type: "scatter"
+  select_structure_type: 1
   comment: "Centrals only"
   legend_loc: "upper left"
   x:
@@ -73,8 +73,8 @@ gas_fraction_500_no_bias:
     - filename: HaloMassGasFractions/Lovisari2015.hdf5
 
 gas_fraction_500_with_bias:
-  type: "2dhistogram"
-  select_structure_type: 10
+  type: "scatter"
+  select_structure_type: 1
   comment: "Centrals only"
   legend_loc: "upper left"
   x:
@@ -108,8 +108,8 @@ gas_fraction_500_with_bias:
     - filename: HaloMassGasFractions/HSE-FLAMINGO.hdf5
 
 star_fraction_500:
-  type: "2dhistogram"
-  select_structure_type: 10
+  type: "scatter"
+  select_structure_type: 1
   comment: "Centrals only"
   legend_loc: "upper left"
   x:
@@ -145,8 +145,8 @@ star_fraction_500:
 
 
 gas_mass_500:
-  type: "2dhistogram"
-  select_structure_type: 10
+  type: "scatter"
+  select_structure_type: 1
   comment: "Centrals only"
   legend_loc: "upper left"
   x:

diff --git a/colibre/auto_plotter/black_holes.yml b/colibre/auto_plotter/black_holes.yml
@@ -108,7 +108,7 @@ stellar_mass_black_hole_mass_binned_50:
 
 stellar_mass_black_hole_mass_passive_30:
   type: "scatter"
-  select_structure_type: 10
+  select_structure_type: 1
   comment: "Passive centrals only"
   comment_loc: "lower right"
   legend_loc: "upper left"
@@ -144,7 +144,7 @@ stellar_mass_black_hole_mass_passive_30:
 
 stellar_mass_black_hole_mass_passive_50:
   type: "scatter"
-  select_structure_type: 10
+  select_structure_type: 1
   comment: "Passive centrals only"
   comment_loc: "lower right"
   legend_loc: "upper left"
@@ -179,7 +179,7 @@ stellar_mass_black_hole_mass_passive_50:
 
 stellar_mass_black_hole_mass_active_30:
   type: "scatter"
-  select_structure_type: 10
+  select_structure_type: 1
   comment: "Active centrals only"
   comment_loc: "lower right"
   legend_loc: "upper left"
@@ -215,7 +215,7 @@ stellar_mass_black_hole_mass_active_30:
 
 stellar_mass_black_hole_mass_active_50:
   type: "scatter"
-  select_structure_type: 10
+  select_structure_type: 1
   comment: "Active centrals only"
   comment_loc: "lower right"
   legend_loc: "upper left"
@@ -377,7 +377,7 @@ stellar_mass_stellar_veldisp_10:
 ssfr_rate_black_hole_mass_30:
   type: "scatter"
   legend_loc: "upper right"
-  select_structure_type: 10
+  select_structure_type: 1
   selection_mask: "derived_quantities.stellar_mass_is_bigger_than_1e10_msun_30_kpc"
   comment: "Centrals only, $M_* > 10^{10}$ solar masses"
   redshift_loc: "lower left"
@@ -414,7 +414,7 @@ ssfr_rate_black_hole_mass_30:
 ssfr_rate_black_hole_mass_50:
   type: "scatter"
   legend_loc: "upper right"
-  select_structure_type: 10
+  select_structure_type: 1
   selection_mask: "derived_quantities.stellar_mass_is_bigger_than_1e10_msun_50_kpc"
   comment: "Centrals only, $M_* > 10^{10}$ solar masses"
   redshift_loc: "lower left"

diff --git a/colibre/auto_plotter/dust_mass_function.yml b/colibre/auto_plotter/dust_mass_function.yml
@@ -19,6 +19,7 @@ dust_mass_function:
     - filename: GalaxyDustMassFunction/Pozzi2020_z000p100.hdf5
     - filename: GalaxyDustMassFunction/Pozzi2020_z001p800.hdf5
     - filename: GalaxyDustMassFunction/Beeston2018_z000p000.hdf5
+    - filename: GalaxyDustMassFunction/Traina2024.hdf5
 
 adaptive_dust_mass_function:
   type: "adaptivemassfunction"
@@ -41,6 +42,7 @@ adaptive_dust_mass_function:
     - filename: GalaxyDustMassFunction/Pozzi2020_z000p100.hdf5
     - filename: GalaxyDustMassFunction/Pozzi2020_z001p800.hdf5
     - filename: GalaxyDustMassFunction/Beeston2018_z000p000.hdf5
+    - filename: GalaxyDustMassFunction/Traina2024.hdf5
 
 dust_mass_function_molecular:
   type: "massfunction"
@@ -63,6 +65,7 @@ dust_mass_function_molecular:
     - filename: GalaxyDustMassFunction/Pozzi2020_z000p100.hdf5
     - filename: GalaxyDustMassFunction/Pozzi2020_z001p800.hdf5
     - filename: GalaxyDustMassFunction/Beeston2018_z000p000.hdf5
+    - filename: GalaxyDustMassFunction/Traina2024.hdf5
 
 dust_mass_function_neutral:
   type: "massfunction"
@@ -85,6 +88,7 @@ dust_mass_function_neutral:
     - filename: GalaxyDustMassFunction/Pozzi2020_z000p100.hdf5
     - filename: GalaxyDustMassFunction/Pozzi2020_z001p800.hdf5
     - filename: GalaxyDustMassFunction/Beeston2018_z000p000.hdf5
+    - filename: GalaxyDustMassFunction/Traina2024.hdf5
 
 dust_mass_function_cold_dense:
   type: "massfunction"
@@ -107,4 +111,5 @@ dust_mass_function_cold_dense:
     - filename: GalaxyDustMassFunction/Pozzi2020_z000p100.hdf5
     - filename: GalaxyDustMassFunction/Pozzi2020_z001p800.hdf5
     - filename: GalaxyDustMassFunction/Beeston2018_z000p000.hdf5
+    - filename: GalaxyDustMassFunction/Traina2024.hdf5
 
diff --git a/colibre/auto_plotter/dust_mass_relations.yml b/colibre/auto_plotter/dust_mass_relations.yml
@@ -36,6 +36,7 @@ stellar_mass_v_dust_mass:
     - filename: GalaxyStellarMassDustMass/DaCunha2015_z004p000.hdf5
     - filename: GalaxyStellarMassDustMass/DaCunha2015_z005p000.hdf5
     - filename: GalaxyStellarMassDustMass/DaCunha2015_z006p000.hdf5
+    - filename: GalaxyStellarMassDustMass/Sommovigo2022.hdf5
 
 star_formation_rate_v_dust_mass:
   type: "scatter"

diff --git a/colibre/auto_plotter/gas_fraction_plots.yml b/colibre/auto_plotter/gas_fraction_plots.yml
@@ -293,6 +293,43 @@ hi_frac_func_stellar_mass:
     - filename: GalaxyHIFractions/Lisenfeld2016_Data.hdf5
     - filename: GalaxyHIFractions/Gratier2010_Data.hdf5
     - filename: GalaxyHIFractions/FIREbox.hdf5
+    - filename: GalaxyHIFractions/Scholte2024_MassComplete.hdf5
+
+hi_frac_func_stellar_mass_active_only_50:
+  type: "scatter"
+  legend_loc: "lower left"
+  selection_mask: "derived_quantities.is_active_50_kpc"
+  comment: "Active only"
+  x:
+    quantity: "apertures.mass_star_50_kpc"
+    units: Solar_Mass
+    start: 1e5
+    end: 1e12
+  y:
+    quantity: "derived_quantities.hi_to_stellar_mass_50_kpc"
+    units: "Solar_Mass / Solar_Mass"
+    start: 1e-4
+    end: 100
+  median:
+    plot: true
+    adaptive: true
+    log: true
+    number_of_bins: 35
+    start:
+      value: 1e5
+      units: Solar_Mass
+    end:
+      value: 1e12
+      units: Solar_Mass
+    lower:
+      value: 1e-10
+      units: "Solar_Mass / Solar_Mass"
+  metadata:
+    title: Stellar Mass-HI Fraction (active galaxies)
+    section: Cold Gas Data Comparison
+    caption: Galaxy HI mass over stellar mass as a function of stellar mass in 0.2 dex bins, measured in 50 kpc apertures. Active galaxies only.
+  observational_data:
+    - filename: GalaxyHIFractions/Scholte2024_SF.hdf5
 
 cold_gas_frac_func_ssfr:
   type: "scatter"

diff --git a/colibre/auto_plotter/halo_mass_functions.yml b/colibre/auto_plotter/halo_mass_functions.yml
@@ -1,6 +1,6 @@
 halo_mass_function:
   type: "massfunction"
-  select_structure_type: 10
+  select_structure_type: 1
   legend_loc: "lower left"
   number_of_bins: 30
   x:
@@ -22,7 +22,7 @@ halo_mass_function:
 
 halo_mass_function_adaptive:
   type: "adaptivemassfunction"
-  select_structure_type: 10  
+  select_structure_type: 1  
   legend_loc: "lower left"
   number_of_bins: 30
   x:

diff --git a/colibre/auto_plotter/mass_functions.yml b/colibre/auto_plotter/mass_functions.yml
@@ -157,6 +157,54 @@ stellar_mass_function_50:
     - filename: GalaxyStellarMassFunction/Navarro-Carrera2023.hdf5
     - filename: GalaxyStellarMassFunction/Weibel2024.hdf5
 
+stellar_mass_function_centrals_50:
+  type: "massfunction"
+  legend_loc: "lower left"
+  number_of_bins: 30
+  select_structure_type: 1
+  comment: "Centrals only"
+  x:
+    quantity: "apertures.mass_star_50_kpc"
+    units: Solar_Mass
+    start: 1e6
+    end: 1e12
+  y:
+    units: 1/Mpc**3
+    start: 1e-6
+    end: 1e0
+  metadata:
+    title: Stellar Mass Function (50 kpc aperture, centrals only)
+    caption: 50 kpc aperture GSMF, showing central galaxies only, with a fixed bin-width of 0.2 dex.
+    section: Stellar Mass Function
+  observational_data:
+    - filename: GalaxyStellarMassFunction/Leja_2020.hdf5
+    - filename: GalaxyStellarMassFunction/Driver2022.hdf5
+    - filename: GalaxyStellarMassFunction/Navarro-Carrera2023.hdf5
+
+stellar_mass_function_satellites_50:
+  type: "massfunction"
+  legend_loc: "lower left"
+  number_of_bins: 30
+  select_structure_type: 0
+  comment: "Satellites only"
+  x:
+    quantity: "apertures.mass_star_50_kpc"
+    units: Solar_Mass
+    start: 1e6
+    end: 1e12
+  y:
+    units: 1/Mpc**3
+    start: 1e-6
+    end: 1e0
+  metadata:
+    title: Stellar Mass Function (50 kpc aperture, satellites only)
+    caption: 50 kpc aperture GSMF, showing satellite galaxies only, with a fixed bin-width of 0.2 dex.
+    section: Stellar Mass Function
+  observational_data:
+    - filename: GalaxyStellarMassFunction/Leja_2020.hdf5
+    - filename: GalaxyStellarMassFunction/Driver2022.hdf5
+    - filename: GalaxyStellarMassFunction/Navarro-Carrera2023.hdf5
+
 stellar_mass_function_50_calibration:
   type: "massfunction"
   legend_loc: "lower left"