Merge branch 'develop' into 'master'

merge develop into master (for release v2.0) See merge request csst_sim/csst-simulation!13

Merge branch 'develop' into 'master'
merge develop into master (for release v2.0) See merge request csst_sim/csst-simulation!13
538b21ee · Zhang Xin · 2953a065 · 1c871e69 · 538b21ee · 538b21ee
Commit 538b21ee authored 1 year ago by Zhang Xin
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 606124 additions and 43 deletions
+606124 -43
--- a/run_NGP.pbs
+++ b/run_NGP.pbs
--- a/run_fgs.pbs
+++ b/run_fgs.pbs
--- a/run_sim.py
+++ b/run_sim.py
--- a/setup.py
+++ b/setup.py
--- a/test_C6.sh
+++ b/test_C6.sh
--- a/test_fgs.sh
+++ b/test_fgs.sh
--- a/tests/TestSpecDisperse.py
+++ b/tests/TestSpecDisperse.py
--- a/tools/create_chip_json.py
+++ b/tools/create_chip_json.py
--- a/tools/get_pointing.py
+++ b/tools/get_pointing.py
--- a/tools/indexFits_hdf5.py
+++ b/tools/indexFits_hdf5.py
--- a/tools/sky.dat
+++ b/tools/sky.dat