Commit a5d541c9 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

code clean

parent ffe6d3f5

Catalog/C3Catalog.py

+0 −4
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ class C3Catalog(CatalogBase): 
        super().__init__()

        self.cat_dir = os.path.join(config["data_dir"], config["input_path"]["cat_dir"])

        self.seed_Av = config["random_seeds"]["seed_Av"]

        # self.normalize_dir = os.path.join(config["data_dir"], config["SLS_path"]["SLS_norm"])



        # self.normF_star = Table.read(os.path.join(self.normalize_dir, 'SLOAN_SDSS.g.fits'))

        # self.normF_galaxy = Table.read(os.path.join(self.normalize_dir, 'lsst_throuput_g.fits'))

        with pkg_resources.path('Catalog.data', 'SLOAN_SDSS.g.fits') as filter_path:

                self.normF_star = Table.read(str(filter_path))

        with pkg_resources.path('Catalog.data', 'lsst_throuput_g.fits') as filter_path:
@@ -154,7 +151,6 @@ class C3Catalog(CatalogBase): 
            pmdec_list = np.zeros(nstars).tolist()

            rv_list = np.zeros(nstars).tolist()

            parallax_list = [1e-9] * nstars

            # lib_path = os.path.join(self.config["data_dir"], self.config["obs_setting"]["astrometric_lib"])

            dt = datetime.fromtimestamp(self.pointing.timestamp)

            date_str = dt.date().isoformat()

            time_str = dt.time().isoformat()

ObservationSim/Config/ChipOutput.py

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class ChipOutput(object): 
        exp_name = imgKey0 + "_%s_%s.fits"

        self.chipLabel = focal_plane.getChipLabel(chip.chipID)

        self.img_name =  prefix + exp_name%(self.chipLabel, filt.filter_type)

        # self.cat_name = self.img_name[:-5] + ".cat"

        

        self.cat_name = 'MSC_' +  config["obs_setting"]["date_obs"] + config["obs_setting"]["time_obs"] + "_" + str(pointing_ID).rjust(7, '0') + "_" + self.chipLabel.rjust(2,'0') + ".cat"

        self.subdir = subdir

ObservationSim/Config/Config.py

+0 −21
Original line number Diff line number Diff line
@@ -23,27 +23,6 @@ def config_dir(config, work_dir=None, data_dir=None): 
    # PSF data directory

    path_dict["psf_dir"] = os.path.join(path_dict["data_dir"], config["psf_setting"]["psf_dir"])

    path_dict["fd_path"] = os.path.join(path_dict["data_dir"], config["psf_setting"]["fd_path"])

    # SED catalog directory

    # TODO: SED_dir is deprecated

    path_dict["SED_dir"] = os.path.join(path_dict["data_dir"], "imageSims/Catalog/SEDObject")

    

    # Directories/files for instrument parameters, e.g. efficiency curves.

    # path_dict["filter_dir"] = os.path.join(path_dict["data_dir"], config["Efficiency_curve_path"]["filter_eff"])

    # path_dict["ccd_dir"] = os.path.join(path_dict["data_dir"], config["Efficiency_curve_path"]["ccd_eff"])

    # path_dict["mirror_file"] = os.path.join(path_dict["data_dir"], config["Efficiency_curve_path"]["mirror_eff"])



    # Cosmic-ray data directory:

    # path_dict["CRdata_dir"] = os.path.join(path_dict["data_dir"], config["CR_data_path"])

    

    # if "sky_file" in config:

    #     path_dict["sky_file"] = os.path.join(path_dict["data_dir"], config["sky_file"])

    # else:

    #     path_dict["sky_file"] = 'sky_emiss_hubble_50_50_A.dat'

    # path_dict["sky_file"] = os.path.join(path_dict["data_dir"], config["sky_data_path"])



    # Slitless spectroscopy realted

    # path_dict["sls_dir"] = os.path.join(path_dict["data_dir"], config["SLS_path"]["SLS_conf"])

    # path_dict["normalize_dir"] = os.path.join(path_dict["data_dir"], config["SLS_path"]["SLS_norm"])



    return path_dict