Commit e1da914c authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge branch 'master' into 'release_v3.0' 

release v3.4.2

See merge request !42
parents e3325d27 fdc0db2a

observation_sim/instruments/Filter.py

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ class Filter(object): 
                s_pix = 0.8

            self.sky_background = s_pix

            self.zodical_spec = spec

        elif self.filter_type.lower() in [x.lower for x in _util.PHOT_FILTERS]:

        elif self.filter_type.lower() in [x.lower() for x in _util.PHOT_FILTERS]:

            s_pix = sl.calculateStrayLightFilter(filter=self.filter_type.lower())

            if s_pix > 1:

                s_pix = 1

observation_sim/instruments/data/sls_conf/CSST_GI1.conf

100644 → 100755
+4 −4
Original line number Diff line number Diff line 
INSTRUMETN CSSTSLS

GRATING GI

GRATING GI1

WAVELENGTH 6200 10000



# -1 order (BEAM C) *******************
@@ -24,7 +24,7 @@ DISP_ORDER_C 1 
DLDP_C_0 755.6596588932522 0.015587390300485957 -0.16741314744072028 -1.3175281859957994e-06 2.05513727604675e-06 8.832969164479482e-08

DLDP_C_1 9.935624889005847 -0.0002136737653699562 -1.020872864604142e-05 6.058024980252416e-09 9.635255997706835e-10 -1.2149704292413596e-11

#

SENSITIVITY_C GI.Throughput.-1st.fits

SENSITIVITY_C GI1.Throughput.-1st.fits

#
@@ -101,7 +101,7 @@ DISP_ORDER_E 1 
DLDP_E_0 868.8360109063287 0.023706842139603508 -0.0769491855531814 -1.2395403734878433e-06 1.309989329353733e-06 5.888920201824052e-08

DLDP_E_1 4.559436282521804 -0.00011499243384001066 -5.219520441621047e-06 3.6430604777099415e-09 4.088575683543154e-10 6.9770027648387484e-12

#

SENSITIVITY_E GI.Throughput.-2st.fits

SENSITIVITY_E GI1.Throughput.-2st.fits

#
@@ -127,6 +127,6 @@ DISP_ORDER_D 1 
DLDP_D_0 59.66360803090409 -0.03645657387700975 0.08209922534239997 2.230113264859621e-06 -4.834004311535735e-07 -1.4872358497827982e-08

DLDP_D_1 -4.851077446754604 3.6642497122158304e-05 -1.3067839658951964e-06 1.1000927192809675e-09 3.3314583798264184e-10 2.0678278604813818e-11

#

SENSITIVITY_D GI.Throughput.2st.fits

SENSITIVITY_D GI1.Throughput.2st.fits

#

observation_sim/instruments/data/sls_conf/CSST_GI2.conf

100644 → 100755
+4 −4
Original line number Diff line number Diff line 
INSTRUMETN CSSTSLS

GRATING GI

GRATING GI2

WAVELENGTH 6200 10000



# 1 order (BEAM A) *******************
@@ -74,7 +74,7 @@ DISP_ORDER_C 1 
DLDP_C_0 -250.87653891624046 0.00011775257705091215 0.17032253220726248 4.239006846514879e-07 -4.231564609888579e-06 -1.6592658263169117e-07

DLDP_C_1 -9.761452141315582 0.00026372262860814094 8.23248940748449e-06 -6.472545916630079e-09 -4.0674947242394865e-10 -2.962493212627706e-11

#

SENSITIVITY_C GI.Throughput.-1st.fits

SENSITIVITY_C GI2.Throughput.-1st.fits

#
@@ -100,7 +100,7 @@ DISP_ORDER_D 1 
DLDP_D_0 733.8401554624074 0.004439836992939525 -0.075583396442746 -1.8532968432870368e-07 2.0798115752148517e-06 5.615411326008769e-08

DLDP_D_1 4.3341044902747194 -0.00012844068613405936 -3.80431814145908e-06 3.1967317450926887e-09 2.1258234347796274e-10 -7.27712508846882e-12

#

SENSITIVITY_D GI.Throughput.2st.fits

SENSITIVITY_D GI2.Throughput.2st.fits

#
@@ -126,6 +126,6 @@ DISP_ORDER_E 1 
DLDP_E_0 170.21582576112604 -0.00361702904232373 0.08120079523412951 1.6321744869549026e-07 -2.007293660443609e-06 -6.116726298600102e-08

DLDP_E_1 -4.66005261735872 0.00012332189146351306 3.732415013960603e-06 -3.103549611558497e-09 -2.077368288348721e-10 6.924884169998507e-12

#

SENSITIVITY_E GI.Throughput.-2st.fits

SENSITIVITY_E GI2.Throughput.-2st.fits

#

observation_sim/instruments/data/sls_conf/CSST_GI3.conf

100644 → 100755
+4 −4
Original line number Diff line number Diff line 
INSTRUMETN CSSTSLS

GRATING GI

GRATING GI3

WAVELENGTH 6200 10000



# -1 order (BEAM C) *******************
@@ -24,7 +24,7 @@ DISP_ORDER_C 1 
DLDP_C_0 852.920713271251 0.00020415981375164483 -0.16129382979592288 -7.094115756146758e-08 1.2217226618960415e-06 4.595200105721275e-08

DLDP_C_1 9.270679356371144 -7.693005148931799e-05 -3.4004786192542885e-06 4.20577558524093e-10 3.050789878765704e-11 -2.0681369535337074e-11

#

SENSITIVITY_C GI.Throughput.-1st.fits

SENSITIVITY_C GI3.Throughput.-1st.fits

#
@@ -101,7 +101,7 @@ DISP_ORDER_E 1 
DLDP_E_0 957.0511758459659 0.005057746213763902 -0.0729423622942145 -2.5234988784255296e-08 6.177575813799166e-07 2.8607495663385403e-08

DLDP_E_1 4.207286898486323 -3.8954613053354636e-05 -1.7821876182464824e-06 2.1505315357934174e-10 1.8211832171998413e-11 -1.2937132797368936e-11

#

SENSITIVITY_E GI.Throughput.-2st.fits

SENSITIVITY_E GI3.Throughput.-2st.fits

#
@@ -127,6 +127,6 @@ DISP_ORDER_D 1 
DLDP_D_0 -65.08675793660555 -0.005230548874792504 0.08200627548217507 6.1009009374265e-08 -4.2174137391224704e-07 -2.5285310688107825e-08

DLDP_D_1 -4.706814910015965 2.7850084482601076e-05 1.42184037625585e-06 -1.3488399703664095e-10 -7.224356720729e-12 9.929160329154079e-12

#

SENSITIVITY_D GI.Throughput.2st.fits

SENSITIVITY_D GI3.Throughput.2st.fits

#

observation_sim/instruments/data/sls_conf/CSST_GI4.conf

100644 → 100755
+4 −4
Original line number Diff line number Diff line 
INSTRUMETN CSSTSLS

GRATING GI

GRATING GI4

WAVELENGTH 6200 10000



# 1 order (BEAM A) *******************
@@ -75,7 +75,7 @@ DISP_ORDER_C 1 
DLDP_C_0 -241.44260321837353 0.00024565678186001805 0.16961119565319727 3.5159141395928157e-07 -4.000086038003742e-06 -1.623403207876253e-07

DLDP_C_1 -9.698374939844344 0.0002462837648602002 9.616502860539608e-06 -5.808764012361449e-09 -4.39365822808047e-10 1.2446736713224882e-11

#

SENSITIVITY_C GI.Throughput.-1st.fits

SENSITIVITY_C GI4.Throughput.-1st.fits

#
@@ -101,7 +101,7 @@ DISP_ORDER_D 1 
DLDP_D_0 690.8693298335895 0.0042952425677610295 -0.07610716612288357 -1.464841243672765e-07 1.9861396305779965e-06 6.845801200125911e-08

DLDP_D_1 4.377269895441115 -0.00012192353167760412 -4.699499575538241e-06 2.868111256606352e-09 2.1110459295730655e-10 -5.359993567948835e-12

#

SENSITIVITY_D GI.Throughput.2st.fits

SENSITIVITY_D GI4.Throughput.2st.fits

#
@@ -127,6 +127,6 @@ DISP_ORDER_E 1 
DLDP_E_0 221.30719461723865 -0.00399404068801109 0.08008068425807174 1.300225978294597e-07 -1.8437444055260217e-06 -7.264382451612819e-08

DLDP_E_1 -4.592908026858205 0.00011356177269749191 4.317455512817054e-06 -2.7095348212113367e-09 -2.0010817631405507e-10 6.879826996826563e-12

#

SENSITIVITY_E GI.Throughput.-2st.fits

SENSITIVITY_E GI4.Throughput.-2st.fits

#