Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make mini_spacing aware of both x and y spacing #39

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Make mini_spacing aware of both x and y spacing #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eff5704
Make `mini_spacing` aware of both x and y spacing
cgarling Jun 24, 2024
8033adc
try to fix CI failure on docs
cgarling Jun 25, 2024
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 .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
import StarFormationHistories
DocMeta.setdocmeta!(StarFormationHistories, :DocTestSetup, :(using StarFormationHistories); recursive=true)
doctest(StarFormationHistories)'
- run: sudo apt-get update
- name: Install tex dependencies
run: sudo apt-get install dvipng texlive-latex-extra texlive-fonts-recommended cm-super
- name: Make and deploy docs
Expand Down
30 changes: 20 additions & 10 deletions src/StarFormationHistories.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,30 +81,39 @@ interpolate_mini(m_ini::AbstractVector{<:Number},

"""
mini_spacing(m_ini::AbstractVector{<:Number},
colors::AbstractVector{<:Number},
mags::AbstractVector{<:Number},
Δmag,
ret_spacing::Bool = false)

Returns a new sampling of stellar masses given the initial mass vector `m_ini` from an isochrone and the corresponding magnitude vector `mags`. Will compute the new initial mass vector such that the absolute difference between adjacent points is less than `Δmag`. Will return the change in mass between points `diff(new_mini)` if `ret_spacing==true`.
Returns a new sampling of stellar masses given the initial mass vector `m_ini` from an isochrone and the corresponding y-axis magnitude vector `mags` and x-axis color vector `color` to be used to construct a model Hess diagram. Will compute the new initial mass vector such that the distance between adjacent isochrone points is less than `Δmag`. Will return the change in mass between points `diff(new_mini)` if `ret_spacing==true`.

```julia
julia> mini_spacing([0.08, 0.10, 0.12, 0.14, 0.16],
[13.545, 12.899, 12.355, 11.459, 10.947], 0.1, false)
[1.0, 0.99, 0.98, 0.97, 0.96],
[13.545, 12.899, 12.355, 11.459, 10.947],
0.1, false)
```
"""
function mini_spacing(m_ini::AbstractVector{<:Number}, mags::AbstractVector{<:Number}, Δmag,
function mini_spacing(m_ini::AbstractVector{<:Number},
colors::AbstractVector{<:Number},
mags::AbstractVector{<:Number},
Δmag,
ret_spacing::Bool=false)
@assert axes(m_ini) == axes(mags)
@assert axes(m_ini) == axes(mags) == axes(colors)
new_mini = Vector{Float64}(undef,1)
new_mini[1] = first(m_ini)
# Sort the input m_ini and mags. This could be optional.
idx = sortperm(m_ini)
m_ini = m_ini[idx]
mags = mags[idx]
# Loop through the indices, testing if adjacent magnitudes are
colors = colors[idx]
# Loop through the indices, testing if adjacent CMD points are
# different by less than Δm.
for i in eachindex(m_ini, mags)[begin:end-1]
diffi = abs(mags[i+1] - mags[i])
for i in eachindex(m_ini, mags, colors)[begin:end-1]
Δx = colors[i+1] - colors[i]
Δy = mags[i+1] - mags[i]
diffi = hypot(Δx, Δy)
if diffi > Δmag # Requires interpolation
npoints = round(Int, diffi / Δmag, RoundUp)
Δmass = m_ini[i+1] - m_ini[i]
Expand Down Expand Up @@ -418,7 +427,7 @@ function partial_cmd(m_ini::AbstractVector{<:Number}, colors::AbstractVector{<:N
mean_mass::Number=mean(imf), edges=nothing, xlim=extrema(colors),
ylim=extrema(mags), nbins=nothing, xwidth=nothing, ywidth=nothing)
# Resample the isochrone magnitudes to a denser m_ini array
new_mini, new_spacing = mini_spacing(m_ini, mags, 0.01, true)
new_mini, new_spacing = mini_spacing(m_ini, colors, mags, 0.01, true)
new_iso_colors = interpolate_mini(m_ini, colors, new_mini)
new_iso_mags = interpolate_mini(m_ini, mags, new_mini) .+ dmod
# Approximate the IMF weights on each star in the isochrone as
Expand Down Expand Up @@ -490,8 +499,9 @@ function partial_cmd_smooth(m_ini::AbstractVector{<:Number},
edges=nothing, xlim=nothing, ylim=nothing, nbins=nothing,
xwidth=nothing, ywidth=nothing)
# Resample the isochrone magnitudes to a denser m_ini array
# new_mini, new_spacing = mini_spacing(m_ini, imf, 1000, true)
new_mini, new_spacing = mini_spacing(m_ini, mags[y_index], 0.01, true)
ymags = mags[y_index]
colors = mags[first(color_indices)] .- mags[last(color_indices)]
new_mini, new_spacing = mini_spacing(m_ini, colors, ymags, 0.01, true)
# Interpolate only the mag vectors included in color_indices
new_iso_mags = [interpolate_mini(m_ini, i, new_mini) .+ dmod for i in mags]
colors = new_iso_mags[color_indices[1]] .- new_iso_mags[color_indices[2]]
Expand Down