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 May 02, 2023 by Zhang Xin
--- a/ObservationSim/MockObject/Quasar.py
+++ b/ObservationSim/MockObject/Quasar.py
--- a/ObservationSim/MockObject/SpecDisperser/SpecDisperser.py
+++ b/ObservationSim/MockObject/SpecDisperser/SpecDisperser.py
--- a/ObservationSim/MockObject/Stamp.py
+++ b/ObservationSim/MockObject/Stamp.py
--- a/ObservationSim/MockObject/__init__.py
+++ b/ObservationSim/MockObject/__init__.py
@@ -3,5 +3,6 @@ from .Galaxy import Galaxy
 from .CatalogBase import CatalogBase
 from .Quasar import Quasar
 from .Star import Star
+from .Stamp import Stamp
 from .SkybackgroundMap import *
-# from .CosmicRay import CosmicRay
\ No newline at end of file
+# from .CosmicRay import CosmicRay
--- a/ObservationSim/MockObject/_util.py
+++ b/ObservationSim/MockObject/_util.py
--- a/ObservationSim/ObservationSim.py
+++ b/ObservationSim/ObservationSim.py
--- a/ObservationSim/PSF/FieldDistortion.py
+++ b/ObservationSim/PSF/FieldDistortion.py
--- a/ObservationSim/PSF/PSFInterp.py
+++ b/ObservationSim/PSF/PSFInterp.py
--- a/ObservationSim/_util.py
+++ b/ObservationSim/_util.py
--- a/README.md
+++ b/README.md
--- a/config/config_NGP_dev.yaml
+++ b/config/config_NGP_dev.yaml
--- a/config/config_C6_fits.yaml
+++ b/config/config_C6_fits.yaml
--- a/config/config_NGP.yaml
+++ b/config/config_NGP.yaml
--- a/config/config_example.yaml
+++ b/config/config_example.yaml
--- a/config/config_C3.yaml
+++ b/config/config_C3.yaml
--- a/config/config_testCASE.yaml
+++ b/config/config_testCASE.yaml
--- a/example.sh
+++ b/example.sh
--- a/mpi_example.pbs
+++ b/mpi_example.pbs
--- a/run_C3.pbs
+++ b/run_C3.pbs
--- a/run_C6.pbs
+++ b/run_C6.pbs