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

14bdd76b · Fang Yuedong · 07cee8ad · 10e28e08 · 14bdd76b
Commit 14bdd76b authored 1 year ago by Fang Yuedong
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/ObservationSim/Instrument/data/ccd/chip_definition.json
+++ b/ObservationSim/Instrument/data/ccd/chip_definition.json
@@ -468,7 +468,7 @@
        "full_well": 90000
    },
    "15": {
-        "chip_name": "y-4",
+        "chip_name": "y-2",
        "pix_size": 0.01,
        "pix_scale": 0.074,
        "npix_x": 9216,
@@ -648,7 +648,7 @@
        "full_well": 90000
    },
    "25": {
-        "chip_name": "y-2",
+        "chip_name": "y-4",
        "pix_size": 0.01,
        "pix_scale": 0.074,
        "npix_x": 9216,