Commit 93f17ba6 authored by Zhang Xin's avatar Zhang Xin
Browse files

Merge branch 'master' of https://csst-tb.bao.ac.cn/code/csst-sims/csst_msc_sim into develop

parents b8be6e98 5544935f
Pipeline #6596 passed with stage
in 0 seconds
# CSST主巡天仿真软件
## 重要更新或问题修复:
* 2024.08.03: 更新至v3.1版本,内容包括:
* 加入对导星稳像过程的仿真
* 加入银河系消光的仿真
* Bug修复:修复因滤光片漏光导致的仿真星等不吻合等bug
* 2024.05.15: 更新至v3.0版本,新功能具体内容见[软件说明文档](https://kdocs.cn/l/cjyiU0SXGyn2)
* 2023.07.29: 更新至v2.1版本,内容包括:
* 加入杂散光模块,config文件中添加开关:enable_straylight_model: True/False
......
......@@ -477,7 +477,7 @@ class MockObject(object):
gal_end = [origin_star[0] + starImg.array.shape[0] -
1, origin_star[1] + starImg.array.shape[1] - 1]
if gal_origin[1] < grating_split_pos_chip < gal_end[1]:
subSlitPos = int(grating_split_pos_chip - gal_origin[1] + 1)
subSlitPos = int(grating_split_pos_chip - gal_origin[1])
# part img disperse
star_p1s=[]
for starImg in starImg_List:
......@@ -508,12 +508,12 @@ class MockObject(object):
for starImg in starImg_List:
subImg_p2 = starImg.array[:,
subSlitPos + 1:starImg.array.shape[1]]
subSlitPos:starImg.array.shape[1]]
star_p2 = galsim.Image(subImg_p2)
star_p2.setOrigin(0, 0)
star_p2s.append(star_p2)
origin_p2 = [origin_star[0], grating_split_pos_chip]
xcenter_p2 = max(x_nominal, grating_split_pos_chip - 1) - 0
xcenter_p2 = max(x_nominal, grating_split_pos_chip) - 0
ycenter_p2 = y_nominal - 0
sdp_p2 = SpecDisperser(orig_img=star_p2s, xcenter=xcenter_p2,
......
......@@ -76,7 +76,7 @@ with open("requirements.txt", "r") as f:
]
setup(name='csst_msc_sim',
version='3.0.0',
version='3.1.0',
packages=find_packages(),
# install_requires=[
# # 'numpy>=1.18.5',
......
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