From 8a370906c190083cf00a570b2ff4fb9c0ae7657d Mon Sep 17 00:00:00 2001
From: Aang23 <qwerty15@gmx.fr>
Date: Mon, 19 Sep 2022 21:11:24 +0200
Subject: [PATCH] Retune N19

---
 .../noaa/module_noaa_instruments.cpp             |  6 +++++-
 .../{noaa_mhs.json => noaa_18_mhs.json}          |  0
 .../projections_settings/noaa_19_avhrr.json      |  2 +-
 resources/projections_settings/noaa_19_mhs.json  | 16 ++++++++++++++++
 resources/projections_settings/noaa_amsu.json    |  2 +-
 tools/proj_test/main.cpp                         |  2 +-
 6 files changed, 24 insertions(+), 4 deletions(-)
 rename resources/projections_settings/{noaa_mhs.json => noaa_18_mhs.json} (100%)
 create mode 100644 resources/projections_settings/noaa_19_mhs.json

diff --git a/plugins/noaa_metop_support/noaa/module_noaa_instruments.cpp b/plugins/noaa_metop_support/noaa/module_noaa_instruments.cpp
index 0b5c00889..c087a8f20 100644
--- a/plugins/noaa_metop_support/noaa/module_noaa_instruments.cpp
+++ b/plugins/noaa_metop_support/noaa/module_noaa_instruments.cpp
@@ -223,7 +223,11 @@ namespace noaa
                     mhs_products.set_tle(satellite_tle);
                     mhs_products.timestamp_type = satdump::ImageProducts::TIMESTAMP_LINE;
                     mhs_products.set_timestamps(mhs_reader.timestamps);
-                    mhs_products.set_proj_cfg(loadJsonFile(resources::getResourcePath("projections_settings/noaa_mhs.json")));
+
+                    if (scid == 13) // NOAA-18
+                        mhs_products.set_proj_cfg(loadJsonFile(resources::getResourcePath("projections_settings/noaa_18_mhs.json")));
+                    if (scid == 15) // NOAA-19
+                        mhs_products.set_proj_cfg(loadJsonFile(resources::getResourcePath("projections_settings/noaa_19_mhs.json")));
 
                     for (int i = 0; i < 5; i++)
                     {
diff --git a/resources/projections_settings/noaa_mhs.json b/resources/projections_settings/noaa_18_mhs.json
similarity index 100%
rename from resources/projections_settings/noaa_mhs.json
rename to resources/projections_settings/noaa_18_mhs.json
diff --git a/resources/projections_settings/noaa_19_avhrr.json b/resources/projections_settings/noaa_19_avhrr.json
index 2142f7878..006df7d4b 100644
--- a/resources/projections_settings/noaa_19_avhrr.json
+++ b/resources/projections_settings/noaa_19_avhrr.json
@@ -2,7 +2,7 @@
     "type": "normal_single_line",
     "scan_angle": 110.6,
     "roll_offset": -0.01,
-    "yaw_offset": -3.45,
+    "yaw_offset": 2.8,
     "pitch_offset": 0,
     "timestamp_offset": -1,
     "image_width": 2048,
diff --git a/resources/projections_settings/noaa_19_mhs.json b/resources/projections_settings/noaa_19_mhs.json
new file mode 100644
index 000000000..454976360
--- /dev/null
+++ b/resources/projections_settings/noaa_19_mhs.json
@@ -0,0 +1,16 @@
+{
+    "type": "normal_single_line",
+    "scan_angle": 100,
+    "roll_offset": -1,
+    "yaw_offset": 2.8,
+    "timestamp_offset": -11,
+    "image_width": 90,
+    "gcp_spacing_x": 10,
+    "gcp_spacing_y": 10,
+    ///////////////////////
+    "timefilter": {
+        "type": "simple",
+        "scan_time": 2.33,
+        "max_diff": 10.0
+    }
+}
\ No newline at end of file
diff --git a/resources/projections_settings/noaa_amsu.json b/resources/projections_settings/noaa_amsu.json
index 77aa44dbd..5e8e1ebfe 100644
--- a/resources/projections_settings/noaa_amsu.json
+++ b/resources/projections_settings/noaa_amsu.json
@@ -1,7 +1,7 @@
 {
     "type": "normal_single_line",
     "scan_angle": 98,
-    "timestamp_offset": 0,
+    "timestamp_offset": -10,
     "image_width": 30,
     "gcp_spacing_x": 2,
     "gcp_spacing_y": 2,
diff --git a/tools/proj_test/main.cpp b/tools/proj_test/main.cpp
index f85078082..393e4062d 100644
--- a/tools/proj_test/main.cpp
+++ b/tools/proj_test/main.cpp
@@ -23,7 +23,7 @@ int main(int /*argc*/, char *argv[])
     logger->trace("\n" + img_pro.contents.dump(4));
 
     satdump::ImageCompositeCfg rgb_cfg;
-    rgb_cfg.equation = "ch4,ch4,ch4"; //"(ch3 * 0.4 + ch2 * 0.6) * 2.2 - 0.15, ch2 * 2.2 - 0.15, ch1 * 2.2 - 0.15";
+    rgb_cfg.equation = "ch1,ch1,ch1"; //"(ch3 * 0.4 + ch2 * 0.6) * 2.2 - 0.15, ch2 * 2.2 - 0.15, ch1 * 2.2 - 0.15";
     rgb_cfg.equalize = true;
     rgb_cfg.white_balance = true;