Skip to content

Commit 5a61134

Browse files
davidfrantzdavidfrantz
committed
L9 in HLPS
1 parent 25238ad commit 5a61134

File tree

5 files changed

+134
-32
lines changed

5 files changed

+134
-32
lines changed

‎src/aux-level/param-aux.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ void write_par_hl_sensor(FILE *fp, bool verbose){
832832
fprintf(fp, "# Sensors to be used in the analysis. Multi-sensor analyses are restricted\n");
833833
fprintf(fp, "# to the overlapping bands. Following sensors are available: LND04 (6-band\n");
834834
fprintf(fp, "# Landsat 4 TM), LND05 (6-band Landsat 5 TM), LND07 (6-band Landsat 7 ETM+),\n");
835-
fprintf(fp, "# LND08 (6-band Landsat 8 OLI), SEN2A (10-band Sentinel-2A), SEN2B (10-band\n");
835+
fprintf(fp, "# LND08/09 (6-band Landsat 8-9 OLI), SEN2A (10-band Sentinel-2A), SEN2B (10-band\n");
836836
fprintf(fp, "# Sentinel-2B), sen2a (4-band Sentinel-2A), sen2b (4-band Sentinel-2B),\n");
837837
fprintf(fp, "# S1AIA (2-band VV-VH Sentinel-1A IW ascending), S1BIA (2-band VV-VH Senti-\n");
838838
fprintf(fp, "# nel-1B IW ascending), S1AID (2-band VV-VH Sentinel-1A IW descending), S1BID\n");
@@ -844,15 +844,15 @@ void write_par_hl_sensor(FILE *fp, bool verbose){
844844
fprintf(fp, "# VVVHP (VV/VH polarized), MODIS (7-band MODIS).\n");
845845
fprintf(fp, "# BAP Composites with such a band designation can be input again (e.g. \n");
846846
fprintf(fp, "# SENSORS = LNDLG).\n");
847-
fprintf(fp, "# Type: Character list. Valid values: {LND04,LND05,LND07,LND08,SEN2A,\n");
847+
fprintf(fp, "# Type: Character list. Valid values: {LND04,LND05,LND07,LND08,LND09,SEN2A,\n");
848848
fprintf(fp, "# SEN2B,sen2a,sen2b,S1AIA,S1BIA,S1AID,S1BID,MOD01,MOD02,LNDLG,SEN2L,SEN2H,R-G-B,VVVHP,MODIS}\n");
849849
}
850-
fprintf(fp, "SENSORS = LND08 SEN2A SEN2B\n");
850+
fprintf(fp, "SENSORS = LND08 LND09 SEN2A SEN2B\n");
851851

852852
if (verbose){
853853
fprintf(fp, "# Perform a spectral adjustment to Sentinel-2?\n");
854854
fprintf(fp, "# This method can only be used with following sensors: SEN2A, SEN2B, LND04, LND05, LND07, \n");
855-
fprintf(fp, "# LND08, MOD01, MOD02.\n");
855+
fprintf(fp, "# LND08, LND09, MOD01, MOD02.\n");
856856
fprintf(fp, "# A material-specific spectral harmonization will be performed, which will convert the \n");
857857
fprintf(fp, "# spectral response of any of these sensors to Sentinel-2A. Non-existent bands will be \n");
858858
fprintf(fp, "# predicted, too.\n");
@@ -2022,11 +2022,11 @@ void write_par_hl_l2i(FILE *fp, bool verbose){
20222022
fprintf(fp, "# target images. For a list of available sensors, see the description for\n");
20232023
fprintf(fp, "# the SENSORS parameter. For improving the spatial resolution of Landsat to\n");
20242024
fprintf(fp, "# Sentinel-2, it is recommended to use \"SENSORS = sen2a sen2b\", and\n");
2025-
fprintf(fp, "# \"SENSORS_LOWRES = LND07 LND08\"\n");
2026-
fprintf(fp, "# Type: Character list. Valid values: {LND04,LND05,LND07,LND08,SEN2A,\n");
2025+
fprintf(fp, "# \"SENSORS_LOWRES = LND07 LND08 LND09\"\n");
2026+
fprintf(fp, "# Type: Character list. Valid values: {LND04,LND05,LND07,LND08,LND09,SEN2A,\n");
20272027
fprintf(fp, "# SEN2B,sen2a,sen2b,S1AIA,S1BIA,S1AID,S1BID}\n");
20282028
}
2029-
fprintf(fp, "SENSORS_LOWRES = LND07 LND08\n");
2029+
fprintf(fp, "SENSORS_LOWRES = LND07 LND08 LND09\n");
20302030

20312031
return;
20322032
}

‎src/cross-level/enum-cl.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,15 @@ const tagged_enum_t _TAGGED_ENUM_RES_MERGE_[_RES_MERGE_LENGTH_] = {
4141
const tagged_enum_t _TAGGED_ENUM_SEN_[_SEN_LENGTH_] = {
4242
{ _SEN_LND04_, "LND04" }, { _SEN_LND05_, "LND05" },
4343
{ _SEN_LND07_, "LND07" }, { _SEN_LND08_, "LND08" },
44-
{ _SEN_SEN2A_, "SEN2A" }, { _SEN_SEN2B_, "SEN2B" },
45-
{ _SEN_sen2a_, "sen2a" }, { _SEN_sen2b_, "sen2b" },
46-
{ _SEN_LNDLG_, "LNDLG" }, { _SEN_SEN2L_, "SEN2L" },
47-
{ _SEN_SEN2H_, "SEN2H" }, { _SEN_RGB_, "R-G-B" },
48-
{ _SEN_S1AIA_, "S1AIA" }, { _SEN_S1AID_, "S1AID" },
49-
{ _SEN_S1BIA_, "S1BIA" }, { _SEN_S1BID_, "S1BID" },
50-
{ _SEN_VVVHP_, "VVVHP" }, { _SEN_MOD01_, "MOD01" },
51-
{ _SEN_MOD02_, "MOD02" }, { _SEN_MOD02_, "MODIS" }};
44+
{ _SEN_LND09_, "LND09" }, { _SEN_SEN2A_, "SEN2A" },
45+
{ _SEN_SEN2B_, "SEN2B" }, { _SEN_sen2a_, "sen2a" },
46+
{ _SEN_sen2b_, "sen2b" }, { _SEN_LNDLG_, "LNDLG" },
47+
{ _SEN_SEN2L_, "SEN2L" }, { _SEN_SEN2H_, "SEN2H" },
48+
{ _SEN_RGB_, "R-G-B" }, { _SEN_S1AIA_, "S1AIA" },
49+
{ _SEN_S1AID_, "S1AID" }, { _SEN_S1BIA_, "S1BIA" },
50+
{ _SEN_S1BID_, "S1BID" }, { _SEN_VVVHP_, "VVVHP" },
51+
{ _SEN_MOD01_, "MOD01" }, { _SEN_MOD02_, "MOD02" },
52+
{ _SEN_MOD02_, "MODIS" }};
5253

5354
const tagged_enum_t _TAGGED_ENUM_QAI_[_QAI_LENGTH_] = {
5455
{ _QAI_OFF_, "NODATA" }, { _QAI_CLD_OPQ_, "CLOUD_OPAQUE" },

‎src/cross-level/enum-cl.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ enum { OPEN_FALSE, // do not write
117117
OPEN_BLOCK }; // write block into file
118118

119119
// sensors
120-
enum { _SEN_LND04_, _SEN_LND05_, _SEN_LND07_, _SEN_LND08_, _SEN_SEN2A_,
121-
_SEN_SEN2B_, _SEN_sen2a_, _SEN_sen2b_, _SEN_LNDLG_, _SEN_SEN2L_,
122-
_SEN_SEN2H_, _SEN_RGB_, _SEN_S1AIA_, _SEN_S1AID_, _SEN_S1BIA_,
123-
_SEN_S1BID_, _SEN_VVVHP_, _SEN_MOD01_, _SEN_MOD02_, _SEN_MODIS_,
124-
_SEN_LENGTH_ };
120+
enum { _SEN_LND04_, _SEN_LND05_, _SEN_LND07_, _SEN_LND08_, _SEN_LND09_,
121+
_SEN_SEN2A_, _SEN_SEN2B_, _SEN_sen2a_, _SEN_sen2b_, _SEN_LNDLG_,
122+
_SEN_SEN2L_, _SEN_SEN2H_, _SEN_RGB_, _SEN_S1AIA_, _SEN_S1AID_,
123+
_SEN_S1BIA_, _SEN_S1BID_, _SEN_VVVHP_, _SEN_MOD01_, _SEN_MOD02_,
124+
_SEN_MODIS_, _SEN_LENGTH_ };
125125

126126
// wavelength domains
127127
enum { _WVL_BLUE_, _WVL_GREEN_, _WVL_RED_, _WVL_REDEDGE1_,

‎src/higher-level/param-hl.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,22 +1040,23 @@ char upper[NPOW_10] = "UPPER";
10401040
const int ns = _SEN_LENGTH_, nb = _WVL_LENGTH_;
10411041
const char sensor[_SEN_LENGTH_][NPOW_10] = {
10421042
"LND04", "LND05", "LND07",
1043-
"LND08", "SEN2A", "SEN2B",
1044-
"sen2a", "sen2b", "LNDLG",
1045-
"SEN2L", "SEN2H", "R-G-B",
1046-
"S1AIA", "S1AID", "S1BIA",
1047-
"S1BID", "VVVHP", "MOD01",
1048-
"MOD02", "MODIS" };
1043+
"LND08", "LND09", "SEN2A",
1044+
"SEN2B", "sen2a", "sen2b",
1045+
"LNDLG", "SEN2L", "SEN2H",
1046+
"R-G-B", "S1AIA", "S1AID",
1047+
"S1BIA", "S1BID", "VVVHP",
1048+
"MOD01", "MOD02", "MODIS" };
10491049
bool adjustable[_SEN_LENGTH_] = {
1050-
true, true, true, true, true, true,
1051-
false, false, false, false, false, false,
1052-
false, false, false, false, false, true,
1053-
true, false };
1050+
true, true, true, true, true, true,
1051+
true, false, false, false, false, false,
1052+
false, false, false, false, false, false,
1053+
true, true, false };
10541054
const int band[_SEN_LENGTH_][_WVL_LENGTH_] = {
10551055
{ 1, 2, 3, 0, 0, 0, 0, 4, 0, 5, 6, 0, 0 }, // Landsat 4 TM (legacy bands)
10561056
{ 1, 2, 3, 0, 0, 0, 0, 4, 0, 5, 6, 0, 0 }, // Landsat 5 TM (legacy bands)
10571057
{ 1, 2, 3, 0, 0, 0, 0, 4, 0, 5, 6, 0, 0 }, // Landsat 7 ETM+ (legacy bands)
10581058
{ 1, 2, 3, 0, 0, 0, 0, 4, 0, 5, 6, 0, 0 }, // Landsat 8 OLI (legacy bands)
1059+
{ 1, 2, 3, 0, 0, 0, 0, 4, 0, 5, 6, 0, 0 }, // Landsat 9 OLI (legacy bands)
10591060
{ 1, 2, 3, 4, 5, 6, 7, 8, 0, 9, 10, 0, 0 }, // Sentinel-2A MSI (land surface bands)
10601061
{ 1, 2, 3, 4, 5, 6, 7, 8, 0, 9, 10, 0, 0 }, // Sentinel-2B MSI (land surface bands)
10611062
{ 1, 2, 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0 }, // Sentinel-2A MSI (high-res bands)

0 commit comments

Comments
 (0)