Commit 5d47da8d authored by Wei Chengliang's avatar Wei Chengliang
Browse files

update C10_Catalog

parent ec9c5ab8
Loading
Loading
Loading
Loading
+38 −11
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ class Catalog(CatalogBase):
        self.pointing = pointing

        self.max_size = 0.0
        self.starDDL = None

        # [TODO] Milky Way extinction
        if (
@@ -185,12 +186,12 @@ class Catalog(CatalogBase):
    def _add_output_columns_header(self):
        self.add_hdr = " av stellarmass dm teff logg feh"
        self.add_hdr += (
            " bulgemass diskmass detA e1 e2 kappa g1 g2 size galType veldisp "
            " fofid galType sfr bulgemass diskmass bulgesize disksize e1 e2 kappa g1 g2 detA qsoindex"
        )

        self.add_fmt = "%8.4f %8.4f %8.4f %8.4f %8.4f %8.4f"
        self.add_fmt += (
            " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "
            " %20d %4d %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %12d "
        )
        self.chip_output.update_output_header(additional_column_names=self.add_hdr)

@@ -402,6 +403,8 @@ class Catalog(CatalogBase):
            else:
                param["hlr_disk"] = param["size"]
                param["hlr_bulge"] = param["size"] * param["bfrac"]
            param["bulgesize"] = param["hlr_bulge"]
            param["disksize"] = param["hlr_disk"]

            # SED coefficients
            param["coeff"] = gals["coeff"][igals]
@@ -409,7 +412,10 @@ class Catalog(CatalogBase):

            # Others
            param["galType"] = gals["type"][igals]
            param["veldisp"] = gals["veldisp"][igals]
            # param["veldisp"] = gals["veldisp"][igals]

            param["fofid"] = gals["fofid"][igals]
            param["sfr"] = gals["sfr"][igals]

            # TEST no redening and no extinction
            param["av"] = 0.0
@@ -436,6 +442,8 @@ class Catalog(CatalogBase):
                    0.0,
                    0.0,
                    0.0,
                    -1,
                    -1,
                    0.0,
                    0.0,
                    0.0,
@@ -448,8 +456,9 @@ class Catalog(CatalogBase):
                    0.0,
                    0.0,
                    0.0,
                    0,
                    0.0,
                    0.0,
                    param["qsoindex"],
                )
                self.objs.append(obj)
                # Then add host galaxy model
@@ -465,17 +474,20 @@ class Catalog(CatalogBase):
                0.0,
                0.0,
                0.0,
                param["fofid"],
                param["galType"],
                param["sfr"],
                param["bulgemass"],
                param["diskmass"],
                param["detA"],
                param["bulgesize"],
                param["disksize"],
                param["e1"],
                param["e2"],
                param["kappa"],
                param["g1"],
                param["g2"],
                param["size"],
                param["galType"],
                param["veldisp"],
                param["detA"],
                param["qsoindex"],
            )

            self.objs.append(obj)
@@ -566,6 +578,8 @@ class Catalog(CatalogBase):
                param["teff"],
                param["logg"],
                param["feh"],
                -1,
                -1,
                0.0,
                0.0,
                0.0,
@@ -575,15 +589,18 @@ class Catalog(CatalogBase):
                0.0,
                0.0,
                0.0,
                -1,
                0.0,
                0.0,
                -1,
            )

            self.objs.append(obj)

    def free_mem(self, **kward):
        if self.starDDL:
            self.starDDL.freeGlobeData()
            del self.starDDL
            self.starDDL = None

    def _load(self, **kwargs):
        self.objs = []
@@ -667,6 +684,16 @@ class Catalog(CatalogBase):
                wave = self.lamb_gal * (1.0 + obj.z)
        else:
            raise ValueError("Object type not known")

        # check SED table
        bad = ~(np.isfinite(wave) & np.isfinite(flux))
        if np.any(bad):
            idx = int(np.argmax(bad))
            raise ValueError(
                f"[WARN] Skip {obj.type} (id={obj.id}): SED has {int(bad.sum())} "
                f"non-finite flux (first at wave={wave[idx]:g}, flux={flux[idx]:g})"
            )

        speci = interpolate.interp1d(wave, flux, fill_value=0.0, bounds_error=False)
        lamb = np.arange(2000, 11001 + 0.5, 0.5)
        y = speci(lamb)