Commit 428f2c1e authored by Zhang Xin's avatar Zhang Xin
Browse files

pep8

1 merge request!33Release version v3.2.0
Pipeline #8346 passed with stage
in 0 seconds
Showing with 14 additions and 11 deletions
+14 -11
...@@ -26,7 +26,7 @@ def parse_args(): ...@@ -26,7 +26,7 @@ def parse_args():
return parser.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 = [] pointing_list = []
# Only valid when the pointing list does not contain time stamp column # 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 ...@@ -63,7 +63,8 @@ def generate_pointing_list(config, pointing_filename=None, data_dir=None, datase
continue continue
line = line.strip() line = line.strip()
columns = line.split() 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) pointing.read_pointing_columns(columns=columns, id=ipoint)
t += delta_t * 60. t += delta_t * 60.
pointing_list.append(pointing) pointing_list.append(pointing)
......
...@@ -10,7 +10,7 @@ import observation_sim.instruments._util as _util ...@@ -10,7 +10,7 @@ import observation_sim.instruments._util as _util
class Pointing(object): 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.id = id
self.ra = ra self.ra = ra
self.dec = dec self.dec = dec
......
...@@ -355,7 +355,7 @@ def WCS_def(xlen=9216, ylen=9232, gapy=898.0, gapx1=534, gapx2=1309, ra_ref=60, ...@@ -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 # 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 # array_size1, array_size2, flux, sigma = int(argv[1]), int(argv[2]), 1000.0, 5.0
......
...@@ -363,9 +363,11 @@ class Galaxy(MockObject): ...@@ -363,9 +363,11 @@ class Galaxy(MockObject):
galImg_List.append(galImg) galImg_List.append(galImg)
except: except:
try: 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) 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) galImg.setOrigin(0, 0)
if np.sum(np.isnan(galImg.array)) > 0: if np.sum(np.isnan(galImg.array)) > 0:
# ERROR happens # ERROR happens
......
...@@ -75,7 +75,7 @@ def run_sim(): ...@@ -75,7 +75,7 @@ def run_sim():
if "pointing_dir" in config['obs_setting']: if "pointing_dir" in config['obs_setting']:
pointing_dir = config['obs_setting']["pointing_dir"] pointing_dir = config['obs_setting']["pointing_dir"]
pointing_list = generate_pointing_list( 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 # Make the main output directories
run_dir = make_run_dirs( run_dir = make_run_dirs(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment