[GRASS-SVN] r72132 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 25 08:53:31 PST 2018
Author: mmetz
Date: 2018-01-25 08:53:31 -0800 (Thu, 25 Jan 2018)
New Revision: 72132
Modified:
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update GeoEye 1
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 16:49:27 UTC (rev 72131)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 16:53:31 UTC (rev 72132)
@@ -656,11 +656,11 @@
<tr><td>122</td><td>Landsat 8 SWIR1 Band (1540nm - 1672nm)</td></tr>
<tr><td>123</td><td>Landsat 8 SWIR2 Band (2073nm - 2322nm)</td></tr>
-<tr><td>115</td><td><b>GeoEye 1</b> Panchromatic band (0.450-0.800)</td></tr>
-<tr><td>116</td><td>GeoEye 1 Blue Band (0.450-0.510)</td></tr>
-<tr><td>117</td><td>GeoEye 1 Green Band (0.510-0.580)</td></tr>
-<tr><td>118</td><td>GeoEye 1 Red Band (0.655-0.690)</td></tr>
-<tr><td>120</td><td>GeoEye 1 NIR Band (0.780-0.920)</td></tr>
+<tr><td>115</td><td><b>GeoEye 1</b> Panchromatic band (448nm - 812nm)</td></tr>
+<tr><td>116</td><td>GeoEye 1 Blue Band (443nm - 525nm)</td></tr>
+<tr><td>117</td><td>GeoEye 1 Green Band (503nm - 587nm)</td></tr>
+<tr><td>118</td><td>GeoEye 1 Red Band (653nm - 697nm)</td></tr>
+<tr><td>120</td><td>GeoEye 1 NIR Band (770nm - 932nm)</td></tr>
<tr><td>129</td><td><b>Spot6</b> Blue band (455nm - 525nm)</td></tr>
<tr><td>130</td><td>Spot6 Green band (530nm - 527nm)</td></tr>
Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 16:49:27 UTC (rev 72131)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 16:53:31 UTC (rev 72132)
@@ -3270,194 +3270,105 @@
void IWave::geoeye1(int iwa)
{
+ /* "Panchromatic" of geoeye1 */
+ static const float sr1[216] = {
+ .0000, .0001, .0001, .0004, .0007, .0027, .0046, .0863,
+ .1679, .4137, .6595, .6918, .7240, .7334, .7428, .7525,
+ .7622, .7650, .7679, .7528, .7378, .7411, .7443, .7345,
+ .7247, .7443, .7638, .7579, .7520, .7812, .8105, .8202,
+ .8299, .8051, .7802, .7983, .8164, .8400, .8636, .8480,
+ .8325, .8532, .8739, .8670, .8601, .8408, .8216, .8401,
+ .8586, .8624, .8661, .8594, .8527, .8830, .9134, .9046,
+ .8959, .8935, .8912, .9079, .9246, .9236, .9226, .9300,
+ .9375, .9355, .9335, .9372, .9409, .9505, .9601, .9559,
+ .9516, .9537, .9557, .9621, .9684, .9765, .9847, .9869,
+ .9890, .9792, .9693, .9744, .9796, .9898, 1.0000, .9886,
+ .9772, .9706, .9641, .9722, .9804, .9813, .9823, .9745,
+ .9666, .9669, .9672, .9730, .9787, .9610, .9434, .9406,
+ .9378, .9368, .9358, .9411, .9463, .9588, .9714, .9646,
+ .9577, .9439, .9301, .9266, .9232, .9256, .9279, .9167,
+ .9055, .8945, .8834, .8836, .8839, .8859, .8878, .8823,
+ .8767, .8675, .8583, .8486, .8389, .8350, .8310, .8382,
+ .8454, .8521, .8588, .8479, .8370, .8163, .7957, .7838,
+ .7719, .7910, .8100, .6449, .4797, .2768, .0738, .0443,
+ .0148, .0102, .0057, .0037, .0018, .0013, .0008, .0006,
+ .0004, .0004, .0004, .0004, .0003, .0003, .0003, .0003,
+ .0004, .0003, .0003, .0003, .0002, .0002, .0002, .0002,
+ .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+ .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+ .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+ .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+ .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001
- /* Pan of geoeye1 */
- static const float sr1[261] = {
- .0001, .0001, .0001, .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, .0001, .0001, .0004, .0007, .0027, .0046, .0863,
- .1679, .4137, .6595, .6918, .7240, .7334, .7428, .7525,
- .7622, .7650, .7679, .7528, .7378, .7411, .7443, .7345,
- .7247, .7443, .7638, .7579, .7520, .7812, .8105, .8202,
- .8299, .8051, .7802, .7983, .8164, .8400, .8636, .8480,
- .8325, .8532, .8739, .8670, .8601, .8408, .8216, .8401,
- .8586, .8624, .8661, .8594, .8527, .8830, .9134, .9046,
- .8959, .8935, .8912, .9079, .9246, .9236, .9226, .9300,
- .9375, .9355, .9335, .9372, .9409, .9505, .9601, .9559,
- .9516, .9537, .9557, .9621, .9684, .9765, .9847, .9869,
- .9890, .9792, .9693, .9744, .9796, .9898, 1.0000, .9886,
- .9772, .9706, .9641, .9722, .9804, .9813, .9823, .9745,
- .9666, .9669, .9672, .9730, .9787, .9610, .9434, .9406,
- .9378, .9368, .9358, .9411, .9463, .9588, .9714, .9646,
- .9577, .9439, .9301, .9266, .9232, .9256, .9279, .9167,
- .9055, .8945, .8834, .8836, .8839, .8859, .8878, .8823,
- .8767, .8675, .8583, .8486, .8389, .8350, .8310, .8382,
- .8454, .8521, .8588, .8479, .8370, .8163, .7957, .7838,
- .7719, .7910, .8100, .6449, .4797, .2768, .0738, .0443,
- .0148, .0102, .0057, .0037, .0018, .0013, .0008, .0006,
- .0004, .0004, .0004, .0004, .0003, .0003, .0003, .0003,
- .0004, .0003, .0003, .0003, .0002, .0002, .0002, .0002,
- .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
- .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
- .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
- .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
- .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
- .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
- .0001, .0001, .0001, .0001, .0001
};
- /* Blue of geoeye1 */
- static const float sr2[261] = {
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0002, .0003, .0003,
- .0003, .0004, .0004, .0004, .0004, .0005, .0006, .0006,
- .0007, .0010, .0013, .0036, .0060, .0222, .0384, .1251,
- .2119, .4473, .6828, .7713, .8597, .8677, .8756, .8771,
- .8786, .8878, .8971, .9065, .9160, .9209, .9259, .9328,
- .9397, .9416, .9435, .9595, .9754, .9877, 1.0000, .9868,
- .9736, .7085, .4435, .2623, .0812, .0470, .0129, .0082,
- .0035, .0024, .0013, .0011, .0008, .0007, .0006, .0003,
- .0001, .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, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0001,
- .0001, .0001, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0001, .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
+ /* "Blue" of geoeye1 */
+ static const float sr2[62] = {
+ .0000, .0000, .0002, .0003, .0003, .0003, .0004, .0004,
+ .0004, .0004, .0005, .0006, .0006, .0007, .0010, .0013,
+ .0036, .0060, .0222, .0384, .1251, .2119, .4473, .6828,
+ .7713, .8597, .8677, .8756, .8771, .8786, .8878, .8971,
+ .9065, .9160, .9209, .9259, .9328, .9397, .9416, .9435,
+ .9595, .9754, .9877, 1.0000, .9868, .9736, .7085, .4435,
+ .2623, .0812, .0470, .0129, .0082, .0035, .0024, .0013,
+ .0011, .0008, .0007, .0006, .0003, .0001
};
- /* Green of geoeye1 */
- static const float sr3[261] = {
- .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, .0001, .0003, .0003, .0003, .0003, .0003, .0003,
- .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0004,
- .0004, .0005, .0005, .0011, .0016, .0117, .0219, .1132,
- .2045, .4832, .7619, .8086, .8554, .8617, .8680, .8817,
- .8955, .8955, .8955, .8957, .8960, .9002, .9044, .9032,
- .9020, .9193, .9366, .9503, .9641, .9762, .9883, .9942,
- 1.0000, .9882, .9763, .8664, .7564, .4210, .0857, .0462,
- .0067, .0040, .0014, .0010, .0006, .0005, .0004, .0004,
- .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
- .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0002,
- .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,
- .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
+ /* "Green" of geoeye1 */
+ static const float sr3[82] = {
+ .0000, .0000, .0001, .0003, .0003, .0003, .0003, .0003,
+ .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0004, .0004, .0005, .0005, .0011, .0016, .0117, .0219,
+ .1132, .2045, .4832, .7619, .8086, .8554, .8617, .8680,
+ .8817, .8955, .8955, .8955, .8957, .8960, .9002, .9044,
+ .9032, .9020, .9193, .9366, .9503, .9641, .9762, .9883,
+ .9942, 1.0000, .9882, .9763, .8664, .7564, .4210, .0857,
+ .0462, .0067, .0040, .0014, .0010, .0006, .0005, .0004,
+ .0004, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0002, .0000
};
- /* Red of geoeye1 */
- static const float sr4[261] = {
- .0000, .0000, .0001, .0001, .0002, .0001, .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, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0001, .0002, .0003, .0017,
- .0032, .0247, .0463, .2688, .4913, .7407, .9901, .9918,
- .9936, .9968, 1.0000, .9856, .9713, .9688, .9663, .8722,
- .7781, .4300, .0819, .0431, .0044, .0025, .0007, .0004,
- .0002, .0001, .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, .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
+ /* "Red" of geoeye1 */
+ static const float sr4[144] = {
+ .0001, .0001, .0002, .0001, .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, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0001, .0002, .0003, .0017, .0032, .0247,
+ .0463, .2688, .4913, .7407, .9901, .9918, .9936, .9968,
+ 1.0000, .9856, .9713, .9688, .9663, .8722, .7781, .4300,
+ .0819, .0431, .0044, .0025, .0007, .0004, .0002, .0001
+
};
/* "Near IR" of geoeye1 */
- static const float sr5[261] = {
- .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,
- .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, .0001, .0001, .0001,
- .0002, .0003, .0004, .0006, .0009, .0021, .0033, .0080,
- .0128, .0459, .0791, .2192, .3593, .6220, .8847, .9423,
- 1.0000, .9865, .9731, .9620, .9510, .9322, .9135, .8973,
- .8811, .8735, .8660, .8582, .8503, .8385, .8268, .8155,
- .8042, .7969, .7895, .7832, .7769, .7689, .7608, .7526,
- .7444, .7341, .7237, .7111, .6985, .6851, .6717, .6579,
- .6440, .6250, .6061, .5877, .5693, .5586, .5479, .5373,
- .5267, .5096, .4925, .4802, .4679, .4608, .4536, .4466,
- .4396, .4300, .4205, .3784, .3364, .2346, .1329, .0784,
- .0240, .0139, .0038, .0024, .0010, .0007, .0004, .0004,
- .0004, .0003, .0001, .0001, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000
+ static const float sr5[86] = {
+ .0001, .0001, .0001, .0002, .0003, .0004, .0006, .0009,
+ .0021, .0033, .0080, .0128, .0459, .0791, .2192, .3593,
+ .6220, .8847, .9423, 1.0000, .9865, .9731, .9620, .9510,
+ .9322, .9135, .8973, .8811, .8735, .8660, .8582, .8503,
+ .8385, .8268, .8155, .8042, .7969, .7895, .7832, .7769,
+ .7689, .7608, .7526, .7444, .7341, .7237, .7111, .6985,
+ .6851, .6717, .6579, .6440, .6250, .6061, .5877, .5693,
+ .5586, .5479, .5373, .5267, .5096, .4925, .4802, .4679,
+ .4608, .4536, .4466, .4396, .4300, .4205, .3784, .3364,
+ .2346, .1329, .0784, .0240, .0139, .0038, .0024, .0010,
+ .0007, .0004, .0004, .0004, .0003, .0001
};
- static const float wli[5] = {0.350, 0.350, 0.350, 0.350, 0.350};
- static const float wls[5] = {1.000, 1.000, 1.000, 1.000, 1.000};
+ static const float wli[5] = {0.4300, 0.3975, 0.4475, 0.3550, 0.7425};
+ static const float wls[5] = {0.9700, 0.5525, 0.6525, 0.7150, 0.9575};
ffu.wlinf = (float)wli[iwa-1];
ffu.wlsup = (float)wls[iwa-1];
@@ -3467,15 +3378,15 @@
switch(iwa)
{
- case 1: for(i = 0; i < 261; i++) ffu.s[40+i] = sr1[i];
+ case 1: for(i = 0; i < 216; i++) ffu.s[72+i] = sr1[i];
break;
- case 2: for(i = 0; i < 261; i++) ffu.s[40+i] = sr2[i];
+ case 2: for(i = 0; i < 62; i++) ffu.s[59+i] = sr2[i];
break;
- case 3: for(i = 0; i < 261; i++) ffu.s[40+i] = sr3[i];
+ case 3: for(i = 0; i < 82; i++) ffu.s[79+i] = sr3[i];
break;
- case 4: for(i = 0; i < 261; i++) ffu.s[40+i] = sr4[i];
+ case 4: for(i = 0; i < 144; i++) ffu.s[42+i] = sr4[i];
break;
- case 5: for(i = 0; i < 261; i++) ffu.s[40+i] = sr5[i];
+ case 5: for(i = 0; i < 86; i++) ffu.s[197+i] = sr5[i];
break;
}
}
More information about the grass-commit
mailing list