Skip to content

Merge main and quadratic SFRD #38

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

Open
JulianBMunoz wants to merge 16 commits into
base: quadratic-SFRD
Choose a base branch
from
Open

Merge main and quadratic SFRD #38

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f001e4a
clipped fstarofz sfe to always be between 0 and 1 regardless of input…
ebregou Oct 24, 2025
8e8bfad
Merge pull request #34 from ebregou/clip-sfe-values
JulianBMunoz Oct 28, 2025
2cae9fc
Merge branch 'quadratic-SFRD' into main
JulianBMunoz Apr 29, 2026
8de46e3
Initial plan
Copilot Apr 29, 2026
d2b1e78
Replace np.trapz with np.trapezoid and require numpy>=2.0
Copilot Apr 29, 2026
b1285f2
Merge pull request #39 from ZeusCosmo/copilot/update-numpy-trapz-to-t…
JulianBMunoz Apr 29, 2026
45c9011
Added max SFR for UVLFs
JulianBMunoz Apr 29, 2026
84df2d1
Update UVLFs.py
JulianBMunoz Apr 29, 2026
1d37a33
Update UVLFs.py
JulianBMunoz Apr 29, 2026
a22b5f8
Update zeus21/UVLFs.py
JulianBMunoz Apr 29, 2026
33d2d9c
Update zeus21/inputs.py
JulianBMunoz Apr 29, 2026
3e643ac
Add test for min_t_formation_Myr in test_UVLFs.py
Copilot Apr 29, 2026
f50cb6b
Merge pull request #40 from ZeusCosmo/implement_max_SFR_physical
JulianBMunoz Apr 29, 2026
496f161
Add tqdm to requirements.txt to fix missing dependency in CI
JulianBMunoz May 1, 2026
8882e0e
adding powerbox requirement
changhoonhahn Jun 17, 2026
9f2d210
Merge pull request #46 from changhoonhahn/patch-1
JulianBMunoz Jun 17, 2026
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
9 changes: 6 additions & 3 deletions zeus21/sfrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
Edited by Hector Afonso G. Cruz
JHU - July 2024

Edited by Emily Bregou
UT Austin - October 2025

Edited by Sarah Libanore
BGU - July 2025

Expand Down Expand Up @@ -751,10 +754,10 @@ def Mmol(Astro_Parameters, Cosmo_Parameters, J21LW_interp, z, vCB):
def fstarofz(Astro_Parameters, Cosmo_Parameters, z, Mhlist):
epsstar_ofz = Astro_Parameters.epsstar * 10**(Astro_Parameters.dlog10epsstardz * (z-Astro_Parameters._zpivot) )
if Cosmo_Parameters.Flag_emulate_21cmfast == False:
return 2.0 * Cosmo_Parameters.OmegaB/Cosmo_Parameters.OmegaM * epsstar_ofz\
/(pow(Mhlist/Astro_Parameters.Mc,- Astro_Parameters.alphastar) + pow(Mhlist/Astro_Parameters.Mc,- Astro_Parameters.betastar) )
return Cosmo_Parameters.OmegaB/Cosmo_Parameters.OmegaM * np.clip(2.0 * epsstar_ofz\
/(pow(Mhlist/Astro_Parameters.Mc,- Astro_Parameters.alphastar) + pow(Mhlist/Astro_Parameters.Mc,- Astro_Parameters.betastar) ), 0, 1)
elif Cosmo_Parameters.Flag_emulate_21cmfast == True:
return Cosmo_Parameters.OmegaB/Cosmo_Parameters.OmegaM * epsstar_ofz /(pow(Mhlist/Astro_Parameters.Mc,- Astro_Parameters.alphastar))
return Cosmo_Parameters.OmegaB/Cosmo_Parameters.OmegaM * np.clip(epsstar_ofz /(pow(Mhlist/Astro_Parameters.Mc,- Astro_Parameters.alphastar)), 0, 1)


###HAC: Added fstar for PopIII
Expand Down
Loading