diff --git a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs1.pickle b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs1.pickle index d6a14d04335d87b147c8e144373f063a0cfeae2a..0504c5d29cfbb7eb9744b871d5fdae78a61b7bec 100644 Binary files a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs1.pickle and b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs1.pickle differ diff --git a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs2.pickle b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs2.pickle index 7bdca1bb094a426c829c3ecccf33b7055f81b935..8c3931afbb6b07ccc07bb2408199d46ef7f0d536 100644 Binary files a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs2.pickle and b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs2.pickle differ diff --git a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs3.pickle b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs3.pickle index aeaf3e534719d1d1b130dde7d1e415dfdb8cf375..cbc249f8778cfeab1e091ca3d3d0972ac58357d9 100644 Binary files a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs3.pickle and b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs3.pickle differ diff --git a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs4.pickle b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs4.pickle index 0f4155f89f1e372d2060d35c7bd482bf880b10b1..3cc84f252816985f0f1f3f2242d488681f7c9926 100644 Binary files a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs4.pickle and b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs4.pickle differ diff --git a/README.md b/README.md index b050654cef82d157d6b9f902d354e4a9afb578cb..30fdb07c89f6e38f4f5a67abfe29ec4bf6948b49 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,12 @@ # CSST主巡天仿真软件 ## 重要更新或问题修复: - +* 2023.07.29: 更新至v2.1版本,内容包括: + * 加入杂散光模块,config文件中添加开关:enable_straylight_model: True/False + * 调整WCS定义:x:E, y:-N + * 头文件关键字调整 + * 适配C6-50平方度仿真星表 + * Bug修复:修复像场畸变导致形变的方向错误等bug * 2023.05.01: 更新至v2.0版本,新功能包含: * C6仿真实现 * fits贴图功能 diff --git a/config/config_fgs.yaml b/config/config_fgs.yaml index 3a0d021da04ac8428696fe10ae2396e90bbe0c20..72456bc62d97b442e98e929799c01a5c0850931a 100644 --- a/config/config_fgs.yaml +++ b/config/config_fgs.yaml @@ -15,7 +15,7 @@ run_name: "fgs_test" # Whether to use MPI run_option: - use_mpi: YES + use_mpi: NO # NOTE: "n_threads" paramters is currently not used in the backend # simulation codes. It should be implemented later in the web frontend # in order to config the number of threads to request from NAOC cluster @@ -107,6 +107,9 @@ obs_setting: # Whether to enable astrometric modeling enable_astrometric_model: True + # Whether to enable straylight model + enable_straylight_model: True + # Cut by saturation magnitude in which band? cut_in_band: "FGS" diff --git a/profile_C6.sh b/profile_C6.sh index 49c79694a11d0082b595dfecf68e03b5ccca03a2..33ba60543657be15aefce50f1e7d109971cc90c2 100755 --- a/profile_C6.sh +++ b/profile_C6.sh @@ -3,10 +3,14 @@ date python -m cProfile -o C6_profiler_test.pstats /share/home/fangyuedong/csst-simulation/run_sim.py \ - --config_file config_50sqdeg.yaml \ - --catalog C6_50sqdeg \ + --config_file config_fgs.yaml \ + --catalog FGS_Catalog \ -c /share/home/fangyuedong/csst-simulation/config + # --config_file config_50sqdeg.yaml \ + # --catalog C6_50sqdeg \ + # -c /share/home/fangyuedong/csst-simulation/config + # --config_file config_C6.yaml \ # --catalog C6_Catalog \ # -c /share/home/fangyuedong/csst-simulation/config