Changes to get notebook running

LSSTDESC · May 17, 2024 · dca196e · dca196e
1 parent ec05eb8
commit dca196e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 227 deletions.
diff --git a/examples/cosmos_demo.ipynb b/examples/cosmos_demo.ipynb
@@ -53,10 +53,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lephare_config_file = \"./data/COSMOS.para\"\n",
-    "lephare_config = lp.read_config(lephare_config_file)\n",
+    "lephare_config = lp.default_cosmos_config\n",
     "# For useable science results you must use a denser redshift grid by commenting out the following line which will revert to the config dz of 0.01.\n",
-    "lephare_config['Z_STEP']=lp.keyword('Z_STEP', \".1,0.,7.\")\n",
+    "lephare_config['Z_STEP']= \".1,0.,7.\"\n",
     "nobj=100 # Increase to run on more objects. Set to -1 to run on all.\n",
     "\n",
     "lp.data_retrieval.get_auxiliary_data(keymap=lephare_config, additional_files=[\"examples/COSMOS.in\",\"examples/output.para\"])"
@@ -68,16 +67,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lephare_config['AUTO_ADAPT'].value"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "bands=lephare_config['FILTER_LIST'].value.split(',')\n",
+    "bands=lephare_config['FILTER_LIST'].split(',')\n",
     "len(bands)"
    ]
   },
@@ -139,7 +129,7 @@
     "    nondetect_val=np.nan,\n",
     "    model=\"lephare.pkl\",\n",
     "    hdf5_groupname=\"\",\n",
-    "    lephare_config=lp.keymap_to_string_dict(lephare_config),\n",
+    "    lephare_config=lephare_config,\n",
     "    bands=flux_cols,\n",
     "    err_bands=flux_err_cols,\n",
     "    ref_band=flux_cols[0],\n",
@@ -175,6 +165,15 @@
     "lephare_estimated = estimate_lephare.estimate(data)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "lephare_config[\"AUTO_ADAPT\"] "
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -188,7 +187,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "indx = 0\n",
+    "indx = 1\n",
     "zgrid = np.linspace(0,7,1000)\n",
     "plt.plot(zgrid, np.squeeze(lephare_estimated.data[indx].pdf(zgrid)), label='Estimated PDF')\n",
     "plt.axvline(x=data['redshift'][indx], color='r', label='True redshift')\n",

diff --git a/examples/data/COSMOS.para b/examples/data/COSMOS.para
diff --git a/src/rail/estimation/algos/lephare.py b/src/rail/estimation/algos/lephare.py
@@ -9,7 +9,7 @@
 import importlib
 
 # We start with the COSMOS default and override with LSST specific values.
-lsst_default_config=lp.default_cosmos_config
+lsst_default_config=lp.default_cosmos_config.copy()
 lsst_default_config.update({'CAT_IN': 'bidon',
  'ERR_SCALE': '0.02,0.02,0.02,0.02,0.02,0.02',
  'FILTER_CALIB': '0,0,0,0,0,0',
@@ -206,8 +206,8 @@ class LephareEstimator(CatEstimator):
 
     def __init__(self, args, comm=None):
         CatEstimator.__init__(self, args, comm=comm)
-        self.lephare_config = self.config["lephare_config"]
         CatEstimator.open_model(self, **self.config)
+        self.lephare_config = self.model["lephare_config"]
         Z_STEP=self.model["lephare_config"]["Z_STEP"]
         self.lephare_config["Z_STEP"]=Z_STEP
         self.dz = float(Z_STEP.split(",")[0])