forgot to save

LSSTDESC · May 17, 2024 · f9d7ad0 · f9d7ad0
1 parent fb3e8c1
commit f9d7ad0
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/rail/estimation/algos/lephare.py b/src/rail/estimation/algos/lephare.py
@@ -50,13 +50,7 @@ class LephareInformer(CatInformer):
         redshift_col=SHARED_PARAMS,
         lephare_config=Param(
             dict,
-<<<<<<< Updated upstream
-            lp.keymap_to_string_dict(lp.read_config(
-                "{}/{}".format(os.path.dirname(os.path.abspath(__file__)), "lsst.para")
-            )),
-=======
             lsst_default_config,
->>>>>>> Stashed changes
             msg="The lephare config keymap.",
         ),
         star_config=Param(
@@ -238,13 +232,9 @@ def _process_chunk(self, start, end, data, first):
             offsets = [a0, a1]
         elif not self.config["offsets"]:
             offsets = self.model["offsets"]
-<<<<<<< Updated upstream
-        output, pdfs, zgrid = lp.process(lp.string_dict_to_keymap(self.lephare_config), input, offsets=offsets)
-=======
         output, pdfs, zgrid = lp.process(
             self.lephare_config, input, offsets=offsets
         )
->>>>>>> Stashed changes
         self.zgrid = zgrid
 
         ng = data[self.config.bands[0]].shape[0]