Merge remote-tracking branch 'origin/develop'

36189a3e · JX · dd26d370 · 27646bc4 · 36189a3e · 36189a3e
Commit 36189a3e authored 1 year ago by JX
Show whitespace changes
Inline Side-by-side

Showing

with 0 additions and 0 deletions
+0 -0
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV1.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV1.conf
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV2.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV2.conf
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV3.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV3.conf
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV4.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV4.conf
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV5.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV5.conf
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV6.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV6.conf
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV7.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV7.conf
--- a/ObservationSim/Instrument/data/sls_conf/CSST_GV8.conf
+++ b/ObservationSim/Instrument/data/sls_conf/CSST_GV8.conf
--- a/ObservationSim/Instrument/data/sls_conf/GI.Throughput.-1st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GI.Throughput.-1st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GI.Throughput.-2st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GI.Throughput.-2st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GI.Throughput.0st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GI.Throughput.0st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GI.Throughput.1st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GI.Throughput.1st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GI.Throughput.2st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GI.Throughput.2st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GU.Throughput.-1st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GU.Throughput.-1st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GU.Throughput.-2st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GU.Throughput.-2st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GU.Throughput.0st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GU.Throughput.0st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GU.Throughput.1st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GU.Throughput.1st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GU.Throughput.2st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GU.Throughput.2st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GV.Throughput.-1st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GV.Throughput.-1st.fits
--- a/ObservationSim/Instrument/data/sls_conf/GV.Throughput.-2st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GV.Throughput.-2st.fits