Merge branch 'master' into 'current_stable_for_tests'

for tests before release See merge request !23

Merge branch 'master' into 'current_stable_for_tests'
for tests before release See merge request !23
38e2c452 · Fang Yuedong · e0f2b9f7 · 1c35c0e2 · 38e2c452 · 38e2c452
Commit 38e2c452 authored May 13, 2024 by Fang Yuedong
--- 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
--- a/ObservationSim/Instrument/data/sls_conf/GV.Throughput.0st.fits
+++ b/ObservationSim/Instrument/data/sls_conf/GV.Throughput.0st.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
--- a/ObservationSim/Instrument/data/throughputs/__init__.py
+++ b/ObservationSim/Instrument/data/throughputs/__init__.py
--- a/ObservationSim/MockObject/data/__init__.py
+++ b/ObservationSim/MockObject/data/__init__.py