Commit e17d97ab authored by yuedong0607's avatar yuedong0607
Browse files

Update detector labels, TIDs, and v-band metadata 

Use chip labels and optional TIDs for next-release detectors 00-30, including TTD, while preserving QE references, calibration assignments, and response profiles.

Normalize the v filter and LED mapping, use configured chip metadata in FITS headers, update model/schema coverage, and ignore local diagnostic scripts and generated artifacts.
parent a0a6066d

.gitignore

+5 −1
Original line number Diff line number Diff line
@@ -10,3 +10,7 @@ dist/* 
pnodes

.coverage

coverage



# Local diagnostic scripts and generated artifacts

/diagnostics/

/observation_sim/sky_background/tools/diagnostic_plots.py

csst_msc_instrument/definition_sets/next/1.0.0/filters.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ filters: 
  r: {display_name: r, survey: photometric, legacy_id: 3, wide_full_depth_exposures: 2, deep_full_depth_exposures: 8}

  i: {display_name: i, survey: photometric, legacy_id: 4, wide_full_depth_exposures: 2, deep_full_depth_exposures: 8}

  z: {display_name: z, survey: photometric, legacy_id: 5, wide_full_depth_exposures: 2, deep_full_depth_exposures: 8}

  v: {display_name: V, survey: photometric, legacy_id: 6}

  v: {display_name: v, survey: photometric, legacy_id: 6}

  gu: {display_name: GU, survey: spectroscopic, legacy_id: 7, wide_full_depth_exposures: 4, deep_full_depth_exposures: 16}

  gv: {display_name: GV, survey: spectroscopic, legacy_id: 8, wide_full_depth_exposures: 4, deep_full_depth_exposures: 16}

  gi: {display_name: GI, survey: spectroscopic, legacy_id: 9, wide_full_depth_exposures: 4, deep_full_depth_exposures: 16}

csst_msc_instrument/definition_sets/next/1.0.0/focal_plane.yaml

+63 −32
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ coordinate_system: 
  y_axis: focal-plane +Y as defined by the instrument ICD

detectors:

- id: '00'

  name: CCD30

  name: v-1

  TID: TTD

  detector_type: CCD290-99-1-F82

  qe_curve: CCD30.txt

  readout_mode: science_ccd290_99_1_f82
@@ -22,11 +23,12 @@ detectors: 
    y_mm: -321.6

    rotation_deg: 0.0

  optical_role:

    filter: V

    filter: v

    response_profile: v

    survey: photometric

- id: '01'

  name: CCD0

  name: GI-1

  TID: CCD0

  detector_type: CCD290-99-1-F24

  qe_curve: CCD0.txt

  readout_mode: science_ccd290_99_1_f24
@@ -39,7 +41,8 @@ detectors: 
    filter: GI

    survey: spectroscopic

- id: '02'

  name: CCD6

  name: GV-1

  TID: CCD6

  detector_type: CCD290-99-1-F82

  qe_curve: CCD6.txt

  readout_mode: science_ccd290_99_1_f82
@@ -52,7 +55,8 @@ detectors: 
    filter: GV

    survey: spectroscopic

- id: '03'

  name: CCD12

  name: GU-1

  TID: CCD12

  detector_type: GM1201A-1A

  qe_curve: CCD12.txt

  readout_mode: science_gm1201a_1a
@@ -65,7 +69,8 @@ detectors: 
    filter: GU

    survey: spectroscopic

- id: '04'

  name: CCD18

  name: GU-2

  TID: CCD18

  detector_type: GM1201A-1A

  qe_curve: CCD18.txt

  readout_mode: science_gm1201a_1a
@@ -78,7 +83,8 @@ detectors: 
    filter: GU

    survey: spectroscopic

- id: '05'

  name: CCD24

  name: GV-2

  TID: CCD24

  detector_type: CCD290-99-1-F82

  qe_curve: CCD24.txt

  readout_mode: science_ccd290_99_1_f82
@@ -91,7 +97,8 @@ detectors: 
    filter: GV

    survey: spectroscopic

- id: '06'

  name: CCD1

  name: WI-1

  TID: CCD1

  detector_type: CCD290-99-1-F24

  qe_curve: CCD1.txt

  readout_mode: science_ccd290_99_1_f24
@@ -105,7 +112,8 @@ detectors: 
    response_profile: wi1

    survey: photometric

- id: '07'

  name: CCD7

  name: i-1

  TID: CCD7

  detector_type: CCD290-99-1-F24

  qe_curve: CCD7.txt

  readout_mode: science_ccd290_99_1_f24
@@ -119,7 +127,8 @@ detectors: 
    response_profile: i1

    survey: photometric

- id: 08

  name: CCD13

  name: g-1

  TID: CCD13

  detector_type: GM1201A-1B

  qe_curve: CCD13.txt

  readout_mode: science_gm1201a_1b
@@ -133,7 +142,8 @@ detectors: 
    response_profile: g1

    survey: photometric

- id: 09

  name: CCD19

  name: r-1

  TID: CCD19

  detector_type: CCD290-99-1-F82

  qe_curve: CCD19.txt

  readout_mode: science_ccd290_99_1_f82
@@ -147,7 +157,8 @@ detectors: 
    response_profile: r1

    survey: photometric

- id: '10'

  name: CCD25

  name: GI-2

  TID: CCD25

  detector_type: CCD290-99-1-F24

  qe_curve: CCD25.txt

  readout_mode: science_ccd290_99_1_f24
@@ -160,7 +171,8 @@ detectors: 
    filter: GI

    survey: spectroscopic

- id: '11'

  name: CCD2

  name: z-1

  TID: CCD2

  detector_type: CCD290-99-1-F24

  qe_curve: CCD2.txt

  readout_mode: science_ccd290_99_1_f24
@@ -174,7 +186,8 @@ detectors: 
    response_profile: z1

    survey: photometric

- id: '12'

  name: CCD8

  name: NUV-1

  TID: CCD8

  detector_type: GM1201A-1A

  qe_curve: CCD8.txt

  readout_mode: science_gm1201a_1a
@@ -188,7 +201,8 @@ detectors: 
    response_profile: nuv1

    survey: photometric

- id: '13'

  name: CCD14

  name: NUV-2

  TID: CCD14

  detector_type: GM1201A-1A

  qe_curve: CCD14.txt

  readout_mode: science_gm1201a_1a
@@ -202,7 +216,8 @@ detectors: 
    response_profile: nuv2

    survey: photometric

- id: '14'

  name: CCD20

  name: u-1

  TID: CCD20

  detector_type: GM1201A-1A

  qe_curve: CCD20.txt

  readout_mode: science_gm1201a_1a
@@ -216,7 +231,8 @@ detectors: 
    response_profile: u1

    survey: photometric

- id: '15'

  name: CCD26

  name: WV-1

  TID: CCD26

  detector_type: CCD290-99-1-F24

  qe_curve: CCD26.txt

  readout_mode: science_ccd290_99_1_f24
@@ -230,7 +246,8 @@ detectors: 
    response_profile: wv2

    survey: photometric

- id: '16'

  name: CCD3

  name: WV-2

  TID: CCD3

  detector_type: CCD290-99-1-F24

  qe_curve: CCD3.txt

  readout_mode: science_ccd290_99_1_f24
@@ -244,7 +261,8 @@ detectors: 
    response_profile: wv1

    survey: photometric

- id: '17'

  name: CCD9

  name: u-2

  TID: CCD9

  detector_type: GM1201A-1A

  qe_curve: CCD9.txt

  readout_mode: science_gm1201a_1a
@@ -258,7 +276,8 @@ detectors: 
    response_profile: u2

    survey: photometric

- id: '18'

  name: CCD15

  name: NUV-3

  TID: CCD15

  detector_type: GM1201A-1A

  qe_curve: CCD15.txt

  readout_mode: science_gm1201a_1a
@@ -272,7 +291,8 @@ detectors: 
    response_profile: nuv3

    survey: photometric

- id: '19'

  name: CCD21

  name: NUV-4

  TID: CCD21

  detector_type: GM1201A-1A

  qe_curve: CCD21.txt

  readout_mode: science_gm1201a_1a
@@ -286,7 +306,8 @@ detectors: 
    response_profile: nuv4

    survey: photometric

- id: '20'

  name: CCD27

  name: z-2

  TID: CCD27

  detector_type: CCD290-99-1-F24

  qe_curve: CCD27.txt

  readout_mode: science_ccd290_99_1_f24
@@ -300,7 +321,8 @@ detectors: 
    response_profile: z2

    survey: photometric

- id: '21'

  name: CCD4

  name: GI-3

  TID: CCD4

  detector_type: CCD290-99-1-F24

  qe_curve: CCD4.txt

  readout_mode: science_ccd290_99_1_f24
@@ -313,7 +335,8 @@ detectors: 
    filter: GI

    survey: spectroscopic

- id: '22'

  name: CCD10

  name: r-2

  TID: CCD10

  detector_type: CCD290-99-1-F82

  qe_curve: CCD10.txt

  readout_mode: science_ccd290_99_1_f82
@@ -327,7 +350,8 @@ detectors: 
    response_profile: r2

    survey: photometric

- id: '23'

  name: CCD16

  name: g-2

  TID: CCD16

  detector_type: GM1201A-1B

  qe_curve: CCD16.txt

  readout_mode: science_gm1201a_1b
@@ -341,7 +365,8 @@ detectors: 
    response_profile: g2

    survey: photometric

- id: '24'

  name: CCD22

  name: i-2

  TID: CCD22

  detector_type: CCD290-99-1-F24

  qe_curve: CCD22.txt

  readout_mode: science_ccd290_99_1_f24
@@ -355,7 +380,8 @@ detectors: 
    response_profile: i2

    survey: photometric

- id: '25'

  name: CCD28

  name: WI-2

  TID: CCD28

  detector_type: CCD290-99-1-F24

  qe_curve: CCD28.txt

  readout_mode: science_ccd290_99_1_f24
@@ -369,7 +395,8 @@ detectors: 
    response_profile: wi2

    survey: photometric

- id: '26'

  name: CCD5

  name: GV-3

  TID: CCD5

  detector_type: CCD290-99-1-F82

  qe_curve: CCD5.txt

  readout_mode: science_ccd290_99_1_f82
@@ -382,7 +409,8 @@ detectors: 
    filter: GV

    survey: spectroscopic

- id: '27'

  name: CCD11

  name: GU-3

  TID: CCD11

  detector_type: GM1201A-1A

  qe_curve: CCD11.txt

  readout_mode: science_gm1201a_1a
@@ -395,7 +423,8 @@ detectors: 
    filter: GU

    survey: spectroscopic

- id: '28'

  name: CCD17

  name: GU-4

  TID: CCD17

  detector_type: GM1201A-1A

  qe_curve: CCD17.txt

  readout_mode: science_gm1201a_1a
@@ -408,7 +437,8 @@ detectors: 
    filter: GU

    survey: spectroscopic

- id: '29'

  name: CCD23

  name: GV-4

  TID: CCD23

  detector_type: CCD290-99-1-F82

  qe_curve: CCD23.txt

  readout_mode: science_ccd290_99_1_f82
@@ -421,7 +451,8 @@ detectors: 
    filter: GV

    survey: spectroscopic

- id: '30'

  name: CCD29

  name: GI-4

  TID: CCD29

  detector_type: CCD290-99-1-F24

  qe_curve: CCD29.txt

  readout_mode: science_ccd290_99_1_f24

csst_msc_instrument/models.py

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ class OpticalRole(StrictModel): 
class DetectorInstance(StrictModel):

    id: str = Field(min_length=1)

    name: str = Field(min_length=1)

    TID: str | None = Field(default=None, min_length=1)

    detector_type: str

    qe_curve: str | None = None

    readout_mode: str | None = None

csst_msc_instrument/schemas/1.0/focal_plane.schema.json

+13 −0
Original line number Diff line number Diff line
@@ -70,6 +70,19 @@ 
    "DetectorInstance": {

      "additionalProperties": false,

      "properties": {

        "TID": {

          "anyOf": [

            {

              "minLength": 1,

              "type": "string"

            },

            {

              "type": "null"

            }

          ],

          "default": null,

          "title": "Tid"

        },

        "calibration_overrides": {

          "$ref": "#/$defs/DetectorCalibrationOverrides"

        },