Commit 35d732cc authored by Wei Chengliang's avatar Wei Chengliang
Browse files

Merge branch 'bugfix/astrometry_and_detector-effects' into 'develop'

bugfix in Astrometry_util.py and Chip.py

See merge request csst_sim/csst-simulation!6
parents 52035bdf b1da12e3
...@@ -111,7 +111,8 @@ def on_orbit_obs_position(input_ra_list, input_dec_list, input_pmra_list, input_ ...@@ -111,7 +111,8 @@ def on_orbit_obs_position(input_ra_list, input_dec_list, input_pmra_list, input_
input_dec = c_double(input_dec_list[i]) input_dec = c_double(input_dec_list[i])
input_pmra = c_double(input_pmra_list[i]) input_pmra = c_double(input_pmra_list[i])
input_pmdec = c_double(input_pmdec_list[i]) input_pmdec = c_double(input_pmdec_list[i])
input_rv = c_double(input_rv_list[i] * 3600.) # Convert from km/s to km/h # input_rv = c_double(input_rv_list[i] * 3600.) # Convert from km/s to km/h
input_rv = c_double(input_rv_list[i])
input_parallax = c_double(input_parallax_list[i]) input_parallax = c_double(input_parallax_list[i])
p3 = d3(input_x, input_y, input_z) p3 = d3(input_x, input_y, input_z)
v3 = d3(input_vx, input_vy, input_vz) v3 = d3(input_vx, input_vy, input_vz)
......
...@@ -719,7 +719,7 @@ class Chip(FocalPlane): ...@@ -719,7 +719,7 @@ class Chip(FocalPlane):
if config["ins_effects"]["add_bias"] == True: if config["ins_effects"]["add_bias"] == True:
biaslevel = self.bias_level biaslevel = self.bias_level
overscan = biaslevel-2 overscan = biaslevel-2
elif config["ins_effects"]["add_bias"] == True: elif config["ins_effects"]["add_bias"] == False:
biaslevel = 0 biaslevel = 0
overscan = 0 overscan = 0
for i in range(NDark): for i in range(NDark):
......
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