[GRASS-SVN] r72146 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 25 13:07:37 PST 2018
Author: mmetz
Date: 2018-01-25 13:07:37 -0800 (Thu, 25 Jan 2018)
New Revision: 72146
Modified:
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update VGT2_Spot5
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 21:05:22 UTC (rev 72145)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 21:07:37 UTC (rev 72146)
@@ -625,10 +625,10 @@
<tr><td>95</td><td>VGT1 (SPOT4) band 3 (740nm - 942nm)</td></tr>
<tr><td>96</td><td>VGT1 (SPOT4) MIR band (1540nm - 1777nm)</td></tr>
-<tr><td>97</td><td><b>VGT2 (SPOT5)</b> band 0 (0.400-0.550)</td></tr>
-<tr><td>98</td><td>VGT2 (SPOT5) band 2 (0.580-0.780)</td></tr>
-<tr><td>99</td><td>VGT2 (SPOT5) band 3 (0.700-1.000)</td></tr>
-<tr><td>100</td><td>VGT2 (SPOT5) MIR band (1.450-1.800)</td></tr>
+<tr><td>97</td><td><b>VGT2 (SPOT5)</b> band 0 (423nm - 492nm)</td></tr>
+<tr><td>98</td><td>VGT2 (SPOT5) band 2 (600nm - 737nm)</td></tr>
+<tr><td>99</td><td>VGT2 (SPOT5) band 3 (745nm - 945nm)</td></tr>
+<tr><td>100</td><td>VGT2 (SPOT5) MIR band (1523nm - 1757nm)</td></tr>
<tr><td>101</td><td>WorldView 2 Panchromatic band (0.447-0.808)</td></tr>
<tr><td>102</td><td>WorldView 2 Coastal Blue band (0.396-0.458)</td></tr>
Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 21:05:22 UTC (rev 72145)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 21:07:37 UTC (rev 72146)
@@ -2406,76 +2406,76 @@
/* B0 of VGT2_spot5 */
static const float sr1[61] = {
- .0007, .0008, .0010, .0010, .0011, .0012, .0013, .0029,
- .0045, .0209, .0374, .0964, .1553, .2551, .3549, .4536,
- .5524, .6318, .7111, .7602, .8093, .8304, .8514, .8698,
- .8882, .9441, 1.0000, .9787, .9574, .7493, .5412, .3553,
- .1694, .1083, .0472, .0318, .0163, .0116, .0069, .0053,
- .0036, .0028, .0020, .0017, .0014, .0011, .0009, .0008,
- .0008, .0008, .0007, .0006, .0006, .0006, .0005, .0004,
- .0004, .0004, .0004, .0003, .0003
+ .0007, .0008, .0010, .0010, .0011, .0012, .0013, .0029,
+ .0045, .0209, .0374, .0964, .1553, .2551, .3549, .4536,
+ .5524, .6318, .7111, .7602, .8093, .8304, .8514, .8698,
+ .8882, .9441, 1.0000, .9787, .9574, .7493, .5412, .3553,
+ .1694, .1083, .0472, .0318, .0163, .0116, .0069, .0053,
+ .0036, .0028, .0020, .0017, .0014, .0011, .0009, .0008,
+ .0008, .0008, .0007, .0006, .0006, .0006, .0005, .0004,
+ .0004, .0004, .0004, .0003, .0003
};
-
+
/* B2 of VGT2_spot5 */
- static const float sr2[81] = {
- .0006, .0006, .0006, .0007, .0007, .0033, .0059, .0084,
- .0110, .0688, .1265, .1842, .2420, .3532, .4643, .5755,
- .6866, .7306, .7745, .8185, .8625, .8766, .8906, .9046,
- .9187, .9307, .9426, .9546, .9666, .9749, .9833, .9917,
- 1.0000, .9957, .9915, .9872, .9829, .9387, .8945, .8503,
- .8061, .7316, .6570, .5825, .5079, .4468, .3856, .3245,
- .2634, .2293, .1952, .1611, .1270, .1095, .0921, .0746,
- .0572, .0490, .0408, .0326, .0244, .0208, .0171, .0135,
- .0099, .0085, .0071, .0057, .0043, .0037, .0031, .0025,
- .0019, .0017, .0014, .0012, .0010, .0009, .0008, .0007,
- .0006
+ static const float sr2[82] = {
+ .0000, .0006, .0006, .0006, .0007, .0007, .0033, .0059,
+ .0084, .0110, .0688, .1265, .1842, .2420, .3532, .4643,
+ .5755, .6866, .7306, .7745, .8185, .8625, .8766, .8906,
+ .9046, .9187, .9307, .9426, .9546, .9666, .9749, .9833,
+ .9917, 1.0000, .9957, .9915, .9872, .9829, .9387, .8945,
+ .8503, .8061, .7316, .6570, .5825, .5079, .4468, .3856,
+ .3245, .2634, .2293, .1952, .1611, .1270, .1095, .0921,
+ .0746, .0572, .0490, .0408, .0326, .0244, .0208, .0171,
+ .0135, .0099, .0085, .0071, .0057, .0043, .0037, .0031,
+ .0025, .0019, .0017, .0014, .0012, .0010, .0009, .0008,
+ .0007, .0006
};
-
+
/* B3 of VGT2_spot5 */
- static const float sr3[121] = {
- .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0004,
- .0004, .0005, .0006, .0008, .0009, .0017, .0024, .0032,
- .0040, .0082, .0124, .0166, .0208, .0361, .0514, .0667,
- .0820, .1175, .1530, .1885, .2240, .2774, .3309, .3844,
- .4378, .4906, .5434, .5962, .6490, .6899, .7308, .7716,
- .8125, .8369, .8612, .8856, .9100, .9248, .9396, .9544,
- .9692, .9761, .9829, .9898, .9967, .9975, .9983, .9992,
- 1.0000, .9939, .9878, .9817, .9756, .9618, .9480, .9342,
- .9204, .9030, .8856, .8682, .8508, .8236, .7965, .7693,
- .7422, .6945, .6467, .5989, .5512, .4910, .4308, .3706,
- .3104, .2681, .2258, .1836, .1413, .1213, .1013, .0813,
- .0613, .0530, .0447, .0364, .0281, .0245, .0209, .0172,
- .0136, .0120, .0104, .0089, .0073, .0065, .0056, .0047,
- .0039, .0036, .0032, .0029, .0025, .0023, .0021, .0018,
- .0016, .0015, .0014, .0012, .0011, .0010, .0008, .0007,
- .0006
+ static const float sr3[122] = {
+ .0000, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0004, .0004, .0005, .0006, .0008, .0009, .0017, .0024,
+ .0032, .0040, .0082, .0124, .0166, .0208, .0361, .0514,
+ .0667, .0820, .1175, .1530, .1885, .2240, .2774, .3309,
+ .3844, .4378, .4906, .5434, .5962, .6490, .6899, .7308,
+ .7716, .8125, .8369, .8612, .8856, .9100, .9248, .9396,
+ .9544, .9692, .9761, .9829, .9898, .9967, .9975, .9983,
+ .9992, 1.0000, .9939, .9878, .9817, .9756, .9618, .9480,
+ .9342, .9204, .9030, .8856, .8682, .8508, .8236, .7965,
+ .7693, .7422, .6945, .6467, .5989, .5512, .4910, .4308,
+ .3706, .3104, .2681, .2258, .1836, .1413, .1213, .1013,
+ .0813, .0613, .0530, .0447, .0364, .0281, .0245, .0209,
+ .0172, .0136, .0120, .0104, .0089, .0073, .0065, .0056,
+ .0047, .0039, .0036, .0032, .0029, .0025, .0023, .0021,
+ .0018, .0016, .0015, .0014, .0012, .0011, .0010, .0008,
+ .0007, .0006
};
-
+
/* MIR of VGT2_spot5 */
static const float sr4[141] = {
- .0005, .0006, .0006, .0007, .0008, .0008, .0008, .0009,
- .0009, .0009, .0009, .0009, .0009, .0011, .0014, .0016,
- .0019, .0022, .0024, .0027, .0029, .0034, .0040, .0045,
- .0050, .0060, .0070, .0080, .0090, .0108, .0126, .0143,
- .0161, .0196, .0231, .0266, .0301, .0372, .0444, .0515,
- .0586, .0723, .0860, .0997, .1134, .1401, .1668, .1936,
- .2203, .2668, .3134, .3599, .4065, .4664, .5263, .5863,
- .6462, .6929, .7396, .7862, .8329, .8630, .8931, .9233,
- .9534, .9644, .9754, .9863, .9973, .9980, .9987, .9993,
- 1.0000, .9987, .9974, .9962, .9949, .9914, .9879, .9845,
- .9810, .9687, .9564, .9440, .9317, .9055, .8793, .8532,
- .8270, .7811, .7351, .6892, .6433, .5746, .5059, .4371,
- .3684, .3244, .2803, .2363, .1923, .1713, .1502, .1292,
- .1082, .0970, .0859, .0747, .0636, .0575, .0514, .0453,
- .0392, .0360, .0327, .0295, .0262, .0235, .0209, .0182,
- .0155, .0139, .0123, .0106, .0090, .0082, .0073, .0065,
- .0057, .0053, .0050, .0046, .0043, .0040, .0037, .0033,
- .0030, .0026, .0022, .0019, .0015
+ .0000, .0005, .0006, .0006, .0007, .0008, .0008, .0008,
+ .0009, .0009, .0009, .0009, .0009, .0009, .0011, .0014,
+ .0016, .0019, .0022, .0024, .0027, .0029, .0034, .0040,
+ .0045, .0050, .0060, .0070, .0080, .0090, .0108, .0126,
+ .0143, .0161, .0196, .0231, .0266, .0301, .0372, .0444,
+ .0515, .0586, .0723, .0860, .0997, .1134, .1401, .1668,
+ .1936, .2203, .2668, .3134, .3599, .4065, .4664, .5263,
+ .5863, .6462, .6929, .7396, .7862, .8329, .8630, .8931,
+ .9233, .9534, .9644, .9754, .9863, .9973, .9980, .9987,
+ .9993, 1.0000, .9987, .9974, .9962, .9949, .9914, .9879,
+ .9845, .9810, .9687, .9564, .9440, .9317, .9055, .8793,
+ .8532, .8270, .7811, .7351, .6892, .6433, .5746, .5059,
+ .4371, .3684, .3244, .2803, .2363, .1923, .1713, .1502,
+ .1292, .1082, .0970, .0859, .0747, .0636, .0575, .0514,
+ .0453, .0392, .0360, .0327, .0295, .0262, .0235, .0209,
+ .0182, .0155, .0139, .0123, .0106, .0090, .0082, .0073,
+ .0065, .0057, .0053, .0050, .0046, .0043, .0040, .0037,
+ .0033, .0030, .0026, .0022, .0019
};
+
+ static const float wli[4] = {0.4000, 0.5775, 0.6975, 1.4475};
+ static const float wls[4] = {0.5525, 0.7825, 1.0025, 1.8000};
- static const float wli[4] = {0.400, 0.580, 0.700, 1.450};
- static const float wls[4] = {0.550, 0.780, 1.000, 1.800};
-
ffu.wlinf = (float)wli[iwa-1];
ffu.wlsup = (float)wls[iwa-1];
@@ -2486,11 +2486,11 @@
{
case 1: for(i = 0; i < 61; i++) ffu.s[60+i] = sr1[i];
break;
- case 2: for(i = 0; i < 81; i++) ffu.s[132+i] = sr2[i];
+ case 2: for(i = 0; i < 82; i++) ffu.s[131+i] = sr2[i];
break;
- case 3: for(i = 0; i < 121; i++) ffu.s[180+i] = sr3[i];
+ case 3: for(i = 0; i < 122; i++) ffu.s[179+i] = sr3[i];
break;
- case 4: for(i = 0; i < 141; i++) ffu.s[480+i] = sr4[i];
+ case 4: for(i = 0; i < 141; i++) ffu.s[479+i] = sr4[i];
break;
}
}
More information about the grass-commit
mailing list