diff --git a/observation_sim/_util.py b/observation_sim/_util.py index 5735fca3a89e9b6edce52b028bd0b0d1628b8210..7c2312750dce7ec35ea665ec67432889ffdcfd4f 100755 --- a/observation_sim/_util.py +++ b/observation_sim/_util.py @@ -26,7 +26,7 @@ def parse_args(): return parser.parse_args() -def generate_pointing_list(config, pointing_filename=None, data_dir=None, dataset = ''): +def generate_pointing_list(config, pointing_filename=None, data_dir=None, dataset=''): pointing_list = [] # Only valid when the pointing list does not contain time stamp column @@ -63,7 +63,8 @@ def generate_pointing_list(config, pointing_filename=None, data_dir=None, datase continue line = line.strip() columns = line.split() - pointing = Pointing(obs_config_file=obs_config_file, dataset=dataset) + pointing = Pointing( + obs_config_file=obs_config_file, dataset=dataset) pointing.read_pointing_columns(columns=columns, id=ipoint) t += delta_t * 60. pointing_list.append(pointing) @@ -83,7 +84,7 @@ def generate_pointing_list(config, pointing_filename=None, data_dir=None, datase timestamp=t, exp_time=exp_time, pointing_type='SCI', - obs_config_file=obs_config_file, + obs_config_file=obs_config_file, dataset=dataset ) t += delta_t * 60. diff --git a/observation_sim/config/Pointing.py b/observation_sim/config/Pointing.py index 3015e728d78245ce85aabbe865a939f53c1fafa2..36766a10c740676b44b73d73631d56ed06aa429d 100644 --- a/observation_sim/config/Pointing.py +++ b/observation_sim/config/Pointing.py @@ -10,7 +10,7 @@ import observation_sim.instruments._util as _util class Pointing(object): - def __init__(self, id=0, ra=0., dec=0., img_pa=0., timestamp=1621915200, sat_x=0., sat_y=0., sat_z=0., sun_x=0., sun_y=0., sun_z=0., sat_vx=0., sat_vy=0., sat_vz=0., exp_time=150., pointing_type='SCI', pointing_type_code='101', pointing_id='00000001', obs_config_file=None, t_shutter_open=1.3, t_shutter_close=1.3, dataset = 'csst-msc-c9-25sqdeg-v3'): + def __init__(self, id=0, ra=0., dec=0., img_pa=0., timestamp=1621915200, sat_x=0., sat_y=0., sat_z=0., sun_x=0., sun_y=0., sun_z=0., sat_vx=0., sat_vy=0., sat_vz=0., exp_time=150., pointing_type='SCI', pointing_type_code='101', pointing_id='00000001', obs_config_file=None, t_shutter_open=1.3, t_shutter_close=1.3, dataset='csst-msc-c9-25sqdeg-v3'): self.id = id self.ra = ra self.dec = dec diff --git a/observation_sim/config/header/ImageHeader.py b/observation_sim/config/header/ImageHeader.py index 2aed73fd92aec63cc5e7d595bd83b2b159cd2490..ef57c8650a4d66a032799d4eee4ece01b250e3b9 100644 --- a/observation_sim/config/header/ImageHeader.py +++ b/observation_sim/config/header/ImageHeader.py @@ -355,7 +355,7 @@ def WCS_def(xlen=9216, ylen=9232, gapy=898.0, gapx1=534, gapx2=1309, ra_ref=60, # TODO project_cycle is temporary， is not in header defined, delete in future -def generatePrimaryHeader(xlen=9216, ylen=9232, pointing_id='00000001', pointing_type_code='101', ra=60, dec=-40, pixel_scale=0.074, time_pt=None, im_type='SCI', exptime=150., sat_pos=[0., 0., 0.], sat_vel=[0., 0., 0.], project_cycle=6, run_counter=0, chip_name="01", obstype = 'WIDE', dataset='csst-msc-c9-25sqdeg-v3'): +def generatePrimaryHeader(xlen=9216, ylen=9232, pointing_id='00000001', pointing_type_code='101', ra=60, dec=-40, pixel_scale=0.074, time_pt=None, im_type='SCI', exptime=150., sat_pos=[0., 0., 0.], sat_vel=[0., 0., 0.], project_cycle=6, run_counter=0, chip_name="01", obstype='WIDE', dataset='csst-msc-c9-25sqdeg-v3'): # array_size1, array_size2, flux, sigma = int(argv[1]), int(argv[2]), 1000.0, 5.0 @@ -432,7 +432,7 @@ def generatePrimaryHeader(xlen=9216, ylen=9232, pointing_id='00000001', pointing # h_prim['FILETYPE'] = get_file_type(img_type=im_type) # h_prim['FILETYPE'] = im_type h_prim['OBSTYPE'] = obstype - h_prim['DATASET'] = dataset + h_prim['DATASET'] = dataset co = coord.SkyCoord(ra, dec, unit='deg') ra_hms = format(co.ra.hms.h, '02.0f') + format(co.ra.hms.m, diff --git a/observation_sim/mock_objects/Galaxy.py b/observation_sim/mock_objects/Galaxy.py index fd7ecba0f697e247725309d4866bf226b232ef96..97df60cdf82ff9ad353ce95db490ba72a593d877 100755 --- a/observation_sim/mock_objects/Galaxy.py +++ b/observation_sim/mock_objects/Galaxy.py @@ -285,7 +285,7 @@ class Galaxy(MockObject): for i in range(len(bandpass_list)): branges[i, 0] = bandpass_list[i].blue_limit * 10 branges[i, 1] = bandpass_list[i].red_limit * 10 - + for i in range(len(bandpass_list)): # bandpass = bandpass_list[i] brange = branges[i] @@ -363,9 +363,11 @@ class Galaxy(MockObject): galImg_List.append(galImg) except: try: - psf, pos_shear = psf_model.get_PSF(chip=chip, pos_img=pos_img) + psf, pos_shear = psf_model.get_PSF( + chip=chip, pos_img=pos_img) star_p = galsim.Convolve(psf, gal) - galImg = star_p.drawImage(wcs=chip_wcs_local, offset=offset) + galImg = star_p.drawImage( + wcs=chip_wcs_local, offset=offset) galImg.setOrigin(0, 0) if np.sum(np.isnan(galImg.array)) > 0: # ERROR happens diff --git a/run_sim.py b/run_sim.py index 933ce33da5c43eacc85ce268815d72b04b9b892a..416cb295bc8afefdaa3bd3527f2fe87041d0801d 100755 --- a/run_sim.py +++ b/run_sim.py @@ -62,7 +62,7 @@ def run_sim(): config["project_cycle"] = 6 if "run_counter" not in config: config["run_counter"] = 0 - + if "data_set" not in config: config["data_set"] = "csst-msc" @@ -75,7 +75,7 @@ def run_sim(): if "pointing_dir" in config['obs_setting']: pointing_dir = config['obs_setting']["pointing_dir"] pointing_list = generate_pointing_list( - config=config, pointing_filename=config['obs_setting']['pointing_file'], data_dir=pointing_dir, dataset = config["data_set"]) + config=config, pointing_filename=config['obs_setting']['pointing_file'], data_dir=pointing_dir, dataset=config["data_set"]) # Make the main output directories run_dir = make_run_dirs(