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

Jump to bottom

Issue/628/rad min max in ensemble #631

Merged
merged 18 commits into from
Aug 5, 2024
Merged

Issue/628/rad min max in ensemble #631

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5d8edf2
add radius min/max in ensamble and validation for its consistency
m-aguena Jul 16, 2024
68035cf
move dataops/__init__ to dataops/ops
m-aguena Jul 16, 2024
7d28e41
fix import
m-aguena Jul 16, 2024
2390466
update tests
m-aguena Jul 16, 2024
0eeb7dd
clean up code
m-aguena Jul 17, 2024
b097989
updated tests
m-aguena Jul 17, 2024
65913aa
update nbs
m-aguena Jul 17, 2024
a4ab403
pass rmin/max to ClusterEnsemble.stacked_data
m-aguena Jul 17, 2024
8f51a04
update nbs
m-aguena Jul 17, 2024
d99daa2
rm unused imports
m-aguena Jul 17, 2024
4dbfdf7
Fix typo
hsinfan1996 Jul 18, 2024
17a527c
Fix deprecated NumCosmo constructors
hsinfan1996 Jul 18, 2024
0c56b9e
fix merge conflicts
m-aguena Jul 18, 2024
7bf1696
rename clmm/dataops/ops.py -> clmm/dataops/data_operations.py
m-aguena Jul 18, 2024
aa3e2a9
revert clmm/dataops/data_operations.py -> clmm/dataops/__init__.py
m-aguena Jul 18, 2024
7532d24
fix merge conflicts
m-aguena Jul 19, 2024
1ca862f
Update version to 1.13.0
m-aguena Jul 22, 2024
32965de
fix merge conflicts
m-aguena Jul 22, 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
17 changes: 13 additions & 4 deletions clmm/clusterensemble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from .gcdata import GCData
from .dataops import make_stacked_radial_profile
from .utils import DiffArray


class ClusterEnsemble:
Expand Down Expand Up @@ -46,7 +47,7 @@ def __init__(self, unique_id, gc_list=None, **kwargs):
else:
raise TypeError(f"unique_id incorrect type: {type(unique_id)}")
self.unique_id = unique_id
self.data = GCData(meta={"bin_units": None})
self.data = GCData(meta={"bin_units": None, "radius_min": None, "radius_max": None})
if gc_list is not None:
self._add_values(gc_list, **kwargs)
self.stacked_data = None
Expand Down Expand Up @@ -198,6 +199,9 @@ def add_individual_radial_profile(
"""
cl_bin_units = profile_table.meta.get("bin_units", None)
self.data.update_info_ext_valid("bin_units", self.data, cl_bin_units, overwrite=False)
for col in ("radius_min", "radius_max"):
value = DiffArray(profile_table[col])
self.data.update_info_ext_valid(col, self.data, value, overwrite=False)

cl_cosmo = profile_table.meta.get("cosmo", None)
self.data.update_info_ext_valid("cosmo", self.data, cl_cosmo, overwrite=False)
Expand Down Expand Up @@ -248,9 +252,14 @@ def make_stacked_radial_profile(self, tan_component="gt", cross_component="gx",
[self.data[tan_component], self.data[cross_component]],
)
self.stacked_data = GCData(
[radius, *components],
meta=self.data.meta,
names=("radius", tan_component, cross_component),
[
self.data.meta["radius_min"].value,
self.data.meta["radius_max"].value,
radius,
*components,
],
meta={k: v for k, v in self.data.meta.items() if k not in ("radius_min", "radius_max")},
names=("radius_min", "radius_max", "radius", tan_component, cross_component),
)

def compute_sample_covariance(self, tan_component="gt", cross_component="gx"):
Expand Down
Loading