Commit f352a815 authored by Zhang Xin's avatar Zhang Xin
Browse files

Merge branch 'develop' into 'master' 

merge develop to master (for release version v1.0.4)

See merge request csst_sim/csst-simulation!2
parents d539cf7f 62a1df6b

Catalog/C3Catalog.py

+4 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ class C3Catalog(CatalogBase): 
            param['dec'] = dec_arr[igals]

            param['ra_orig'] = gals['ra_true'][igals]

            param['dec_orig'] = gals['dec_true'][igals]

            if not self.chip.isContainObj(ra_obj=param['ra'], dec_obj=param['dec'], margin=200):

                continue

            param['mag_use_normal'] = gals['mag_true_g_lsst'][igals]

            if param['mag_use_normal'] >= 26.5:

                continue
@@ -173,6 +171,10 @@ class C3Catalog(CatalogBase): 
                param['av'] = 0.6 * param['av'] / 3.0 # for quasar, av=[0, 0.2], 3.0=av.max-av.im

                param['star'] = 2 # Quasar

            

            # NOTE: this cut cannot be put before the SED type has been assigned

            if not self.chip.isContainObj(ra_obj=param['ra'], dec_obj=param['dec'], margin=200):

                continue



            self.ids += 1

            # param['id'] = self.ids

            param['id'] = gals['galaxyID'][igals]

ObservationSim/Config/Header/ImageHeader.py

+4 −0
Original line number Diff line number Diff line
@@ -311,6 +311,10 @@ def generatePrimaryHeader(xlen = 9216, ylen = 9232, pointNum = '1', ra = 60, dec 
    h_prim['RA_PNT0'] = ra_hms

    h_prim['DEC_PNT0'] = dec_hms

    

    # Get version of CSSTSim Package

    from pkg_resources import get_distribution

    h_prim['SIM_VER'] = (get_distribution("CSSTSim").version, "Version of CSST MSC simulation software")





    return h_prim

ObservationSim/Instrument/data/throughputs/g_throughput.txt

+61 −761
Original line number Diff line number Diff line 
# WaveAns.  Transmission

# g_css

 2000.00    0.00000

 2010.00    0.00000

 2020.00    0.00000
@@ -180,32 +180,32 @@ 
 3780.00    0.00000

 3790.00    0.00000

 3800.00    0.00000

 3810.00    0.00028

 3820.00    0.00056

 3830.00    0.00086

 3840.00    0.00116

 3850.00    0.00147

 3860.00    0.00179

 3870.00    0.00212

 3880.00    0.00246

 3890.00    0.00281

 3900.00    0.00317

 3910.00    0.00353

 3920.00    0.03007

 3930.00    0.05726

 3940.00    0.08509

 3950.00    0.11357

 3960.00    0.14269

 3970.00    0.17247

 3980.00    0.20571

 3990.00    0.24393

 4000.00    0.28298

 4010.00    0.32285

 4020.00    0.36354

 4030.00    0.40506

 4040.00    0.40950

 4050.00    0.41395

 4060.00    0.41841

 3810.00    0.00000

 3820.00    0.00000

 3830.00    0.00000

 3840.00    0.00000

 3850.00    0.00000

 3860.00    0.00000

 3870.00    0.00000

 3880.00    0.00000

 3890.00    0.00000

 3900.00    0.00000

 3910.00    0.00000

 3920.00    0.00000

 3930.00    0.00000

 3940.00    0.00000

 3950.00    0.00000

 3960.00    0.00000

 3970.00    0.00000

 3980.00    0.00000

 3990.00    0.00000

 4000.00    0.00000

 4010.00    0.00000

 4020.00    0.04006

 4030.00    0.12152

 4040.00    0.20475

 4050.00    0.28977

 4060.00    0.37657

 4070.00    0.42288

 4080.00    0.42736

 4090.00    0.43186
@@ -345,40 +345,40 @@ 
 5430.00    0.66665

 5440.00    0.66686

 5450.00    0.66708

 5460.00    0.62096

 5470.00    0.57480

 5480.00    0.52862

 5490.00    0.48240

 5500.00    0.43616

 5510.00    0.38993

 5520.00    0.34366

 5530.00    0.30471

 5540.00    0.26757

 5550.00    0.23040

 5560.00    0.19320

 5570.00    0.15597

 5580.00    0.11870

 5590.00    0.08140

 5600.00    0.04408

 5610.00    0.00671

 5620.00    0.00636

 5630.00    0.00600

 5640.00    0.00565

 5650.00    0.00530

 5660.00    0.00494

 5670.00    0.00459

 5680.00    0.00424

 5690.00    0.00388

 5700.00    0.00353

 5710.00    0.00318

 5720.00    0.00283

 5730.00    0.00247

 5740.00    0.00212

 5750.00    0.00177

 5760.00    0.00141

 5770.00    0.00106

 5780.00    0.00071

 5790.00    0.00035

 5460.00    0.66730

 5470.00    0.66751

 5480.00    0.66773

 5490.00    0.55662

 5500.00    0.44544

 5510.00    0.33422

 5520.00    0.22291

 5530.00    0.11150

 5540.00    0.00000

 5550.00    0.00000

 5560.00    0.00000

 5570.00    0.00000

 5580.00    0.00000

 5590.00    0.00000

 5600.00    0.00000

 5610.00    0.00000

 5620.00    0.00000

 5630.00    0.00000

 5640.00    0.00000

 5650.00    0.00000

 5660.00    0.00000

 5670.00    0.00000

 5680.00    0.00000

 5690.00    0.00000

 5700.00    0.00000

 5710.00    0.00000

 5720.00    0.00000

 5730.00    0.00000

 5740.00    0.00000

 5750.00    0.00000

 5760.00    0.00000

 5770.00    0.00000

 5780.00    0.00000

 5790.00    0.00000

 5800.00    0.00000

 5810.00    0.00000

 5820.00    0.00000
@@ -900,703 +900,3 @@ 
10980.00    0.00000

10990.00    0.00000

11000.00    0.00000
 
11010.00    0.00000

11020.00    0.00000

11030.00    0.00000

11040.00    0.00000

11050.00    0.00000

11060.00    0.00000

11070.00    0.00000

11080.00    0.00000

11090.00    0.00000

11100.00    0.00000

11110.00    0.00000

11120.00    0.00000

11130.00    0.00000

11140.00    0.00000

11150.00    0.00000

11160.00    0.00000

11170.00    0.00000

11180.00    0.00000

11190.00    0.00000

11200.00    0.00000

11210.00    0.00000

11220.00    0.00000

11230.00    0.00000

11240.00    0.00000

11250.00    0.00000

11260.00    0.00000

11270.00    0.00000

11280.00    0.00000

11290.00    0.00000

11300.00    0.00000

11310.00    0.00000

11320.00    0.00000

11330.00    0.00000

11340.00    0.00000

11350.00    0.00000

11360.00    0.00000

11370.00    0.00000

11380.00    0.00000

11390.00    0.00000

11400.00    0.00000

11410.00    0.00000

11420.00    0.00000

11430.00    0.00000

11440.00    0.00000

11450.00    0.00000

11460.00    0.00000

11470.00    0.00000

11480.00    0.00000

11490.00    0.00000

11500.00    0.00000

11510.00    0.00000

11520.00    0.00000

11530.00    0.00000

11540.00    0.00000

11550.00    0.00000

11560.00    0.00000

11570.00    0.00000

11580.00    0.00000

11590.00    0.00000

11600.00    0.00000

11610.00    0.00000

11620.00    0.00000

11630.00    0.00000

11640.00    0.00000

11650.00    0.00000

11660.00    0.00000

11670.00    0.00000

11680.00    0.00000

11690.00    0.00000

11700.00    0.00000

11710.00    0.00000

11720.00    0.00000

11730.00    0.00000

11740.00    0.00000

11750.00    0.00000

11760.00    0.00000

11770.00    0.00000

11780.00    0.00000

11790.00    0.00000

11800.00    0.00000

11810.00    0.00000

11820.00    0.00000

11830.00    0.00000

11840.00    0.00000

11850.00    0.00000

11860.00    0.00000

11870.00    0.00000

11880.00    0.00000

11890.00    0.00000

11900.00    0.00000

11910.00    0.00000

11920.00    0.00000

11930.00    0.00000

11940.00    0.00000

11950.00    0.00000

11960.00    0.00000

11970.00    0.00000

11980.00    0.00000

11990.00    0.00000

12000.00    0.00000

12010.00    0.00000

12020.00    0.00000

12030.00    0.00000

12040.00    0.00000

12050.00    0.00000

12060.00    0.00000

12070.00    0.00000

12080.00    0.00000

12090.00    0.00000

12100.00    0.00000

12110.00    0.00000

12120.00    0.00000

12130.00    0.00000

12140.00    0.00000

12150.00    0.00000

12160.00    0.00000

12170.00    0.00000

12180.00    0.00000

12190.00    0.00000

12200.00    0.00000

12210.00    0.00000

12220.00    0.00000

12230.00    0.00000

12240.00    0.00000

12250.00    0.00000

12260.00    0.00000

12270.00    0.00000

12280.00    0.00000

12290.00    0.00000

12300.00    0.00000

12310.00    0.00000

12320.00    0.00000

12330.00    0.00000

12340.00    0.00000

12350.00    0.00000

12360.00    0.00000

12370.00    0.00000

12380.00    0.00000

12390.00    0.00000

12400.00    0.00000

12410.00    0.00000

12420.00    0.00000

12430.00    0.00000

12440.00    0.00000

12450.00    0.00000

12460.00    0.00000

12470.00    0.00000

12480.00    0.00000

12490.00    0.00000

12500.00    0.00000

12510.00    0.00000

12520.00    0.00000

12530.00    0.00000

12540.00    0.00000

12550.00    0.00000

12560.00    0.00000

12570.00    0.00000

12580.00    0.00000

12590.00    0.00000

12600.00    0.00000

12610.00    0.00000

12620.00    0.00000

12630.00    0.00000

12640.00    0.00000

12650.00    0.00000

12660.00    0.00000

12670.00    0.00000

12680.00    0.00000

12690.00    0.00000

12700.00    0.00000

12710.00    0.00000

12720.00    0.00000

12730.00    0.00000

12740.00    0.00000

12750.00    0.00000

12760.00    0.00000

12770.00    0.00000

12780.00    0.00000

12790.00    0.00000

12800.00    0.00000

12810.00    0.00000

12820.00    0.00000

12830.00    0.00000

12840.00    0.00000

12850.00    0.00000

12860.00    0.00000

12870.00    0.00000

12880.00    0.00000

12890.00    0.00000

12900.00    0.00000

12910.00    0.00000

12920.00    0.00000

12930.00    0.00000

12940.00    0.00000

12950.00    0.00000

12960.00    0.00000

12970.00    0.00000

12980.00    0.00000

12990.00    0.00000

13000.00    0.00000

13010.00    0.00000

13020.00    0.00000

13030.00    0.00000

13040.00    0.00000

13050.00    0.00000

13060.00    0.00000

13070.00    0.00000

13080.00    0.00000

13090.00    0.00000

13100.00    0.00000

13110.00    0.00000

13120.00    0.00000

13130.00    0.00000

13140.00    0.00000

13150.00    0.00000

13160.00    0.00000

13170.00    0.00000

13180.00    0.00000

13190.00    0.00000

13200.00    0.00000

13210.00    0.00000

13220.00    0.00000

13230.00    0.00000

13240.00    0.00000

13250.00    0.00000

13260.00    0.00000

13270.00    0.00000

13280.00    0.00000

13290.00    0.00000

13300.00    0.00000

13310.00    0.00000

13320.00    0.00000

13330.00    0.00000

13340.00    0.00000

13350.00    0.00000

13360.00    0.00000

13370.00    0.00000

13380.00    0.00000

13390.00    0.00000

13400.00    0.00000

13410.00    0.00000

13420.00    0.00000

13430.00    0.00000

13440.00    0.00000

13450.00    0.00000

13460.00    0.00000

13470.00    0.00000

13480.00    0.00000

13490.00    0.00000

13500.00    0.00000

13510.00    0.00000

13520.00    0.00000

13530.00    0.00000

13540.00    0.00000

13550.00    0.00000

13560.00    0.00000

13570.00    0.00000

13580.00    0.00000

13590.00    0.00000

13600.00    0.00000

13610.00    0.00000

13620.00    0.00000

13630.00    0.00000

13640.00    0.00000

13650.00    0.00000

13660.00    0.00000

13670.00    0.00000

13680.00    0.00000

13690.00    0.00000

13700.00    0.00000

13710.00    0.00000

13720.00    0.00000

13730.00    0.00000

13740.00    0.00000

13750.00    0.00000

13760.00    0.00000

13770.00    0.00000

13780.00    0.00000

13790.00    0.00000

13800.00    0.00000

13810.00    0.00000

13820.00    0.00000

13830.00    0.00000

13840.00    0.00000

13850.00    0.00000

13860.00    0.00000

13870.00    0.00000

13880.00    0.00000

13890.00    0.00000

13900.00    0.00000

13910.00    0.00000

13920.00    0.00000

13930.00    0.00000

13940.00    0.00000

13950.00    0.00000

13960.00    0.00000

13970.00    0.00000

13980.00    0.00000

13990.00    0.00000

14000.00    0.00000

14010.00    0.00000

14020.00    0.00000

14030.00    0.00000

14040.00    0.00000

14050.00    0.00000

14060.00    0.00000

14070.00    0.00000

14080.00    0.00000

14090.00    0.00000

14100.00    0.00000

14110.00    0.00000

14120.00    0.00000

14130.00    0.00000

14140.00    0.00000

14150.00    0.00000

14160.00    0.00000

14170.00    0.00000

14180.00    0.00000

14190.00    0.00000

14200.00    0.00000

14210.00    0.00000

14220.00    0.00000

14230.00    0.00000

14240.00    0.00000

14250.00    0.00000

14260.00    0.00000

14270.00    0.00000

14280.00    0.00000

14290.00    0.00000

14300.00    0.00000

14310.00    0.00000

14320.00    0.00000

14330.00    0.00000

14340.00    0.00000

14350.00    0.00000

14360.00    0.00000

14370.00    0.00000

14380.00    0.00000

14390.00    0.00000

14400.00    0.00000

14410.00    0.00000

14420.00    0.00000

14430.00    0.00000

14440.00    0.00000

14450.00    0.00000

14460.00    0.00000

14470.00    0.00000

14480.00    0.00000

14490.00    0.00000

14500.00    0.00000

14510.00    0.00000

14520.00    0.00000

14530.00    0.00000

14540.00    0.00000

14550.00    0.00000

14560.00    0.00000

14570.00    0.00000

14580.00    0.00000

14590.00    0.00000

14600.00    0.00000

14610.00    0.00000

14620.00    0.00000

14630.00    0.00000

14640.00    0.00000

14650.00    0.00000

14660.00    0.00000

14670.00    0.00000

14680.00    0.00000

14690.00    0.00000

14700.00    0.00000

14710.00    0.00000

14720.00    0.00000

14730.00    0.00000

14740.00    0.00000

14750.00    0.00000

14760.00    0.00000

14770.00    0.00000

14780.00    0.00000

14790.00    0.00000

14800.00    0.00000

14810.00    0.00000

14820.00    0.00000

14830.00    0.00000

14840.00    0.00000

14850.00    0.00000

14860.00    0.00000

14870.00    0.00000

14880.00    0.00000

14890.00    0.00000

14900.00    0.00000

14910.00    0.00000

14920.00    0.00000

14930.00    0.00000

14940.00    0.00000

14950.00    0.00000

14960.00    0.00000

14970.00    0.00000

14980.00    0.00000

14990.00    0.00000

15000.00    0.00000

15010.00    0.00000

15020.00    0.00000

15030.00    0.00000

15040.00    0.00000

15050.00    0.00000

15060.00    0.00000

15070.00    0.00000

15080.00    0.00000

15090.00    0.00000

15100.00    0.00000

15110.00    0.00000

15120.00    0.00000

15130.00    0.00000

15140.00    0.00000

15150.00    0.00000

15160.00    0.00000

15170.00    0.00000

15180.00    0.00000

15190.00    0.00000

15200.00    0.00000

15210.00    0.00000

15220.00    0.00000

15230.00    0.00000

15240.00    0.00000

15250.00    0.00000

15260.00    0.00000

15270.00    0.00000

15280.00    0.00000

15290.00    0.00000

15300.00    0.00000

15310.00    0.00000

15320.00    0.00000

15330.00    0.00000

15340.00    0.00000

15350.00    0.00000

15360.00    0.00000

15370.00    0.00000

15380.00    0.00000

15390.00    0.00000

15400.00    0.00000

15410.00    0.00000

15420.00    0.00000

15430.00    0.00000

15440.00    0.00000

15450.00    0.00000

15460.00    0.00000

15470.00    0.00000

15480.00    0.00000

15490.00    0.00000

15500.00    0.00000

15510.00    0.00000

15520.00    0.00000

15530.00    0.00000

15540.00    0.00000

15550.00    0.00000

15560.00    0.00000

15570.00    0.00000

15580.00    0.00000

15590.00    0.00000

15600.00    0.00000

15610.00    0.00000

15620.00    0.00000

15630.00    0.00000

15640.00    0.00000

15650.00    0.00000

15660.00    0.00000

15670.00    0.00000

15680.00    0.00000

15690.00    0.00000

15700.00    0.00000

15710.00    0.00000

15720.00    0.00000

15730.00    0.00000

15740.00    0.00000

15750.00    0.00000

15760.00    0.00000

15770.00    0.00000

15780.00    0.00000

15790.00    0.00000

15800.00    0.00000

15810.00    0.00000

15820.00    0.00000

15830.00    0.00000

15840.00    0.00000

15850.00    0.00000

15860.00    0.00000

15870.00    0.00000

15880.00    0.00000

15890.00    0.00000

15900.00    0.00000

15910.00    0.00000

15920.00    0.00000

15930.00    0.00000

15940.00    0.00000

15950.00    0.00000

15960.00    0.00000

15970.00    0.00000

15980.00    0.00000

15990.00    0.00000

16000.00    0.00000

16010.00    0.00000

16020.00    0.00000

16030.00    0.00000

16040.00    0.00000

16050.00    0.00000

16060.00    0.00000

16070.00    0.00000

16080.00    0.00000

16090.00    0.00000

16100.00    0.00000

16110.00    0.00000

16120.00    0.00000

16130.00    0.00000

16140.00    0.00000

16150.00    0.00000

16160.00    0.00000

16170.00    0.00000

16180.00    0.00000

16190.00    0.00000

16200.00    0.00000

16210.00    0.00000

16220.00    0.00000

16230.00    0.00000

16240.00    0.00000

16250.00    0.00000

16260.00    0.00000

16270.00    0.00000

16280.00    0.00000

16290.00    0.00000

16300.00    0.00000

16310.00    0.00000

16320.00    0.00000

16330.00    0.00000

16340.00    0.00000

16350.00    0.00000

16360.00    0.00000

16370.00    0.00000

16380.00    0.00000

16390.00    0.00000

16400.00    0.00000

16410.00    0.00000

16420.00    0.00000

16430.00    0.00000

16440.00    0.00000

16450.00    0.00000

16460.00    0.00000

16470.00    0.00000

16480.00    0.00000

16490.00    0.00000

16500.00    0.00000

16510.00    0.00000

16520.00    0.00000

16530.00    0.00000

16540.00    0.00000

16550.00    0.00000

16560.00    0.00000

16570.00    0.00000

16580.00    0.00000

16590.00    0.00000

16600.00    0.00000

16610.00    0.00000

16620.00    0.00000

16630.00    0.00000

16640.00    0.00000

16650.00    0.00000

16660.00    0.00000

16670.00    0.00000

16680.00    0.00000

16690.00    0.00000

16700.00    0.00000

16710.00    0.00000

16720.00    0.00000

16730.00    0.00000

16740.00    0.00000

16750.00    0.00000

16760.00    0.00000

16770.00    0.00000

16780.00    0.00000

16790.00    0.00000

16800.00    0.00000

16810.00    0.00000

16820.00    0.00000

16830.00    0.00000

16840.00    0.00000

16850.00    0.00000

16860.00    0.00000

16870.00    0.00000

16880.00    0.00000

16890.00    0.00000

16900.00    0.00000

16910.00    0.00000

16920.00    0.00000

16930.00    0.00000

16940.00    0.00000

16950.00    0.00000

16960.00    0.00000

16970.00    0.00000

16980.00    0.00000

16990.00    0.00000

17000.00    0.00000

17010.00    0.00000

17020.00    0.00000

17030.00    0.00000

17040.00    0.00000

17050.00    0.00000

17060.00    0.00000

17070.00    0.00000

17080.00    0.00000

17090.00    0.00000

17100.00    0.00000

17110.00    0.00000

17120.00    0.00000

17130.00    0.00000

17140.00    0.00000

17150.00    0.00000

17160.00    0.00000

17170.00    0.00000

17180.00    0.00000

17190.00    0.00000

17200.00    0.00000

17210.00    0.00000

17220.00    0.00000

17230.00    0.00000

17240.00    0.00000

17250.00    0.00000

17260.00    0.00000

17270.00    0.00000

17280.00    0.00000

17290.00    0.00000

17300.00    0.00000

17310.00    0.00000

17320.00    0.00000

17330.00    0.00000

17340.00    0.00000

17350.00    0.00000

17360.00    0.00000

17370.00    0.00000

17380.00    0.00000

17390.00    0.00000

17400.00    0.00000

17410.00    0.00000

17420.00    0.00000

17430.00    0.00000

17440.00    0.00000

17450.00    0.00000

17460.00    0.00000

17470.00    0.00000

17480.00    0.00000

17490.00    0.00000

17500.00    0.00000

17510.00    0.00000

17520.00    0.00000

17530.00    0.00000

17540.00    0.00000

17550.00    0.00000

17560.00    0.00000

17570.00    0.00000

17580.00    0.00000

17590.00    0.00000

17600.00    0.00000

17610.00    0.00000

17620.00    0.00000

17630.00    0.00000

17640.00    0.00000

17650.00    0.00000

17660.00    0.00000

17670.00    0.00000

17680.00    0.00000

17690.00    0.00000

17700.00    0.00000

17710.00    0.00000

17720.00    0.00000

17730.00    0.00000

17740.00    0.00000

17750.00    0.00000

17760.00    0.00000

17770.00    0.00000

17780.00    0.00000

17790.00    0.00000

17800.00    0.00000

17810.00    0.00000

17820.00    0.00000

17830.00    0.00000

17840.00    0.00000

17850.00    0.00000

17860.00    0.00000

17870.00    0.00000

17880.00    0.00000

17890.00    0.00000

17900.00    0.00000

17910.00    0.00000

17920.00    0.00000

17930.00    0.00000

17940.00    0.00000

17950.00    0.00000

17960.00    0.00000

17970.00    0.00000

17980.00    0.00000

17990.00    0.00000

18000.00    0.00000

ObservationSim/Instrument/data/throughputs/i_throughput.txt

+103 −803

File changed.

Preview size limit exceeded, changes collapsed.

ObservationSim/Instrument/data/throughputs/nuv_throughput.txt

+66 −766

File changed.

Preview size limit exceeded, changes collapsed.