[GRASS-SVN] r72142 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 25 12:55:55 PST 2018
Author: mmetz
Date: 2018-01-25 12:55:55 -0800 (Thu, 25 Jan 2018)
New Revision: 72142
Modified:
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update RapidEye
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 20:53:14 UTC (rev 72141)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 20:55:55 UTC (rev 72142)
@@ -614,11 +614,11 @@
<tr><td>86</td><td>Ikonos Red band (448nm - 715nm)</td></tr>
<tr><td>87</td><td>Ikonos NIR band (575nm - 787nm)</td></tr>
-<tr><td>88</td><td><b>RapidEye</b> Blue band (0.438-0.513)</td></tr>
-<tr><td>89</td><td>RapidEye Green band (0.463-0.594)</td></tr>
-<tr><td>90</td><td>RapidEye Red band (0.624-0.690)</td></tr>
-<tr><td>91</td><td>RapidEye RedEdge band (0.500-0.737)</td></tr>
-<tr><td>92</td><td>RapidEye NIR band (0.520-0.862)</td></tr>
+<tr><td>88</td><td><b>RapidEye</b> Blue band (440nm - 512nm)</td></tr>
+<tr><td>89</td><td>RapidEye Green band (515nm - 592nm)</td></tr>
+<tr><td>90</td><td>RapidEye Red band (628nm - 687nm)</td></tr>
+<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>
Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 20:53:14 UTC (rev 72141)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 20:55:55 UTC (rev 72142)
@@ -2173,113 +2173,115 @@
{
/* "Blue" of rapideye */
- static const float sr1[128] = {
- .0020, .0023, .0026, .0029, .0018, .0014, .0010, .0095,
- .3210, .7250, .7400, .7590, .7700, .7810, .7840, .7935,
- .7960, .8005, .8060, .8040, .8070, .8170, .8200, .8275,
- .8400, .8470, .8620, .8765, .8860, .9105, .9280, .9415,
- .9690, .9685, 1.0000, .9875, .4370, .0190, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
-
+ static const float sr1[129] = {
+ .0020, .0000, .0000, .0015, .0000, .0000, .0010, .0095,
+ .3210, .7250, .7400, .7590, .7700, .7810, .7840, .7935,
+ .7960, .8005, .8060, .8040, .8070, .8170, .8200, .8275,
+ .8400, .8470, .8620, .8765, .8860, .9105, .9280, .9415,
+ .9690, .9685, 1.0000, .9875, .4370, .0190, .0010, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0005,
+ .0000
};
/* "Green" of rapideye */
- static const float sr2[181] = {
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0015,
- .0030, .0015, .0340, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0270, .0019, .0018, .0017, .0015, .0014,
- .0013, .0011, .0010, .0020, .0070, .0400, .2720, .8260,
- .8640, .8750, .8730, .8730, .8810, .8825, .8800, .8845,
- .8940, .8985, .8980, .9075, .9200, .9275, .9330, .9440,
- .9520, .9575, .9700, .9765, .9740, .9855, .9930, .9830,
- 1.0000, .9730, .8900, .0825, .0060, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010
+ static const float sr2[184] = {
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0035, .0020, .0030, .0080, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0005, .0020, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0010, .0030, .0130, .0875,
+ .5390, .8690, .8680, .8765, .8710, .8755, .8820, .8815,
+ .8810, .8885, .8970, .8985, .9010, .9125, .9240, .9290,
+ .9360, .9475, .9530, .9625, .9740, .9755, .9760, .9910,
+ .9880, .9880, .9940, .9845, .4170, .0265, .0020, .0005,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0010, .0010, .0010, .0005, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0010, .0000
+
};
/* "Red" of rapideye */
- static const float sr3[94] = {
- .0010, .0011, .0012, .0013, .0014, .0015, .0016, .0017,
- .0018, .0019, .0020, .0019, .0017, .0016, .0014, .0012,
- .0011, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0020, .0019, .0018, .0018,
- .0017, .0016, .0015, .0014, .0013, .0013, .0012, .0011,
- .0010, .0025, .0090, .0620, .4370, .8595, .8540, .8785,
- .8810, .8875, .9020, .9105, .9150, .9255, .9390, .9490,
- .9580, .9645, .9700, .9785, .9890, .9900, .9850, .9970,
- .9890, .9940, .4630, .0430, .0050, .0010
+ static const float sr3[96] = {
+ .0000, .0010, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0010, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0005, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0005, .0000, .0000, .0000, .0000, .0020, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0010, .0025, .0090, .0620, .4370, .8595, .8540,
+ .8785, .8810, .8875, .9020, .9105, .9150, .9255, .9390,
+ .9490, .9580, .9645, .9700, .9785, .9890, .9900, .9850,
+ .9970, .9890, .9940, .4630, .0430, .0050, .0010, .0000
+
};
/* "RedEdge " of rapideye */
- static const float sr4[98] = {
- .0270, .0247, .0224, .0200, .0177, .0154, .0131, .0107,
- .0084, .0061, .0038, .0015, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0017, .0025, .0034, .0042,
- .0051, .0059, .0068, .0076, .0085, .0093, .0101, .0110,
- .0118, .0127, .0135, .0144, .0152, .0161, .0169, .0178,
- .0186, .0195, .0203, .0212, .0220, .0195, .0170, .0145,
- .0120, .0095, .0070, .0045, .0020, .0016, .0047, .0079,
- .0110, .0141, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0020, .0055, .0210, .1085, .4910, .9490, .9980, .9995,
- .9980, .9915, .9870, .9855, .9820, .9740, .9660, .9640,
- .9610, .9455, .9390, .8980, .4250, .0940, .0200, .0055,
- .0020, .0010
+ static const float sr4[100] = {
+ .0000, .0270, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0005, .0000, .0005, .0010,
+ .0000, .0000, .0000, .0000, .0005, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0220, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0005, .0000,
+ .0000, .0000, .0000, .0010, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0010, .0020, .0055, .0210, .1085, .4910, .9490, .9980,
+ .9995, .9980, .9915, .9870, .9855, .9820, .9740, .9660,
+ .9640, .9610, .9455, .9390, .8980, .4250, .0940, .0200,
+ .0055, .0020, .0010, .0000
};
/* "NIR " of rapideye */
- static const float sr5[160] = {
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0012,
- .0014, .0015, .0017, .0019, .0110, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0013, .0016, .0019, .0020,
- .0019, .0018, .0017, .0016, .0015, .0014, .0013, .0012,
- .0011, .0010, .0010, .0011, .0012, .0013, .0014, .0015,
- .0016, .0016, .0017, .0018, .0019, .0020, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0030, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0020, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0015, .0030, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0010, .0010, .0010,
- .0010, .0010, .0010, .0010, .0010, .0015, .0030, .0055,
- .0120, .0275, .0680, .1920, .4970, .8825, 1.0000, .9775,
- .9670, .9760, .9830, .9795, .9700, .9620, .9580, .9575,
- .9580, .9585, .9560, .9535, .9480, .9425, .9370, .9320,
- .9280, .9270, .9260, .9255, .9230, .9165, .9060, .8965,
- .8890, .8845, .8820, .8735, .8570, .8400, .8400, .8135,
- .5820, .2440, .0800, .0285, .0110, .0050, .0020, .0010,
-
+ static const float sr5[162] = {
+ .0000, .0010, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0010,
+ .0000, .0000, .0000, .0000, .0000, .0110, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0010, .0000, .0000, .0000,
+ .0010, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0005, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0010, .0010,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0005, .0030,
+ .0010, .0000, .0000, .0000, .0000, .0000, .0010, .0020,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0015, .0030, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0005, .0010, .0015, .0030,
+ .0055, .0120, .0275, .0680, .1920, .4970, .8825, 1.0000,
+ .9775, .9670, .9760, .9830, .9795, .9700, .9620, .9580,
+ .9575, .9580, .9585, .9560, .9535, .9480, .9425, .9370,
+ .9320, .9280, .9270, .9260, .9255, .9230, .9165, .9060,
+ .8965, .8890, .8845, .8820, .8735, .8570, .8400, .8400,
+ .8135, .5820, .2440, .0800, .0285, .0110, .0050, .0020,
+ .0010, .0010
};
- static const float wli[5] = {0.420, 0.424, 0.460, 0.500, 0.470};
- static const float wls[5] = {0.739, 0.876, 0.693, 0.743, 0.870};
+ static const float wli[5] = {0.4200, 0.4200, 0.4575, 0.4975, 0.4675};
+ static const float wls[5] = {0.7425, 0.8800, 0.6975, 0.7475, 0.8725};
ffu.wlinf = (float)wli[iwa-1];
ffu.wlsup = (float)wls[iwa-1];
@@ -2289,15 +2291,15 @@
switch(iwa)
{
- case 1: for(i = 0; i < 128; i++) ffu.s[68+i] = sr1[i];
+ case 1: for(i = 0; i < 129; i++) ffu.s[68+i] = sr1[i];
break;
- case 2: for(i = 0; i < 181; i++) ffu.s[69+i] = sr2[i];
+ case 2: for(i = 0; i < 184; i++) ffu.s[68+i] = sr2[i];
break;
- case 3: for(i = 0; i < 94; i++) ffu.s[84+i] = sr3[i];
+ case 3: for(i = 0; i < 96; i++) ffu.s[83+i] = sr3[i];
break;
- case 4: for(i = 0; i < 98; i++) ffu.s[100+i] = sr4[i];
+ case 4: for(i = 0; i < 100; i++) ffu.s[99+i] = sr4[i];
break;
- case 5: for(i = 0; i < 160; i++) ffu.s[88+i] = sr5[i];
+ case 5: for(i = 0; i < 162; i++) ffu.s[87+i] = sr5[i];
break;
}
}
More information about the grass-commit
mailing list