Skip to content
GitLab
Commit 14bdd76b authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge remote-tracking branch 'origin/develop' into wcs_test

parents 07cee8ad 10e28e08
Show whitespace changes
Inline Side-by-side
ObservationSim/Instrument/data/ccd/chip_definition.json
View file @ 14bdd76b
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
"full_well": 90000 "full_well": 90000
}, },
"15": { "15": {
"chip_name": "y-4", "chip_name": "y-2",
"pix_size": 0.01, "pix_size": 0.01,
"pix_scale": 0.074, "pix_scale": 0.074,
"npix_x": 9216, "npix_x": 9216,
...@@ -648,7 +648,7 @@ ...@@ -648,7 +648,7 @@
"full_well": 90000 "full_well": 90000
}, },
"25": { "25": {
"chip_name": "y-2", "chip_name": "y-4",
"pix_size": 0.01, "pix_size": 0.01,
"pix_scale": 0.074, "pix_scale": 0.074,
"npix_x": 9216, "npix_x": 9216,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment