query CosmoInterp from lenstronomy, stabilizing likelihood and cleani…

…ng up requirements

HISTORY.rst

@@ -16,3 +16,8 @@ History
 ------------------
 
 * Standardizable magnifications added
+
+1.1.1 (2021-12-29)
+------------------
+
+* using CosmoInterp module from lenstronomy

hierarc/Likelihood/cosmo_likelihood.py

@@ -1,6 +1,7 @@
 from hierarc.Likelihood.lens_sample_likelihood import LensSampleLikelihood
 from hierarc.Sampling.ParamManager.param_manager import ParamManager
-from hierarc.Likelihood.cosmo_interp import CosmoInterp
+# from hierarc.Likelihood.cosmo_interp import CosmoInterp
+from lenstronomy.Cosmo.cosmo_interp import CosmoInterp
 from hierarc.Likelihood.SneLikelihood.sne_likelihood import SneLikelihood
 import numpy as np
 

hierarc/Likelihood/hierarchy_likelihood.py

@@ -136,7 +136,7 @@ def log_likelihood_single(self, ddt, dd, delta_lum_dist, kwargs_lens, kwargs_kin
 
         lnlikelihood = self.log_likelihood(ddt_, dd_, aniso_scaling=aniso_scaling, sigma_v_sys_error=sigma_v_sys_error,
                                            mu_intrinsic=mag_source_)
-        return lnlikelihood
+        return np.nan_to_num(lnlikelihood)
 
     def angular_diameter_distances(self, cosmo):
         """

hierarc/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Simon Birrer"""
 __email__ = 'sibirrer@gmail.com'
-__version__ = '1.1.0'
+__version__ = '1.1.1'

requirements.txt

@@ -1,14 +1,15 @@
 numpy>=1.13
 astropy>=3.0
-#lenstronomy>=1.4.0
+
 scipy
-numba
+# numba
 emcee
 mpmath
 h5py
 matplotlib
--e git://github.com/sibirrer/lenstronomy.git@main#egg=lenstronomy
+lenstronomy>=1.9.2
+# -e git://github.com/sibirrer/lenstronomy.git@main#egg=lenstronomy
 scikit-learn>=0.22
 
 # only required through lenstronomy
-scikit-image
+# scikit-image

setup.py

@@ -43,10 +43,10 @@ def run_tests(self):
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     description="Hierarchical analysis of strong lensing systems to infer lens properties and cosmological parameters simultaneously",
     install_requires=requirements,
@@ -61,7 +61,7 @@ def run_tests(self):
     test_suite='test',
     tests_require=test_requirements,
     url='https://github.com/sibirrer/hierarc',
-    version='1.1.0',
+    version='1.1.1',
     zip_safe=False,
     cmdclass={'test': PyTest}
 )