Loading ObservationSim/Config/ChipOutput.py +3 −3 Original line number Diff line number Diff line Loading @@ -14,13 +14,13 @@ class ChipOutput(object): self.ra_cen = ra_cen self.dec_cen = dec_cen else: self.ra_cen = config["ra_center"] self.dec_cen = config["dec_center"] self.ra_cen = config["obs_setting"]["ra_center"] self.dec_cen = config["obs_setting"]["dec_center"] 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["date_obs"] + config["time_obs"] + "_" + str(pointing_ID).rjust(7, '0') + "_" + self.chipLabel.rjust(2,'0') + ".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 # hdr1 = "#ID ID_chip filter xImage yImage ra dec z mag flag SNR " Loading ObservationSim/Config/Config.py +15 −28 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ import galsim import os from astropy.time import Time as asTime def ConfigDir(cat_dir=None, work_dir=None, data_dir=None, config_file_path=None): def ConfigDir(config, work_dir=None, data_dir=None): path_dict = {} # Working directory if work_dir == None: Loading @@ -11,48 +11,35 @@ def ConfigDir(cat_dir=None, work_dir=None, data_dir=None, config_file_path=None) else: path_dict["work_dir"] = work_dir # Configuration file if config_file_path is not None: path_dict["config_file"] = config_file_path else: path_dict["config_file"] = os.path.join(path_dict["work_dir"], "ObservationSim.cfg") # Output directories # path_dict["output_fig_dir"] = os.path.join(path_dict["work_dir"], "figure/") # if not os.path.exists(path_dict["output_fig_dir"]): # os.system("mkdir %s"%path_dict["output_fig_dir"]) # path_dict["output_cat_dir"] = os.path.join(path_dict["work_dir"], "scat/") # if not os.path.exists(path_dict["output_cat_dir"]): # os.system("mkdir %s"%path_dict["output_cat_dir"]) # path_dict["output_img_dir"] = os.path.join(path_dict["work_dir"], "simg/") # if not os.path.exists(path_dict["output_img_dir"]): # os.system("mkdir %s"%path_dict["output_img_dir"]) # Data directory if data_dir == None: # Assume all input datasets are in the work directory path_dict["data_dir"] =os.path.join(path_dict["work_dir"], "data/") else: path_dict["data_dir"] = data_dir # Data sub-catalogs # Object catalog direcotry # path_dict["cat_dir"] = os.path.join(path_dict["data_dir"], "catalog_points_7degree2/", cat_dir) path_dict["cat_dir"] = os.path.join(path_dict["data_dir"], "Catalog_20210126") path_dict["cat_dir"] = os.path.join(path_dict["data_dir"], config["input_path"]["cat_dir"]) # PSF data directory path_dict["psf_dir"] = os.path.join(path_dict["data_dir"], "csstPSFdata/CSSOS_psf_20210108/CSST_psf_ciomp_2p5um_cycle3_ccr90_proc") path_dict["psf_dir"] = os.path.join(path_dict["data_dir"], config["psf_setting"]["psf_dir"]) # SED catalog directory # TODO: SED_dir is deprecated path_dict["SED_dir"] = os.path.join(path_dict["data_dir"], "imageSims/Catalog/SEDObject") path_dict["template_dir"] = path_dict["data_dir"] + "Templates/" # path_dict["template_dir"] = path_dict["data_dir"] + "Templates/" # path_dict["template_dir"] = os.path.join(path_dict["data_dir"], config["SED_templates_path"]["galaxy_SED"]) # Directories/files for instrument parameters, e.g. efficiency curves. path_dict["filter_dir"] = os.path.join(path_dict["data_dir"], "Filters") path_dict["ccd_dir"] = os.path.join(path_dict["data_dir"], "Filter_CCD_Mirror/ccd") path_dict["mirror_file"] = os.path.join(path_dict["data_dir"], "Filter_CCD_Mirror/mirror_ccdnote.txt") 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"], "CRdata") path_dict["CRdata_dir"] = os.path.join(path_dict["data_dir"], config["CR_data_path"]) 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"], "CONF/") path_dict["normalize_dir"] = os.path.join(path_dict["data_dir"], "normalize_filter/") 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 Loading ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc +12 B (7.57 KiB) File changed.No diff preview for this file type. View original file View changed file ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc +12 B (287 B) File changed.No diff preview for this file type. View original file View changed file ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc +41 B (4.41 KiB) File changed.No diff preview for this file type. View original file View changed file Loading
ObservationSim/Config/ChipOutput.py +3 −3 Original line number Diff line number Diff line Loading @@ -14,13 +14,13 @@ class ChipOutput(object): self.ra_cen = ra_cen self.dec_cen = dec_cen else: self.ra_cen = config["ra_center"] self.dec_cen = config["dec_center"] self.ra_cen = config["obs_setting"]["ra_center"] self.dec_cen = config["obs_setting"]["dec_center"] 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["date_obs"] + config["time_obs"] + "_" + str(pointing_ID).rjust(7, '0') + "_" + self.chipLabel.rjust(2,'0') + ".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 # hdr1 = "#ID ID_chip filter xImage yImage ra dec z mag flag SNR " Loading
ObservationSim/Config/Config.py +15 −28 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ import galsim import os from astropy.time import Time as asTime def ConfigDir(cat_dir=None, work_dir=None, data_dir=None, config_file_path=None): def ConfigDir(config, work_dir=None, data_dir=None): path_dict = {} # Working directory if work_dir == None: Loading @@ -11,48 +11,35 @@ def ConfigDir(cat_dir=None, work_dir=None, data_dir=None, config_file_path=None) else: path_dict["work_dir"] = work_dir # Configuration file if config_file_path is not None: path_dict["config_file"] = config_file_path else: path_dict["config_file"] = os.path.join(path_dict["work_dir"], "ObservationSim.cfg") # Output directories # path_dict["output_fig_dir"] = os.path.join(path_dict["work_dir"], "figure/") # if not os.path.exists(path_dict["output_fig_dir"]): # os.system("mkdir %s"%path_dict["output_fig_dir"]) # path_dict["output_cat_dir"] = os.path.join(path_dict["work_dir"], "scat/") # if not os.path.exists(path_dict["output_cat_dir"]): # os.system("mkdir %s"%path_dict["output_cat_dir"]) # path_dict["output_img_dir"] = os.path.join(path_dict["work_dir"], "simg/") # if not os.path.exists(path_dict["output_img_dir"]): # os.system("mkdir %s"%path_dict["output_img_dir"]) # Data directory if data_dir == None: # Assume all input datasets are in the work directory path_dict["data_dir"] =os.path.join(path_dict["work_dir"], "data/") else: path_dict["data_dir"] = data_dir # Data sub-catalogs # Object catalog direcotry # path_dict["cat_dir"] = os.path.join(path_dict["data_dir"], "catalog_points_7degree2/", cat_dir) path_dict["cat_dir"] = os.path.join(path_dict["data_dir"], "Catalog_20210126") path_dict["cat_dir"] = os.path.join(path_dict["data_dir"], config["input_path"]["cat_dir"]) # PSF data directory path_dict["psf_dir"] = os.path.join(path_dict["data_dir"], "csstPSFdata/CSSOS_psf_20210108/CSST_psf_ciomp_2p5um_cycle3_ccr90_proc") path_dict["psf_dir"] = os.path.join(path_dict["data_dir"], config["psf_setting"]["psf_dir"]) # SED catalog directory # TODO: SED_dir is deprecated path_dict["SED_dir"] = os.path.join(path_dict["data_dir"], "imageSims/Catalog/SEDObject") path_dict["template_dir"] = path_dict["data_dir"] + "Templates/" # path_dict["template_dir"] = path_dict["data_dir"] + "Templates/" # path_dict["template_dir"] = os.path.join(path_dict["data_dir"], config["SED_templates_path"]["galaxy_SED"]) # Directories/files for instrument parameters, e.g. efficiency curves. path_dict["filter_dir"] = os.path.join(path_dict["data_dir"], "Filters") path_dict["ccd_dir"] = os.path.join(path_dict["data_dir"], "Filter_CCD_Mirror/ccd") path_dict["mirror_file"] = os.path.join(path_dict["data_dir"], "Filter_CCD_Mirror/mirror_ccdnote.txt") 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"], "CRdata") path_dict["CRdata_dir"] = os.path.join(path_dict["data_dir"], config["CR_data_path"]) 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"], "CONF/") path_dict["normalize_dir"] = os.path.join(path_dict["data_dir"], "normalize_filter/") 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 Loading
ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc +12 B (7.57 KiB) File changed.No diff preview for this file type. View original file View changed file
ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc +12 B (287 B) File changed.No diff preview for this file type. View original file View changed file
ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc +41 B (4.41 KiB) File changed.No diff preview for this file type. View original file View changed file