[GRASS-SVN] r72145 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 25 13:05:22 PST 2018
Author: mmetz
Date: 2018-01-25 13:05:22 -0800 (Thu, 25 Jan 2018)
New Revision: 72145
Modified:
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update VGT1_Spot4
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 21:02:31 UTC (rev 72144)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 21:05:22 UTC (rev 72145)
@@ -620,10 +620,10 @@
<tr><td>91</td><td>RapidEye RedEdge band (685nm - 735nm)</td></tr>
<tr><td>92</td><td>RapidEye NIR band (750nm - 860nm)</td></tr>
-<tr><td>93</td><td><b>VGT1 (SPOT4)</b> band 0 (0.400-0.500)</td></tr>
-<tr><td>94</td><td>VGT1 (SPOT4) band 2 (0.580-0.782)</td></tr>
-<tr><td>95</td><td>VGT1 (SPOT4) band 3 (0.700-1.030)</td></tr>
-<tr><td>96</td><td>VGT1 (SPOT4) MIR band (1.450-1.800)</td></tr>
+<tr><td>93</td><td><b>VGT1 (SPOT4)</b> band 0 (420nm - 497nm)</td></tr>
+<tr><td>94</td><td>VGT1 (SPOT4) band 2 (603nm - 747nm)</td></tr>
+<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>
Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 21:02:31 UTC (rev 72144)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 21:05:22 UTC (rev 72145)
@@ -2309,77 +2309,77 @@
void IWave::vgt1_spot4(int iwa)
{
- /* B0 of VGT1-spot4 */
- static const float sr1[41] = {
- .0001, .0003, .0005, .0007, .0010, .0013, .0028, .0050,
- .0182, .0377, .0828, .1423, .2234, .3168, .4108, .5052,
- .5925, .6759, .7509, .8212, .8815, .9361, .9699, .9920,
- .9907, .9761, .9528, .9248, .8811, .8287, .7223, .5857,
- .4394, .2876, .1820, .1024, .0579, .0331, .0196, .0125,
- .0000
+ /* B0 of VGT1_spot4 */
+ static const float sr1[40] = {
+ .0001, .0003, .0005, .0007, .0010, .0013, .0028, .0050,
+ .0182, .0377, .0828, .1423, .2234, .3168, .4108, .5052,
+ .5925, .6759, .7509, .8212, .8815, .9361, .9699, .9920,
+ .9907, .9761, .9528, .9248, .8811, .8287, .7223, .5857,
+ .4394, .2876, .1820, .1024, .0579, .0331, .0196, .0125
+
};
-
- /* B2 of VGT1-spot4 */
+
+ /* B2 of VGT1_spot4 */
static const float sr2[82] = {
- .0017, .0017, .0016, .0016, .0016, .0024, .0031, .0039,
- .0046, .0439, .0832, .1225, .1618, .2737, .3856, .4975,
- .6094, .6615, .7136, .7657, .8178, .8278, .8377, .8477,
- .8577, .8673, .8769, .8865, .8961, .9088, .9214, .9341,
- .9468, .9595, .9722, .9849, .9976, .9895, .9815, .9734,
- .9653, .9169, .8685, .8201, .7717, .6989, .6260, .5532,
- .4804, .4243, .3681, .3120, .2559, .2229, .1899, .1569,
- .1239, .1063, .0887, .0712, .0536, .0454, .0372, .0289,
- .0207, .0175, .0143, .0111, .0079, .0069, .0060, .0050,
- .0040, .0034, .0027, .0021, .0015, .0015, .0015, .0015,
- .0015, .0000
+ .0000, .0017, .0017, .0016, .0016, .0016, .0024, .0031,
+ .0039, .0046, .0439, .0832, .1225, .1618, .2737, .3856,
+ .4975, .6094, .6615, .7136, .7657, .8178, .8278, .8377,
+ .8477, .8577, .8673, .8769, .8865, .8961, .9088, .9214,
+ .9341, .9468, .9595, .9722, .9849, .9976, .9895, .9815,
+ .9734, .9653, .9169, .8685, .8201, .7717, .6989, .6260,
+ .5532, .4804, .4243, .3681, .3120, .2559, .2229, .1899,
+ .1569, .1239, .1063, .0887, .0712, .0536, .0454, .0372,
+ .0289, .0207, .0175, .0143, .0111, .0079, .0069, .0060,
+ .0050, .0040, .0034, .0027, .0021, .0015, .0015, .0015,
+ .0015, .0015
};
-
- /* B3 of VGT1-spot4 */
- static const float sr3[133] = {
- .0007, .0008, .0008, .0009, .0010, .0011, .0013, .0014,
- .0015, .0019, .0022, .0026, .0030, .0051, .0072, .0092,
- .0113, .0210, .0308, .0406, .0503, .0806, .1109, .1411,
- .1714, .2271, .2828, .3385, .3942, .4584, .5226, .5869,
- .6511, .6966, .7421, .7876, .8331, .8607, .8883, .9159,
- .9435, .9552, .9668, .9785, .9902, .9927, .9951, .9976,
- 1.0000, .9999, .9997, .9996, .9994, .9984, .9974, .9964,
- .9954, .9927, .9900, .9873, .9846, .9766, .9686, .9606,
- .9526, .9445, .9365, .9284, .9203, .9008, .8813, .8618,
- .8423, .7897, .7370, .6844, .6318, .5584, .4849, .4114,
- .3380, .2893, .2407, .1920, .1434, .1222, .1010, .0798,
- .0586, .0505, .0425, .0345, .0264, .0229, .0194, .0159,
- .0124, .0111, .0098, .0085, .0072, .0065, .0057, .0050,
- .0042, .0038, .0034, .0031, .0027, .0024, .0021, .0017,
- .0014, .0014, .0014, .0013, .0013, .0013, .0013, .0012,
- .0012, .0012, .0011, .0011, .0011, .0010, .0009, .0009,
- .0008, .0007, .0006, .0006, .0005
+
+ /* B3 of VGT1_spot4 */
+ static const float sr3[134] = {
+ .0000, .0007, .0008, .0008, .0009, .0010, .0011, .0013,
+ .0014, .0015, .0019, .0022, .0026, .0030, .0051, .0072,
+ .0092, .0113, .0210, .0308, .0406, .0503, .0806, .1109,
+ .1411, .1714, .2271, .2828, .3385, .3942, .4584, .5226,
+ .5869, .6511, .6966, .7421, .7876, .8331, .8607, .8883,
+ .9159, .9435, .9552, .9668, .9785, .9902, .9927, .9951,
+ .9976, 1.0000, .9999, .9997, .9996, .9994, .9984, .9974,
+ .9964, .9954, .9927, .9900, .9873, .9846, .9766, .9686,
+ .9606, .9526, .9445, .9365, .9284, .9203, .9008, .8813,
+ .8618, .8423, .7897, .7370, .6844, .6318, .5584, .4849,
+ .4114, .3380, .2893, .2407, .1920, .1434, .1222, .1010,
+ .0798, .0586, .0505, .0425, .0345, .0264, .0229, .0194,
+ .0159, .0124, .0111, .0098, .0085, .0072, .0065, .0057,
+ .0050, .0042, .0038, .0034, .0031, .0027, .0024, .0021,
+ .0017, .0014, .0014, .0014, .0013, .0013, .0013, .0013,
+ .0012, .0012, .0012, .0011, .0011, .0011, .0010, .0009,
+ .0009, .0008, .0007, .0006, .0006, .0005
};
-
- /* MIR of VGT1-spot4 */
+
+ /* MIR of VGT1_spot4 */
static const float sr4[141] = {
- .0010, .0010, .0010, .0010, .0010, .0011, .0011, .0012,
- .0013, .0014, .0014, .0015, .0016, .0016, .0017, .0018,
- .0018, .0019, .0021, .0022, .0024, .0026, .0028, .0030,
- .0032, .0035, .0038, .0041, .0044, .0050, .0055, .0060,
- .0066, .0075, .0083, .0092, .0101, .0118, .0136, .0154,
- .0171, .0203, .0235, .0267, .0299, .0366, .0433, .0501,
- .0568, .0708, .0848, .0989, .1129, .1406, .1684, .1961,
- .2239, .2691, .3142, .3594, .4045, .4677, .5308, .5939,
- .6571, .7099, .7628, .8156, .8685, .8934, .9183, .9433,
- .9682, .9761, .9841, .9920, 1.0000, .9971, .9941, .9912,
- .9883, .9840, .9797, .9753, .9710, .9517, .9325, .9132,
- .8939, .8713, .8488, .8262, .8036, .7457, .6878, .6299,
- .5720, .5109, .4498, .3887, .3276, .2926, .2576, .2226,
- .1876, .1704, .1531, .1358, .1186, .1078, .0970, .0863,
- .0755, .0685, .0614, .0544, .0474, .0430, .0385, .0340,
- .0296, .0269, .0242, .0214, .0187, .0172, .0157, .0142,
- .0127, .0118, .0109, .0101, .0092, .0086, .0080, .0075,
- .0069, .0064, .0060, .0055, .0050
+ .0000, .0010, .0010, .0010, .0010, .0010, .0011, .0011,
+ .0012, .0013, .0014, .0014, .0015, .0016, .0016, .0017,
+ .0018, .0018, .0019, .0021, .0022, .0024, .0026, .0028,
+ .0030, .0032, .0035, .0038, .0041, .0044, .0050, .0055,
+ .0060, .0066, .0075, .0083, .0092, .0101, .0118, .0136,
+ .0154, .0171, .0203, .0235, .0267, .0299, .0366, .0433,
+ .0501, .0568, .0708, .0848, .0989, .1129, .1406, .1684,
+ .1961, .2239, .2691, .3142, .3594, .4045, .4677, .5308,
+ .5939, .6571, .7099, .7628, .8156, .8685, .8934, .9183,
+ .9433, .9682, .9761, .9841, .9920, 1.0000, .9971, .9941,
+ .9912, .9883, .9840, .9797, .9753, .9710, .9517, .9325,
+ .9132, .8939, .8713, .8488, .8262, .8036, .7457, .6878,
+ .6299, .5720, .5109, .4498, .3887, .3276, .2926, .2576,
+ .2226, .1876, .1704, .1531, .1358, .1186, .1078, .0970,
+ .0863, .0755, .0685, .0614, .0544, .0474, .0430, .0385,
+ .0340, .0296, .0269, .0242, .0214, .0187, .0172, .0157,
+ .0142, .0127, .0118, .0109, .0101, .0092, .0086, .0080,
+ .0075, .0069, .0064, .0060, .0055
};
+
+ static const float wli[4] = {0.4000, 0.5775, 0.6975, 1.4475};
+ static const float wls[4] = {0.5000, 0.7825, 1.0325, 1.8000};
- static const float wli[4] = {0.400, 0.580, 0.700, 1.450};
- static const float wls[4] = {0.500, 0.782, 1.030, 1.800};
-
ffu.wlinf = (float)wli[iwa-1];
ffu.wlsup = (float)wls[iwa-1];
@@ -2388,13 +2388,13 @@
switch(iwa)
{
- case 1: for(i = 0; i < 41; i++) ffu.s[60+i] = sr1[i];
+ case 1: for(i = 0; i < 40; i++) ffu.s[60+i] = sr1[i];
break;
- case 2: for(i = 0; i < 82; 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 < 133; i++) ffu.s[180+i] = sr3[i];
+ case 3: for(i = 0; i < 134; 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