Commit c538f47b authored Apr 14, 2022 by Fang Yuedong

Merge branch 'customizable_catalog' of...

Merge branch 'customizable_catalog' of ssh://119.78.210.97:31415/data/simudata/CSSOSDataProductsSims/codes/CSST into customizable_catalog

parents 1f40c1ef c0976b65

ObservationSim/Astrometry/Astrometry_util.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ def on_orbit_obs_position(input_ra_list, input_dec_list, input_pmra_list, input_
		input_dec = c_double(input_dec_list[i])
		input_pmra = c_double(input_pmra_list[i])
		input_pmdec = c_double(input_pmdec_list[i])
		input_rv = c_double(input_rv_list[i])
		input_rv = c_double(input_rv_list[i] * 3600.) # Convert from km/s to km/h
		input_parallax = c_double(input_parallax_list[i])
		p3 = d3(input_x, input_y, input_z)
		v3 = d3(input_vx, input_vy, input_vz)
		@@ -120,7 +120,7 @@ def on_orbit_obs_position(input_ra_list, input_dec_list, input_pmra_list, input_
		DAT = c_double(37.0)
		output_ra = c_double(0.0)
		output_dec = c_double(0.0)
		rs = shao.onOrbitObs(input_ra, input_dec, input_pmra, input_pmdec, input_rv, input_parallax, \
		rs = shao.onOrbitObs(input_ra, input_dec, input_parallax, input_pmra, input_pmdec, input_rv, \
		input_year_c, input_month_c, input_day_c, input_hour_c, input_minute_c, input_second_c, \
		DAT, byref(p3), byref(v3), \
		input_year_c, input_month_c, input_day_c, input_hour_c, input_minute_c, input_second_c, \

ObservationSim/Config/ChipOutput.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ class ChipOutput(object):
		fh.setFormatter(formatter)
		self.logger.addHandler(fh)

		hdr1 = "obj_ID ID_chip filter xImage yImage ra dec ra_orig dec_orig z mag obj_type "
		hdr1 = "# obj_ID ID_chip filter xImage yImage ra dec ra_orig dec_orig z mag obj_type "
		hdr2 = "thetaR bfrac hlr_disk hlr_bulge e1_disk e2_disk e1_bulge e2_bulge g1 g2 "
		hdr3 = "sed_type av redden "
		hdr4 = "pm_ra pm_dec RV parallax\n"