diff --git a/SOAP/particle_selection/subhalo_properties.py b/SOAP/particle_selection/subhalo_properties.py index 2d03cf9e..082c45fe 100644 --- a/SOAP/particle_selection/subhalo_properties.py +++ b/SOAP/particle_selection/subhalo_properties.py @@ -2403,6 +2403,7 @@ class SubhaloProperties(HaloProperty): "starmetalfrac", "Vmax_unsoft", "Vmax_soft", + "R_vmax_soft", "R_vmax_unsoft", "DM_Vmax_soft", "DM_R_vmax_soft", diff --git a/SOAP/property_table.py b/SOAP/property_table.py index ad9aad7b..f360b506 100644 --- a/SOAP/property_table.py +++ b/SOAP/property_table.py @@ -188,7 +188,12 @@ class PropertyTable: "Tgas_no_cool_no_agn", ], "footnote_lum.tex": ["StellarLuminosity"], - "footnote_circvel.tex": ["R_vmax_unsoft", "Vmax_unsoft", "Vmax_soft"], + "footnote_circvel.tex": [ + "R_vmax_unsoft", + "Vmax_unsoft", + "R_vmax_soft", + "Vmax_soft", + ], "footnote_spin.tex": ["spin_parameter"], "footnote_veldisp_matrix.tex": [ "veldisp_matrix_gas", diff --git a/documentation/footnote_circvel.tex b/documentation/footnote_circvel.tex index d16f195e..1d63400c 100644 --- a/documentation/footnote_circvel.tex +++ b/documentation/footnote_circvel.tex @@ -9,8 +9,5 @@ contribution of the particle(s) at $r=0$. The radius is computed relative to the halo centre. The softened $v_{\rm{}max}$ value is calculated using the same method, except that the particle radius has a floor equal to the softening length. An alternative way to calculate $v_{\rm{}max}$ -is to estimate it from the halo concentration by assuming an NFW profile. We store the radius of the -unsoftened maximum circular velocity. If the softened and unsoftened maximum circular velocities are -equal, then their radii will also be equal. If the values are not equal, then the radius of the -softened maximum circular velocity will be the simulation softening length. +is to estimate it from the halo concentration by assuming an NFW profile. Note that the softened vmax is $\textit{not}$ the $v_{\rm{}max}$ computed using a softened potential. diff --git a/parameter_files/COLIBRE_HYBRID.yml b/parameter_files/COLIBRE_HYBRID.yml index 8cba1769..baaacdac 100644 --- a/parameter_files/COLIBRE_HYBRID.yml +++ b/parameter_files/COLIBRE_HYBRID.yml @@ -659,6 +659,7 @@ SubhaloProperties: LuminosityWeightedMeanStellarAge: true MassWeightedMeanStellarAge: true MaximumCircularVelocity: true + MaximumCircularVelocityRadius: true MaximumCircularVelocityRadiusUnsoftened: true MaximumCircularVelocityUnsoftened: true MaximumDarkMatterCircularVelocity: true diff --git a/parameter_files/COLIBRE_THERMAL.yml b/parameter_files/COLIBRE_THERMAL.yml index 94fc7a74..2a4dc2b2 100644 --- a/parameter_files/COLIBRE_THERMAL.yml +++ b/parameter_files/COLIBRE_THERMAL.yml @@ -659,6 +659,7 @@ SubhaloProperties: LuminosityWeightedMeanStellarAge: true MassWeightedMeanStellarAge: true MaximumCircularVelocity: true + MaximumCircularVelocityRadius: true MaximumCircularVelocityRadiusUnsoftened: true MaximumCircularVelocityUnsoftened: true MaximumDarkMatterCircularVelocity: true diff --git a/parameter_files/EAGLE.yml b/parameter_files/EAGLE.yml index 28b82c56..e60a236c 100644 --- a/parameter_files/EAGLE.yml +++ b/parameter_files/EAGLE.yml @@ -285,6 +285,7 @@ SubhaloProperties: KappaCorotStars: general MassWeightedMeanStellarAge: true MaximumCircularVelocity: true + MaximumCircularVelocityRadius: true MaximumCircularVelocityRadiusUnsoftened: true MaximumCircularVelocityUnsoftened: true MaximumDarkMatterCircularVelocity: true diff --git a/parameter_files/FLAMINGO.yml b/parameter_files/FLAMINGO.yml index 47504e20..947f3ff4 100644 --- a/parameter_files/FLAMINGO.yml +++ b/parameter_files/FLAMINGO.yml @@ -364,6 +364,7 @@ SubhaloProperties: LuminosityWeightedMeanStellarAge: star MassWeightedMeanStellarAge: star MaximumCircularVelocity: basic + MaximumCircularVelocityRadius: basic MaximumCircularVelocityRadiusUnsoftened: basic MaximumCircularVelocityUnsoftened: basic MaximumDarkMatterCircularVelocity: dm diff --git a/parameter_files/MINIMAL_FLAMINGO.yml b/parameter_files/MINIMAL_FLAMINGO.yml index d1d1c712..3e88a43b 100644 --- a/parameter_files/MINIMAL_FLAMINGO.yml +++ b/parameter_files/MINIMAL_FLAMINGO.yml @@ -71,6 +71,7 @@ SubhaloProperties: NumberOfStarParticles: true NumberOfBlackHoleParticles: true MaximumCircularVelocity: true + MaximumCircularVelocityRadius: true MaximumCircularVelocityUnsoftened: true MaximumCircularVelocityRadiusUnsoftened: true SpinParameter: true diff --git a/tests/small_volume.yml b/tests/small_volume.yml index 6e6594cc..717ff739 100644 --- a/tests/small_volume.yml +++ b/tests/small_volume.yml @@ -62,6 +62,7 @@ SubhaloProperties: NumberOfStarParticles: true NumberOfBlackHoleParticles: true MaximumCircularVelocity: true + MaximumCircularVelocityRadius: true MaximumCircularVelocityUnsoftened: true MaximumCircularVelocityRadiusUnsoftened: true SpinParameter: true