Skeleton for cluster lens simulations #148

furcelay · 2024-04-01T20:48:58Z

This is the first pull following #134 and provides a skeleton of the classes described in that issue. The classes are empty except for ClusterLens(LensBase) which is partially implemented.

ClusterLens takes the parameters that describe a halo (by the time only EPL) and a table with the parameters of each subhalo and generates the Lenstronomy keywords to simulate the lens. This is exemplified in a new notebook cluster_lens.ipynb.

…-packages/data as wanted by LensPop)

This reverts commit 8be0219. I've modified setup.py and the requirements for easyer installation on a non-LSST environment (local), but now I revert this as is not related with the purpose of this fork.

This reverts commit e1bffbd. I've modified setup.py and the requirements for easyer installation on a non-LSST environment (local), but now I revert this as is not related with the purpose of this fork.

…r Lens class modifications

…dir/site-packages/data as wanted by LensPop)" This reverts commit 887a653. Revert requirements

review-notebook-app · 2024-04-01T20:50:13Z

Check out this pull request on

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

for more information, see https://pre-commit.ci

codecov · 2024-04-01T21:03:24Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.65%. Comparing base (4a9e9fd) to head (537690b).
Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #148      +/-   ##
==========================================
+ Coverage   95.51%   95.65%   +0.13%     
==========================================
  Files          38       39       +1     
  Lines        1896     1955      +59     
==========================================
+ Hits         1811     1870      +59     
  Misses         85       85

Files	Coverage Δ
slsim/Deflectors/DeflectorTypes/nfw_cluster.py	`100.00% <100.00%> (ø)`
slsim/Deflectors/velocity_dispersion.py	`100.00% <100.00%> (ø)`

for more information, see https://pre-commit.ci

… galaxy_cluster_lenses.py

for more information, see https://pre-commit.ci

… method definition

nkhadka21

Hi @furcelay , thank you very much for your PR. I have some major comments. GalaxyClusterLenses and ClusterLensPop are mostly duplicates of Lens and LensPop classes. I think you should start from the small steps. I encourage you to start from generating cluster deflector and sources for cluster lenses. and then, you can think about ClusterLens and ClusterLensPop (might be able to use existing classes with addition of some extra parameters). Please let me know if you have any questions!

nkhadka21 · 2024-04-15T17:50:09Z

slsim/Pipelines/cluster_pipeline.py

@@ -0,0 +1,3 @@
+class ClusterPipeline:


We do not need this class. It would be great if you could delete this class.

Removed this class as it is not needed yet.

nkhadka21 · 2024-04-15T18:07:35Z

slsim/cluster_lens.py

+import warnings
+
+
+class ClusterLens(LensedSystemBase):


This class has a lot of overlap with existing Lens() class. I think we can think about using existing Lens class or creating a Clusterlens() class only with functions which are not in Lens class. You can do this later (save this somewhere else and once you start working on this class, you can bring it back.). For now focus on creating a class to generate or manage cluster deflectors. Simon has implemented class to manage NFW and Hernquist mass model. Please look at them and see if they are useful for you.

I've removed the ClusterLens class and implemented NFWCluster which is a new Deflector subclass to manage clusters. It can work with the existing Lens class by modifying the deflector_mass_model_lenstronomy. Another way might be to handle the mass model in the Deflector class and just call it from the Lens class (see #156).

nkhadka21 · 2024-04-15T18:20:36Z

slsim/cluster_lens_pop.py

+from slsim.lensed_population_base import LensedPopulationBase
+
+
+class ClusterLensPop(LensedPopulationBase):


This class is exactly the same as LensPop() class. So, you can delete it and use LensPop() class.

Removed this class

nkhadka21 · 2024-04-15T18:23:30Z

tests/test_Pipelines/test_cluster_pipeline.py

+from slsim.Pipelines.cluster_pipeline import ClusterPipeline
+
+
+class TestClusterPipeline(object):


We do not need ClusterPipeline class. So, remove it.

nkhadka21 · 2024-04-15T18:28:02Z

tests/test_cluster_lens.py

+
+
+class TestClusterLens(object):
+    # pytest.fixture(scope='class')


As ClusterLens class is a duplication of Lens class, these testing are also duplication of existing test functions. The best way is to start from the basic steps. I encourage you to start from cluster deflector class which will manage cluster deflector population.

nkhadka21 · 2024-04-15T18:28:57Z

tests/test_cluster_lens_pop.py

+
+
+@pytest.fixture
+def gg_lens_pop_instance():


You do not need these test functions if you remove ClusterLensPop.

… component (e.g. for a cluster)

…or type.

for more information, see https://pre-commit.ci

furcelay · 2024-05-14T02:13:38Z

I've removed the redundant or unneeded classes and implemented a new Deflector to handle clusters. This deflector is a NFW halo without a luminous component and subhalos that can be any other deflector (EPL+Sérsic or NFW+Hernquist). I've also implemented a new function to compute its line-of-sight velocity dispersion of the halo following Lokas & Mamon 2001 as it cannot be weighted by the light as in the NFW + Hernquist model.

sibirrer

Hi @furcelay looks very good and I am glad you could use most of the other classes for your cluster class. I have just a minor inquiry about the velocity dispersion. You calculate them for the NFW halo alone, just want to make sure that this is what you want

sibirrer · 2024-05-14T13:28:57Z

slsim/Deflectors/DeflectorTypes/nfw_cluster.py

+
+        m_halo, c_halo = self.halo_properties
+        rs_arcsec, _ = lens_cosmo.nfw_physical2angle(m_halo, c_halo)
+        vel_disp = vel_disp_nfw_aperture(


is this the dispersion in the dark matter particles, or some light tracer particles? For a NFW+Hernquist model, we have a velocity dispersion routine (currently averaged to the half-light radius) in this routine:

slsim/slsim/Deflectors/velocity_dispersion.py

Line 14 in 4d7ca84

def vel_disp_composite_model(r, m_star, rs_star, m_halo, c_halo, cosmo, z_lens):

(heavily using the lenstronomy.Galkin routines for solving the Jeans equation.

Hi @sibirrer, indeed the velocity dispersion is the one of the dark matter particles without any light tracer. This is because the velocity dispersion of the dark matter halo of groups or clusters cannot be measured in the same way as galaxies. It is usually measured by the spread in the redshift of the subhalos within a radius and assuming the radial profile for the velocity dispersion from Łokas & Mamon 2001. So it should be consistent with the measured velocity dispersion with some considerations on the aperture radius.

sibirrer

Thank you @furcelay! I leave it to @nkhadka21 for the final review and merge.

nkhadka21

Hi @furcelay , thank you very miuch for this update! Looks very good. I have a minor comment. Please address it.

nkhadka21 · 2024-05-14T17:13:48Z

slsim/Deflectors/DeflectorTypes/nfw_cluster.py

+    - 'z': redshift of deflector
+    """
+
+    def __init__(self, deflector_dict, subhalos_list):


Please add doc string for deflector_dict and subhalos_list. Clarify what subhalos_list should contain. Might be useful to explain how halo_EPl.fits and subhaloes_table.fits that you have added in TestData can be used in this class or you need to add full list of halos or subhalos?

Hi @nkhadka21, I've added the docstring for that method. Also included the fits files in test_nfw_cluster to exemplify their use, both have an astropy table with the quantities to init the halo and subhalos respectively.

…ble.fits files to exemplify its use.

for more information, see https://pre-commit.ci

nkhadka21

@furcelay, thank you very much for the update! I approved it and excited to see your progress on other aspects of the cluster lens code!

furcelay · 2024-05-15T17:46:14Z

Thank you! I hope to have more progress soon.

furcelay and others added 13 commits January 19, 2024 15:45

requirements

e1bffbd

add /data as additional package (will be installed to python_dir/site…

887a653

…-packages/data as wanted by LensPop)

requirements

8be0219

class draft for cluster lens simulations

3db3f9e

added cluster_lens notebook

686d127

updated ClusterLens to use subhaloes in the same format as Deflectors.

8397b6b

Merge branch 'LSST-strong-lensing:main' into cluster_lenses

8b761b1

Revert "requirements"

92fef28

This reverts commit 8be0219. I've modified setup.py and the requirements for easyer installation on a non-LSST environment (local), but now I revert this as is not related with the purpose of this fork.

Revert "requirements"

658a8c4

This reverts commit e1bffbd. I've modified setup.py and the requirements for easyer installation on a non-LSST environment (local), but now I revert this as is not related with the purpose of this fork.

Partially updated ClusterLens to include new Deflector class and othe…

8c09a21

…r Lens class modifications

Update cluter_lens notebook to include comments

506f3fa

renamed cluster deflector class for clarity

3016134

Revert "add /data as additional package (will be installed to python_…

d3980ba

…dir/site-packages/data as wanted by LensPop)" This reverts commit 887a653. Revert requirements

[pre-commit.ci] auto fixes from pre-commit.com hooks

59083ff

for more information, see https://pre-commit.ci

furcelay and others added 14 commits April 2, 2024 21:52

remove unused imports

60b87a4

added test for cluster_lens.py

303ff0d

[pre-commit.ci] auto fixes from pre-commit.com hooks

a29ad5c

for more information, see https://pre-commit.ci

minor change in cluster_lens.ipynb

7be9039

Merge remote-tracking branch 'origin/cluster_lenses' into cluster_lenses

635fe82

Merge branch 'LSST-strong-lensing:main' into cluster_lenses

04a4779

minor change in cluster_lens.py due to difference in astropy version

57fcded

added test skeletons for cluster_lens_pop.py, cluster_pipeline.py and…

1775c70

… galaxy_cluster_lenses.py

minor changes

6decbfa

[pre-commit.ci] auto fixes from pre-commit.com hooks

63bc1f2

for more information, see https://pre-commit.ci

minor changes

9bfa226

improve test coverage

9b91c5d

Merge remote-tracking branch 'origin/cluster_lenses' into cluster_lenses

a8c5653

[pre-commit.ci] auto fixes from pre-commit.com hooks

c5a7d09

for more information, see https://pre-commit.ci

furcelay and others added 5 commits April 3, 2024 22:00

Merge remote-tracking branch 'origin/cluster_lenses' into cluster_lenses

3ff21aa

minor changes

8092ddd

Merge branch 'LSST-strong-lensing:main' into cluster_lenses

791a94a

modified cluster_lens.py to include new Deflector.velocity_dispersion…

77dcc76

… method definition

minor changes

1aa3038

furcelay requested a review from nkhadka21 April 10, 2024 16:10

nkhadka21 requested changes Apr 15, 2024

View reviewed changes

furcelay and others added 12 commits May 10, 2024 16:41

Merge branch 'LSST-strong-lensing:main' into cluster_lenses

253db90

Added NFW velocity dispersion for a dark matter halo without luminous…

8953f91

… component (e.g. for a cluster)

NFWCluster class with a NFW halo and subhalos that can be any deflect…

fdec2d1

…or type.

delete redundant or not yet needed classes

943c976

Merge remote-tracking branch 'origin/cluster_lenses' into cluster_lenses

b841e62

Merge remote-tracking branch 'origin/cluster_lenses' into cluster_lenses

8782587

reorder thing in velocity_dispersion.py

70dea97

added test for nfw_cluster

d6a15fc

minor cosmetic changes

d6cb29e

added test for cluster velocity dispersion function

3bb324d

removed cluster_lens.ipynb as it is not functional yet

002dd91

[pre-commit.ci] auto fixes from pre-commit.com hooks

f295e82

for more information, see https://pre-commit.ci

furcelay requested a review from nkhadka21 May 14, 2024 02:13

sibirrer reviewed May 14, 2024

View reviewed changes

sibirrer approved these changes May 14, 2024

View reviewed changes

nkhadka21 requested changes May 14, 2024

View reviewed changes

furcelay and others added 3 commits May 14, 2024 18:44

modified test_nfw_cluster.py to use the halo_NFW.fits and subhalos_ta…

03f5660

…ble.fits files to exemplify its use.

added docstring for __init__ method

0c24729

[pre-commit.ci] auto fixes from pre-commit.com hooks

537690b

for more information, see https://pre-commit.ci

nkhadka21 approved these changes May 15, 2024

View reviewed changes

nkhadka21 merged commit 9fb1f8f into LSST-strong-lensing:main May 15, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skeleton for cluster lens simulations #148

Skeleton for cluster lens simulations #148

furcelay commented Apr 1, 2024

review-notebook-app bot commented Apr 1, 2024

codecov bot commented Apr 1, 2024 •

edited

Loading

nkhadka21 left a comment

nkhadka21 Apr 15, 2024

furcelay May 13, 2024

nkhadka21 Apr 15, 2024

furcelay May 14, 2024

nkhadka21 Apr 15, 2024

furcelay May 13, 2024

nkhadka21 Apr 15, 2024

furcelay May 13, 2024 •

edited

Loading

nkhadka21 Apr 15, 2024

furcelay May 13, 2024 •

edited

Loading

nkhadka21 Apr 15, 2024

furcelay May 13, 2024

furcelay commented May 14, 2024

sibirrer left a comment

sibirrer May 14, 2024

furcelay May 14, 2024

sibirrer left a comment

nkhadka21 left a comment

nkhadka21 May 14, 2024 •

edited

Loading

furcelay May 14, 2024

nkhadka21 left a comment

furcelay commented May 15, 2024

		from slsim.lensed_population_base import LensedPopulationBase


		class ClusterLensPop(LensedPopulationBase):

		from slsim.Pipelines.cluster_pipeline import ClusterPipeline


		class TestClusterPipeline(object):



		class TestClusterLens(object):
		# pytest.fixture(scope='class')

Skeleton for cluster lens simulations #148

Skeleton for cluster lens simulations #148

Conversation

furcelay commented Apr 1, 2024

review-notebook-app bot commented Apr 1, 2024

codecov bot commented Apr 1, 2024 • edited Loading

Codecov Report

nkhadka21 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

furcelay May 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

furcelay May 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

furcelay commented May 14, 2024

sibirrer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sibirrer left a comment

Choose a reason for hiding this comment

nkhadka21 left a comment

Choose a reason for hiding this comment

nkhadka21 May 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nkhadka21 left a comment

Choose a reason for hiding this comment

furcelay commented May 15, 2024

codecov bot commented Apr 1, 2024 •

edited

Loading

furcelay May 13, 2024 •

edited

Loading

furcelay May 13, 2024 •

edited

Loading

nkhadka21 May 14, 2024 •

edited

Loading