diff --git "a/CSST\344\270\273\345\267\241\345\244\251Cycle6\346\250\241\346\213\237\346\225\260\346\215\256\350\257\264\346\230\216.pdf" "b/CSST\344\270\273\345\267\241\345\244\251Cycle6\346\250\241\346\213\237\346\225\260\346\215\256\350\257\264\346\230\216.pdf" deleted file mode 100644 index 86a4d5e0b70d09a69b49d6a399dd979a58e396a7..0000000000000000000000000000000000000000 Binary files "a/CSST\344\270\273\345\267\241\345\244\251Cycle6\346\250\241\346\213\237\346\225\260\346\215\256\350\257\264\346\230\216.pdf" and /dev/null differ diff --git a/README.md b/README.md index 9fab7aca6cc2aa862c8188316cc8cfdb3580e267..e0bdaae801a27e687bcbd1ca943c92c05b1d1ecb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # CSST主巡天仿真软件 ## 重要更新或问题修复： -* v3.0版本相关内容：（待补充） +* 2024.05.15: 更新至v3.0版本，新功能具体内容见[软件说明文档](https://kdocs.cn/l/cjyiU0SXGyn2)。 * 2023.07.29: 更新至v2.1版本，内容包括： * 加入杂散光模块，config文件中添加开关：enable_straylight_model: True/False * 调整WCS定义：x：E, y：-N @@ -23,20 +23,33 @@ ## 使用方法及相关说明 -* 软件安装和使用方法可参考：[软件说明文档](https://kdocs.cn/l/cjyiU0SXGyn2)。目前还较为粗糙，持续更新中 +* 软件安装和使用方法可参考：[软件说明文档](https://kdocs.cn/l/cjyiU0SXGyn2)(持续更新中)。 -* 软件安装及问题反馈表：[问题反馈表](https://f.kdocs.cn/w/XYcBkE63/) +* 问题反馈请使用Issues，若无国台gitlab账号，请使用:[问题反馈表](https://f.kdocs.cn/w/XYcBkE63/) -## 相关数据 +## 仿真数据产品说明 -* PSF采样数据下载：[百度云盘](https://pan.baidu.com/s/1_2gbO6-d7x001_FMqZ1tfw)，提取码：2awt +* Cycle 9 仿真数据产品：[CSST主巡天Cycle9数据产品说明](https://pan.cstcloud.cn/s/gHVB8p2TDA) +* 往期已发布数据产品说明：[CSST主巡天往期仿真数据产品说明](https://pan.cstcloud.cn/s/zRF7mu3ET5c) + +## 相关输入数据 + + +* 数据链接：https://pan.baidu.com/s/1cVHovDs4cMsDWWNkoZDRDA?pwd=y63x + * PSF数据库： + * 多色成像: CSSTSim_C9/PSFCube/set1_dynamic + * 无缝光谱: CSSTSim_C9/PSFCube/SLS_PSF_PCA_fp + * C9星表数据： + * 恒星星表：CSSTSim_C9/starcat_C9 + * 星系星表：CSSTSim_C9/galaxycat_C9/cat2CSSTSim_bundle-50sqDeg + * 类星体星表：CSSTSim_C9/galaxycat_C9/qsosed ## 相关会议及workshop diff --git a/catalog/Catalog_example.py b/catalog/Catalog_example.py index 99fb1768beac34319c2ef1efcbc4e743b72478f3..4b51f0a2dd1213294ffcc21f50fe780250c32067 100644 --- a/catalog/Catalog_example.py +++ b/catalog/Catalog_example.py @@ -23,7 +23,7 @@ class Catalog(CatalogBase): star_SED_path : str path to the star SED data objs : list - a list of ObservationSim.MockObject (Star, Galaxy, or Quasar) + a list of observation_sim.mock_objects (Star, Galaxy, or Quasar) NOTE: must have "obj" list when implement your own Catalog Methods @@ -41,10 +41,10 @@ class Catalog(CatalogBase): ---------- config : dict configuration dictionary which is parsed from the input YAML file - chip: ObservationSim.Instrument.Chip - an ObservationSim.Instrument.Chip instance, can be used to identify the band etc. + chip: observation_sim.instruments.Chip + an observation_sim.instruments.Chip instance, can be used to identify the band etc. **kwargs : dict - other needed input parameters (in key-value pairs), please modify corresponding + any other needed input parameters (in key-value pairs), please modify corresponding initialization call in "ObservationSim.py" as you need. Returns @@ -70,10 +70,10 @@ class Catalog(CatalogBase): """Read in all objects in from the catalog file(s). This is a must implemented method which is used to read in all objects, and - then convert them to ObservationSim.MockObject (Star, Galaxy, or Quasar). + then convert them to observation_sim.mock_objects (Star, Galaxy, or Quasar). Currently, - the model of ObservationSim.MockObject.Star class requires: + the model of observation_sim.mock_objects.Star class requires: param["star"] : int specify the object type: 0: galaxy, 1: star, 2: quasar param["id"] : int @@ -88,7 +88,7 @@ class Catalog(CatalogBase): load_norm_filt(obj) function must be implemented to load the filter throughput of that particular photometric system - the model of ObservationSim.MockObject.Galaxy class requires: + the model of observation_sim.mock_objects.Galaxy class requires: param["star"] : int specify the object type: 0: galaxy, 1: star, 2: quasar param["id"] : int @@ -119,7 +119,7 @@ class Catalog(CatalogBase): Sersic index for galaxy bulge component param['g1'], param['g2']: float Reduced weak lensing shear components (valid for shear type: catalog) - the model of ObservationSim.MockObject.Galaxy class requires: + the model of observation_sim.mock_objects.Galaxy class requires: Currently a Quasar is modeled as a point source, just like a Star. NOTE: To construct an object, according to its type, just call: @@ -133,7 +133,7 @@ class Catalog(CatalogBase): Parameters ---------- **kwargs : dict - other needed input parameters (in key-value pairs), please modify corresponding + any other needed input parameters (in key-value pairs), please modify corresponding initialization call in "ObservationSim.py" as you need. Returns @@ -161,7 +161,7 @@ class Catalog(CatalogBase): Parameters ---------- - obj : ObservationSim.MockObject + obj : instance of a particular class in observation_sim.mock_objects the object to get SED data for **kwargs : dict other needed input parameters (in key-value pairs), please modify corresponding @@ -198,7 +198,7 @@ class Catalog(CatalogBase): Parameters ---------- - obj : ObservationSim.MockObject + obj : instance of a particular class in observation_sim.mock_objects the object to get thourghput data for Returns diff --git a/observation_sim/ObservationSim.py b/observation_sim/ObservationSim.py index 051d6d18757b97151e4e56b191d6492f8fa6ce0a..1e82700de0f7e447194fcb3c8b29361b244f1b59 100755 --- a/observation_sim/ObservationSim.py +++ b/observation_sim/ObservationSim.py @@ -45,7 +45,7 @@ class Observation(object): chip.shutter_img = np.ones_like(chip.img.array) else: chip.shutter_img = effects.ShutterEffectArr( - chip.img, t_shutter=1.3, dist_bearing=735, dt=1E-3) + chip.img, t_exp=pointing.exp_time, t_shutter=1.3, dist_bearing=735, dt=1E-3) chip.prnu_img = effects.PRNU_Img(xsize=chip.npix_x, ysize=chip.npix_y, sigma=0.01, seed=int(self.config["random_seeds"]["seed_prnu"]+chip.chipID))