Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SOAP/particle_selection/subhalo_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion SOAP/property_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions documentation/footnote_circvel.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 1 addition & 0 deletions parameter_files/COLIBRE_HYBRID.yml
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,7 @@ SubhaloProperties:
LuminosityWeightedMeanStellarAge: true
MassWeightedMeanStellarAge: true
MaximumCircularVelocity: true
MaximumCircularVelocityRadius: true
MaximumCircularVelocityRadiusUnsoftened: true
MaximumCircularVelocityUnsoftened: true
MaximumDarkMatterCircularVelocity: true
Expand Down
1 change: 1 addition & 0 deletions parameter_files/COLIBRE_THERMAL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,7 @@ SubhaloProperties:
LuminosityWeightedMeanStellarAge: true
MassWeightedMeanStellarAge: true
MaximumCircularVelocity: true
MaximumCircularVelocityRadius: true
MaximumCircularVelocityRadiusUnsoftened: true
MaximumCircularVelocityUnsoftened: true
MaximumDarkMatterCircularVelocity: true
Expand Down
1 change: 1 addition & 0 deletions parameter_files/EAGLE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ SubhaloProperties:
KappaCorotStars: general
MassWeightedMeanStellarAge: true
MaximumCircularVelocity: true
MaximumCircularVelocityRadius: true
MaximumCircularVelocityRadiusUnsoftened: true
MaximumCircularVelocityUnsoftened: true
MaximumDarkMatterCircularVelocity: true
Expand Down
1 change: 1 addition & 0 deletions parameter_files/FLAMINGO.yml
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ SubhaloProperties:
LuminosityWeightedMeanStellarAge: star
MassWeightedMeanStellarAge: star
MaximumCircularVelocity: basic
MaximumCircularVelocityRadius: basic
MaximumCircularVelocityRadiusUnsoftened: basic
MaximumCircularVelocityUnsoftened: basic
MaximumDarkMatterCircularVelocity: dm
Expand Down
1 change: 1 addition & 0 deletions parameter_files/MINIMAL_FLAMINGO.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ SubhaloProperties:
NumberOfStarParticles: true
NumberOfBlackHoleParticles: true
MaximumCircularVelocity: true
MaximumCircularVelocityRadius: true
MaximumCircularVelocityUnsoftened: true
MaximumCircularVelocityRadiusUnsoftened: true
SpinParameter: true
Expand Down
1 change: 1 addition & 0 deletions tests/small_volume.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ SubhaloProperties:
NumberOfStarParticles: true
NumberOfBlackHoleParticles: true
MaximumCircularVelocity: true
MaximumCircularVelocityRadius: true
MaximumCircularVelocityUnsoftened: true
MaximumCircularVelocityRadiusUnsoftened: true
SpinParameter: true
Expand Down
Loading