ler 0.3.8__py3-none-any.whl → 0.4.0__py3-none-any.whl

ler/__init__.py

@@ -14,7 +14,7 @@ except RuntimeError:
 __author__ = 'hemanta_ph <hemantaphurailatpam@gmail.com>'
 
 # The version as used in the setup.py
-__version__ = "0.3.8"
+__version__ = "0.4.0"
 
 # add __file__
 import os

ler/gw_source_population/cbc_source_parameter_distribution.py

@@ -269,9 +269,9 @@ class CBCSourceParameterDistribution(CBCSourceRedshiftDistribution):
         self.directory = directory
         # initialize the interpolator's parameters
         self.create_new_interpolator = dict(
-            redshift_distribution=dict(create_new=False, resolution=500),
-            z_to_luminosity_distance=dict(create_new=False, resolution=500),
-            differential_comoving_volume=dict(create_new=False, resolution=500),
+            redshift_distribution=dict(create_new=False, resolution=1000),
+            z_to_luminosity_distance=dict(create_new=False, resolution=1000),
+            differential_comoving_volume=dict(create_new=False, resolution=1000),
         )
         if isinstance(create_new_interpolator, dict):
             self.create_new_interpolator.update(create_new_interpolator)
@@ -291,27 +291,21 @@ class CBCSourceParameterDistribution(CBCSourceRedshiftDistribution):
             event_type, source_priors, source_priors_params
         )
 
-        if self.gw_param_samplers["zs"] == "sample_source_redshift":
-            # initialize the SourceGalaxyPopulationModel mother class
-            # for redshift distribution
-            # instance attribute sample_source_redshift is initialized here
-            super().__init__(
-                z_min=z_min,
-                z_max=z_max,
-                event_type=event_type,
-                merger_rate_density=self.gw_param_samplers["merger_rate_density"],
-                merger_rate_density_param=self.gw_param_samplers_params[
-                    "merger_rate_density"
-                ],
-                cosmology=cosmology,
-                directory=directory,
-                create_new_interpolator=self.create_new_interpolator,
-            )
-        else:
-            # if you already have the redshift distribution function, you can pass it in.
-            # super class will not be initialized anymore,
-            # get z_to_luminosity_distance
-            self.lookup_table_luminosity_distance(z_min, z_max, directory)
+        # initialize the SourceGalaxyPopulationModel mother class
+        # for redshift distribution
+        # instance attribute sample_source_redshift is initialized here
+        super().__init__(
+            z_min=z_min,
+            z_max=z_max,
+            event_type=event_type,
+            merger_rate_density=self.gw_param_samplers["merger_rate_density"],
+            merger_rate_density_param=self.gw_param_samplers_params[
+                "merger_rate_density"
+            ],
+            cosmology=cosmology,
+            directory=directory,
+            create_new_interpolator=self.create_new_interpolator,
+        )
 
         # initializing samplers
         # it goes through the setter functions and assign the sampler functions

ler/image_properties/image_properties.py

@@ -67,7 +67,7 @@ class ImageProperties():
         default: "./interpolator_pickle"
     create_new_interpolator : `dict`
         dictionary to create new interpolator pickle files
-        default: dict(Dl_to_z=dict(create_new=False, resolution=1000))
+        default: dict(luminosity_distance_to_z=dict(create_new=False, resolution=1000))
 
     Examples
     --------
@@ -140,22 +140,22 @@ class ImageProperties():
         
         # initialize the interpolator's parameters
         self.create_new_interpolator = dict(
-            Dl_to_z=dict(create_new=False, resolution=1000),
+            luminosity_distance_to_z=dict(create_new=False, resolution=1000),
         )
         if isinstance(create_new_interpolator, dict):
             self.create_new_interpolator.update(create_new_interpolator)
         elif create_new_interpolator is True:
             self.create_new_interpolator = dict(
-                Dl_to_z=dict(create_new=True, resolution=1000)
+                luminosity_distance_to_z=dict(create_new=True, resolution=1000)
             )
 
-        resolution = self.create_new_interpolator["Dl_to_z"]["resolution"]
-        create_new = self.create_new_interpolator["Dl_to_z"]["create_new"]
+        resolution = self.create_new_interpolator["luminosity_distance_to_z"]["resolution"]
+        create_new = self.create_new_interpolator["luminosity_distance_to_z"]["create_new"]
         spline1 = interpolator_from_pickle(
             param_dict_given= dict(z_min=z_min, z_max=z_max, cosmology=self.cosmo, resolution=resolution),
             directory=directory,
-            sub_directory="Dl_to_z",
-            name="Dl_to_z",
+            sub_directory="luminosity_distance_to_z",
+            name="luminosity_distance_to_z",
             x = np.linspace(z_min, z_max, resolution),
             pdf_func= lambda z_: cosmo.luminosity_distance(z_).value, 
             conditioned_y=None, 
@@ -163,7 +163,7 @@ class ImageProperties():
             category="function_inverse",
             create_new=create_new,
         )
-        self.Dl_to_z = njit(lambda z_: cubic_spline_interpolator(z_, spline1[0], spline1[1]))
+        self.luminosity_distance_to_z = njit(lambda z_: cubic_spline_interpolator(z_, spline1[0], spline1[1]))
 
     def image_properties(
             self,

ler/lens_galaxy_population/lens_galaxy_parameter_distribution.py

@@ -237,12 +237,12 @@ class LensGalaxyParameterDistribution(CBCSourceParameterDistribution, ImagePrope
             z_to_luminosity_distance=dict(create_new=False, resolution=1000),
             velocity_dispersion=dict(create_new=False, resolution=1000),
             axis_ratio=dict(create_new=False, resolution=1000),
-            optical_depth=dict(create_new=False, resolution=1000),
+            optical_depth=dict(create_new=False, resolution=200),
             z_to_Dc=dict(create_new=False, resolution=1000),
             Dc_to_z=dict(create_new=False, resolution=1000),
             angular_diameter_distance=dict(create_new=False, resolution=1000),
             differential_comoving_volume=dict(create_new=False, resolution=1000),
-            Dl_to_z=dict(create_new=False, resolution=1000),
+            luminosity_distance_to_z=dict(create_new=False, resolution=1000),
         )
         if isinstance(create_new_interpolator, dict):
             self.create_new_interpolator.update(create_new_interpolator)
@@ -252,12 +252,12 @@ class LensGalaxyParameterDistribution(CBCSourceParameterDistribution, ImagePrope
                 z_to_luminosity_distance=dict(create_new=True, resolution=1000),
                 velocity_dispersion=dict(create_new=True, resolution=1000),
                 axis_ratio=dict(create_new=True, resolution=1000),
-                optical_depth=dict(create_new=True, resolution=1000),
+                optical_depth=dict(create_new=True, resolution=200),
                 z_to_Dc=dict(create_new=True, resolution=1000),
                 Dc_to_z=dict(create_new=True, resolution=1000),
                 angular_diameter_distance=dict(create_new=True, resolution=1000),
                 differential_comoving_volume=dict(create_new=True, resolution=1000),
-                Dl_to_z=dict(create_new=True, resolution=1000),
+                luminosity_distance_to_z=dict(create_new=True, resolution=1000),
             )
 
         # dealing with prior functions and categorization

ler/lens_galaxy_population/optical_depth.py

@@ -176,7 +176,7 @@ class OpticalDepth():
         if sampler_priors:
             self.sampler_priors.update(sampler_priors)
         self.sampler_priors_params = dict(
-            velocity_dispersion=dict(vd_min=0., vd_max=600.),
+            velocity_dispersion=dict(vd_min=0., vd_max=350.),
             axis_ratio=dict(q_min=0.2, q_max=1.),
         )
         if sampler_priors_params:
@@ -188,7 +188,7 @@ class OpticalDepth():
         self.c_n_i = dict(
             velocity_dispersion=dict(create_new=False, resolution=1000),
             axis_ratio=dict(create_new=False, resolution=1000),
-            optical_depth=dict(create_new=False, resolution=1000),
+            optical_depth=dict(create_new=False, resolution=200),
             z_to_Dc=dict(create_new=False, resolution=1000),
             Dc_to_z=dict(create_new=False, resolution=1000),
             angular_diameter_distance=dict(create_new=False, resolution=1000),
@@ -200,7 +200,7 @@ class OpticalDepth():
             self.c_n_i = dict(
                 velocity_dispersion=dict(create_new=True, resolution=1000),
                 axis_ratio=dict(create_new=True, resolution=1000),
-                optical_depth=dict(create_new=True, resolution=1000),
+                optical_depth=dict(create_new=True, resolution=200),
                 z_to_Dc=dict(create_new=True, resolution=1000),
                 Dc_to_z=dict(create_new=True, resolution=1000),
                 angular_diameter_distance=dict(create_new=True, resolution=1000),
@@ -239,6 +239,7 @@ class OpticalDepth():
         except:
             self.vd_min = 10.
             self.vd_max = 350.
+            self.sampler_priors_params['velocity_dispersion']=dict(vd_min=self.vd_min, vd_max=self.vd_max)
 
         # generating inverse cdf interpolator for velocity dispersion
         param_dict_given_ = dict(z_min=self.z_min, z_max=self.z_max, vd_min=self.vd_min, vd_max=self.vd_max, cosmology=self.cosmo, name=vd_name, resolution=self.c_n_i["velocity_dispersion"]["resolution"])