Merge remote-tracking branch 'upstream/develop' into develop

Author: martinkilbinger

cs_util/cat.py

@@ -185,6 +185,39 @@ def write_fits_BinTable_file(
     hdu_list.writeto(output_path, overwrite=True)
 
 
+def read_fits_to_dict(file_path):
+    """Read Fits To Dict.
+
+    Read FITS file and return dictionary.
+
+    Parameters
+    ----------
+    file_path : str
+        input file path
+
+    Returns
+    -------
+    dict
+        file content
+
+    Raises
+    ------
+    IOError
+        if input file is not found
+    """
+    if not os.path.exists(file_path):
+        raise IOError(f"Input file '{file_path}' not found")
+
+    hdu_list = fits.open(file_path)
+    data_input = hdu_list[1].data
+    col_names = hdu_list[1].data.dtype.names
+    data = {}
+    for col_name in col_names:
+        data[col_name] = data_input[col_name]
+
+    return data
+
+
 def bin_edges2centers(bin_edges):
     """Bin Edges To Centers.
 

cs_util/cosmo.py

@@ -79,9 +79,9 @@ def sigma_crit(z_lens, z_source, cos, d_lens=None, d_source=None):
 
     a_lens = 1 / (1 + z_lens)
     a_source = 1 / (1 + z_source)
-    if not d_lens:
+    if d_lens is None:
         d_lens = cos.angular_diameter_distance(a_lens) * units.Mpc
-    if not d_source:
+    if d_source is None:
         d_source = cos.angular_diameter_distance(a_source) * units.Mpc
 
     d_lens_source = cos.angular_diameter_distance(a_lens, a_source) * units.Mpc

cs_util/plots.py

@@ -43,7 +43,8 @@ def savefig(fname, close_fig=True):
     fname : str
         output file name
     close_fig : bool, optional
-        closes figure if True (default)
+        closes figure if ``True`` (default); chose ``False``
+        to display figure in a jupyter notebook
 
     """
     plt.savefig(fname, facecolor="w", bbox_inches="tight")

pyproject.toml

@@ -6,17 +6,17 @@ authors = ["Martin Kilbinger <martin.kilbinger@cea.fr>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.12"
-astropy = "5.2"
+python = ">=3.9,<3.13"
+astropy = "^5.0"
 camb = "1.5.4"
 datetime = "^5.5"
 numpy = "^1.26.4"
 matplotlib = "^3.8.4"
 swig = "^4.2.1"
 scipy = "^1.13.0"
-# Install pyccl via pip
 vos = "^3.6.1"
 keyring = "^25.2.0"
+pyccl = "^3.0.2"
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.5"