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

Merge branch 'develop' into 'add_ghost' 

# Conflicts:
#   catalog/C10_Catalog.py
#   config/obs_config_SCI.yaml
parents f92ea9e9 3dd66999

catalog/C10_Catalog.py

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ class Catalog(CatalogBase): 
            param['diskmass'] = gals['diskmass'][igals]



            np.random.seed(int(pix_id)+cat_id+igals)

            param['size'] = (gals['size'][igals] * ((1.+gals['redshift'][igals])**(0.4))) * np.random.uniform(0.7, 1.3)

            param['size'] = (gals['size'][igals] * (1.+gals['redshift'][igals])) * np.random.uniform(0.7, 1.3)

            if param['size'] > self.max_size:

                self.max_size = param['size']

catalog/C9_Catalog.py

+2 −1
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ class Catalog(CatalogBase): 
            param['bulgemass'] = gals['bulgemass'][igals]

            param['diskmass'] = gals['diskmass'][igals]



            param['size'] = gals['size'][igals]

            np.random.seed(int(pix_id)+cat_id+igals)

            param['size'] = (gals['size'][igals] * (1.+gals['redshift'][igals])) * np.random.uniform(0.7, 1.3)

            if param['size'] > self.max_size:

                self.max_size = param['size']

config/config_overall.yaml

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
# can add some of the command-line arguments here as well;

# ok to pass either way or both, as long as they are consistent

work_dir: "/public/home/fangyuedong/project/workplace/"

run_name: "ext_on"

data_set: "csst-msc-c11-1000sqdeg-wide-v1"

run_name: "csst-msc-c11-test-wide-v1"

data_set: "csst-msc-c11-test-wide-v1"



# Project cycle and run counter are used to name the outputs

project_cycle: 11

config/obs_config_SCI.yaml

+2 −1
Original line number Diff line number Diff line
@@ -60,11 +60,12 @@ call_sequence: 
    # Set it here is you want to override the default

    # exptime: 150. # [s]

    add_dark: YES

    input_dark: YES

  # Simulate brighter fatter effects

  bright_fatter: {}

  # Add detector defects: hot/warm pixels, bad columns

  detector_defects:

    hot_pixels: YES

    # hot_pixels: NO

    dead_pixels: YES

    bad_columns: YES

  # Apply CCD Saturation & Blooming

observation_sim/instruments/chip/Chip.py

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ class Chip(FocalPlane): 
        self.rotate_angle = 0.

        self.overscan = 1000

        self.badfraction = 5e-5

        self.chip_type = 'default'

        # Override default values

        # for key in ["gain", "bias_level, dark_exptime", "flat_exptime", "readout_time", "full_well", "read_noise", "dark_noise", "overscan"]:

        #     if key in config["ins_effects"]: