Skip to content

gh-1159: Add CosmologyWithOmegaM protocol #1162

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
paddyroddy wants to merge 6 commits into
base: main
Choose a base branch
from
+10 −4
Open

gh-1159: Add CosmologyWithOmegaM protocol #1162

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26fbb3d
Add CosmologyWithOmegaM class
paddyroddy Jul 7, 2026
ad364f1
Fix tests
paddyroddy Jul 7, 2026
c81c39f
Remove duplicate `typing.Protocol`
paddyroddy Jul 7, 2026
8583fcc
Explicitly rename to omega_m
paddyroddy Jul 8, 2026
1a725a3
Rename to `cosmo`
paddyroddy Jul 8, 2026
daf5c15
Rename to combo
paddyroddy Jul 8, 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
8 changes: 7 additions & 1 deletion glass/cosmology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@ class Cosmology(
cosmology.api.HasInverseComovingDistance[AnyArray, AnyArray], # ty: ignore[invalid-type-arguments]
cosmology.api.HasLittleH[AnyArray], # ty: ignore[invalid-type-arguments]
cosmology.api.HasOmegaM0[AnyArray], # ty: ignore[invalid-type-arguments]
cosmology.api.HasOmegaM[AnyArray, AnyArray], # ty: ignore[invalid-type-arguments]
cosmology.api.HasTransverseComovingDistance[AnyArray, AnyArray], # ty: ignore[invalid-type-arguments]
typing.Protocol,
):
"""Cosmology protocol for GLASS."""


class CosmologyWithOmegaM(
Cosmology,
cosmology.api.HasOmegaM[AnyArray, AnyArray], # ty: ignore[invalid-type-arguments]
):
Comment thread
Copilot marked this conversation as resolved.
Comment thread
paddyroddy marked this conversation as resolved.
"""Cosmology protocol for GLASS with OmegaM."""
19 changes: 11 additions & 8 deletions glass/shells.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
from types import ModuleType

from glass._types import FloatArray, IntArray, UnifiedGenerator
from glass.cosmology import Cosmology
from glass.cosmology import Cosmology, CosmologyWithOmegaM


@dataclasses.dataclass
Expand Down Expand Up @@ -141,12 +141,12 @@ class DensityWeight:

Attributes
----------
cosmo
Cosmology instance.
cosmo_omega_m
Cosmology instance with OmegaM.
Comment thread
paddyroddy marked this conversation as resolved.

"""

cosmo: Cosmology
cosmo_omega_m: CosmologyWithOmegaM

def __call__(self, z: FloatArray) -> FloatArray:
"""
Expand All @@ -163,11 +163,14 @@ def __call__(self, z: FloatArray) -> FloatArray:

"""
return (
self.cosmo.critical_density0
* self.cosmo.Omega_m(z)
* (self.cosmo.transverse_comoving_distance(z) / self.cosmo.hubble_distance)
self.cosmo_omega_m.critical_density0
* self.cosmo_omega_m.Omega_m(z)
* (
self.cosmo_omega_m.transverse_comoving_distance(z)
Comment thread
paddyroddy marked this conversation as resolved.
Outdated
/ self.cosmo_omega_m.hubble_distance
)
** 2
/ self.cosmo.H_over_H0(z)
/ self.cosmo_omega_m.H_over_H0(z)
)


Expand Down
6 changes: 3 additions & 3 deletions tests/core/test_shells.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from types import ModuleType

from glass._types import UnifiedGenerator
from glass.cosmology import Cosmology
from glass.cosmology import Cosmology, CosmologyWithOmegaM


@pytest.fixture(scope="session")
Expand Down Expand Up @@ -103,13 +103,13 @@ def test_volume_weight(
xpx.testing.assert_less(w[:-1], w[1:])


def test_density_weight(cosmo: Cosmology) -> None:
def test_density_weight(cosmo_omega_m: CosmologyWithOmegaM) -> None:
Comment thread
paddyroddy marked this conversation as resolved.
Outdated
"""Add unit tests for :class:`glass.DensityWeight`."""
z = np.linspace(0, 1, 6)

# check shape

w = glass.DensityWeight(cosmo)(z)
w = glass.DensityWeight(cosmo_omega_m)(z)
assert w.shape == z.shape

# check first value is 0
Expand Down
Loading