[GRASS-SVN] r69550 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Sep 22 05:17:01 PDT 2016
Author: neteler
Date: 2016-09-22 05:17:01 -0700 (Thu, 22 Sep 2016)
New Revision: 69550
Modified:
grass/trunk/imagery/i.atcorr/geomcond.cpp
grass/trunk/imagery/i.atcorr/geomcond.h
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: complete Worldview3 support (r69012); minor cleanup
Modified: grass/trunk/imagery/i.atcorr/geomcond.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/geomcond.cpp 2016-09-22 12:13:53 UTC (rev 69549)
+++ grass/trunk/imagery/i.atcorr/geomcond.cpp 2016-09-22 12:17:01 UTC (rev 69550)
@@ -377,7 +377,8 @@
case 21: /* spot7 * enter month,day,hh.ddd,long.,lat. */
case 22: /* pleiades1a * enter month,day,hh.ddd,long.,lat. */
case 23: /* pleiades1b * enter month,day,hh.ddd,long.,lat. */
- {
+ case 24: /* worldview3 * enter month,day,hh.ddd,long.,lat. */
+ {
cin >> month;
cin >> jday;
cin >> tu;
@@ -446,7 +447,8 @@
string(" spot6 observation "),
string(" spot7 observation "),
string(" pleiades1a observation "),
- string(" pleiades1b observation ")
+ string(" pleiades1b observation "),
+ string(" worldview3 observation ")
};
static const string head(" geometrical conditions identity ");
Modified: grass/trunk/imagery/i.atcorr/geomcond.h
===================================================================
--- grass/trunk/imagery/i.atcorr/geomcond.h 2016-09-22 12:13:53 UTC (rev 69549)
+++ grass/trunk/imagery/i.atcorr/geomcond.h 2016-09-22 12:17:01 UTC (rev 69550)
@@ -1,88 +1,90 @@
#ifndef GEOMETRICAL_CONTITIONS_H
#define GEOMETRICAL_CONTITIONS_H
-/* **********************************************************************c */
-/* igeom geometrical conditions c */
-/* -------------------------------------- c */
-/* c */
-/* c */
-/* you choose your own conditions; igeom=0 c */
-/* 0 enter solar zenith angle (in degrees ) c */
-/* solar azimuth angle " c */
-/* satellite zenith angle " c */
-/* satellite azimuth angle " c */
-/* month c */
-/* day of the month c */
-/* c */
-/* or you select one of the following satellite conditions:igeom=1to7 c */
-/* 1 meteosat observation c */
-/* enter month,day,decimal hour (universal time-hh.ddd) c */
-/* n. of column,n. of line.(full scale 5000*2500) c */
-/* c */
-/* 2 goes east observation c */
-/* enter month,day,decimal hour (universal time-hh.ddd) c */
-/* n. of column,n. of line.(full scale 17000*12000)c */
-/* c */
-/* 3 goes west observation c */
-/* enter month,day,decimal hour (universal time-hh.ddd) c */
-/* n. of column,n. of line.(full scale 17000*12000)c */
-/* c */
-/* 4 avhrr ( PM noaa ) c */
-/* enter month,day,decimal hour (universal time-hh.ddd) c */
-/* n. of column(1-2048),xlonan,hna c */
-/* give long.(xlonan) and overpass hour (hna) at c */
-/* the ascendant node at equator c */
-/* c */
-/* 5 avhrr ( AM noaa ) c */
-/* enter month,day,decimal hour (universal time-hh.ddd) c */
-/* n. of column(1-2048),xlonan,hna c */
-/* give long.(xlonan) and overpass hour (hna) at c */
-/* the ascendant node at equator c */
-/* c */
-/* 6 hrv ( spot ) * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 7 tm ( landsat ) * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 8 etm+ ( landsat7) * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 9 liss ( IRC 1C ) * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 10 aster * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 11 avnir * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 12 ikonos * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 13 rapideye * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 14 vgt1_spot4 * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 15 vgt2_spot5 * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 16 worldview2 * enter month,day,hh.ddd,long.,lat.c */
-/* c */
-/* 17 quickbird * enter month,day,hh.ddd,long.,lat. c */
-/* c */
-/* 18 Landsat 8 * enter month,day,hh.ddd,long.,lat. c */
-/* c */
-/* 19 geoeye1 * enter month,day,hh.ddd,long.,lat. c */
-/* c */
-/* 20 spot6 * enter month,day,hh.ddd,long.,lat. c */
-/* c */
-/* 21 spot7 * enter month,day,hh.ddd,long.,lat. c */
-/* c */
-/* 22 pleiades1a * enter month,day,hh.ddd,long.,lat. c */
-/* c */
-/* 23 pleiades1b * enter month,day,hh.ddd,long.,lat. c */
-/* c */
-/* note: for hrv and tm experiments long. and lat. are the c */
-/* coordinates of the scene center. c */
-/* lat. must be > 0 for north lat., < 0 for south lat. c */
-/* long. must be > 0 for east long., < 0 for west long. c */
-/* c */
-/* solar and viewing positions are computed c */
-/* c */
-/* *********************************************************************c */
+/* ************************************************************************/
+/* igeom geometrical conditions */
+/* -------------------------------------- */
+/* */
+/* */
+/* you choose your own conditions; igeom=0 */
+/* 0 enter solar zenith angle (in degrees ) */
+/* solar azimuth angle " */
+/* satellite zenith angle " */
+/* satellite azimuth angle " */
+/* month */
+/* day of the month */
+/* */
+/* or you select one of the following satellite conditions:igeom=1to7 */
+/* 1 meteosat observation */
+/* enter month,day,decimal hour (universal time-hh.ddd) */
+/* n. of column,n. of line.(full scale 5000*2500) */
+/* */
+/* 2 goes east observation */
+/* enter month,day,decimal hour (universal time-hh.ddd) */
+/* n. of column,n. of line.(full scale 17000*12000) */
+/* */
+/* 3 goes west observation */
+/* enter month,day,decimal hour (universal time-hh.ddd) */
+/* n. of column,n. of line.(full scale 17000*12000) */
+/* */
+/* 4 avhrr ( PM noaa ) */
+/* enter month,day,decimal hour (universal time-hh.ddd) */
+/* n. of column(1-2048),xlonan,hna */
+/* give long.(xlonan) and overpass hour (hna) at */
+/* the ascendant node at equator */
+/* */
+/* 5 avhrr ( AM noaa ) */
+/* enter month,day,decimal hour (universal time-hh.ddd) */
+/* n. of column(1-2048),xlonan,hna */
+/* give long.(xlonan) and overpass hour (hna) at */
+/* the ascendant node at equator */
+/* */
+/* 6 hrv ( spot ) * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 7 tm ( landsat ) * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 8 etm+ ( landsat7) * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 9 liss ( IRC 1C ) * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 10 aster * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 11 avnir * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 12 ikonos * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 13 rapideye * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 14 vgt1_spot4 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 15 vgt2_spot5 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 16 worldview2 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 17 quickbird * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 18 Landsat 8 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 19 geoeye1 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 20 spot6 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 21 spot7 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 22 pleiades1a * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 23 pleiades1b * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* 24 worldview3 * enter month,day,hh.ddd,long.,lat. */
+/* */
+/* note: for hrv and tm experiments long. and lat. are the */
+/* coordinates of the scene center. */
+/* lat. must be > 0 for north lat., < 0 for south lat. */
+/* long. must be > 0 for east long., < 0 for west long. */
+/* */
+/* solar and viewing positions are computed */
+/* */
+/* ************************************************************************/
struct GeomCond
{
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2016-09-22 12:13:53 UTC (rev 69549)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2016-09-22 12:17:01 UTC (rev 69550)
@@ -213,10 +213,18 @@
</tr>
+<tr>
+<td>24</td>
+<td><b>Worldview3</b></td>
+<td>enter month,day,hh.ddd,long.,lat. *</td>
+</tr>
+
</table>
+<p>
<blockquote>
-* <em>NOTE</em>: for HRV, TM, ETM+, LISS and ASTER experiments,
+<em>NOTE</em>: for HRV, TM, ETM+, LISS and ASTER experiments,
+<!-- TODO: what about the others? -->
longitude and latitude are the coordinates of the scene
center. Latitude must be > 0 for northern hemisphere and < 0 for
southern. Longitude must be > 0 for eastern hemisphere and < 0 for
@@ -636,41 +644,54 @@
<tr><td>122</td><td>Landsat 8 SWIR1 Band (1515nm - 1697nm)</td></tr>
<tr><td>123</td><td>Landsat 8 SWIR2 Band (2037nm - 2355nm)</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>129</td><td><b>Spot6</b> Blue band (455nm - 525nm)</td></tr>
<tr><td>130</td><td>Spot6 Green band (530nm - 527nm)</td></tr>
<tr><td>131</td><td>Spot6 Red band (625nm - 695nm)</td></tr>
<tr><td>132</td><td>Spot6 NIR band (760nm - 890nm)</td></tr>
<tr><td>133</td><td>Spot6 Pan band (455nm - 745nm)</td></tr>
-
<tr><td>134</td><td><b>Spot7</b> Blue band (455nm - 525nm)</td></tr>
<tr><td>135</td><td>Spot7 Green band (530nm - 527nm)</td></tr>
<tr><td>136</td><td>Spot7 Red band (625nm - 695nm)</td></tr>
<tr><td>137</td><td>Spot7 NIR band (760nm - 890nm)</td></tr>
<tr><td>138</td><td>Spot7 Pan band (455nm - 745nm)</td></tr>
-
<tr><td>139</td><td><b>Pleiades1A</b> Blue band (430nm - 550nm)</td></tr>
<tr><td>140</td><td>Pleiades1A Green band (490nm - 610nm)</td></tr>
<tr><td>141</td><td>Pleiades1A Red band (600nm - 720nm)</td></tr>
<tr><td>142</td><td>Pleiades1A NIR band (750nm - 950nm)</td></tr>
<tr><td>143</td><td>Pleiades1A Pan band (480nm - 830nm)</td></tr>
-
<tr><td>144</td><td><b>Pleiades1B </b> Blue band (430nm - 550nm)</td></tr>
<tr><td>145</td><td>Pleiades1B Green band (490nm - 610nm)</td></tr>
<tr><td>146</td><td>Pleiades1B Red band (600nm - 720nm)</td></tr>
<tr><td>147</td><td>Pleiades1B NIR band (750nm - 950nm)</td></tr>
<tr><td>148</td><td>Pleiades1B Pan band (480nm - 830nm)</td></tr>
+<tr><td>149</td><td><b>Worldview3 </b> Pan band (450nm - 800nm)</td></tr>
+<tr><td>150</td><td>Worldview3 Coastal blue band (400nm - 450 nm)</td></tr>
+<tr><td>151</td><td>Worldview3 Blue band (450nm - 510 nm)</td></tr>
+<tr><td>152</td><td>Worldview3 Green band (510nm - 580 nm)</td></tr>
+<tr><td>153</td><td>Worldview3 Yellow band (585nm - 625 nm)</td></tr>
+<tr><td>154</td><td>Worldview3 Red band (630nm - 690 nm)</td></tr>
+<tr><td>155</td><td>Worldview3 Red edge band (705nm - 745 nm)</td></tr>
+<tr><td>156</td><td>Worldview3 NIR1 band (770nm - 895 nm)</td></tr>
+<tr><td>157</td><td>Worldview3 NIR2 band (860nm - 1040 nm)</td></tr>
+<tr><td>158</td><td>Worldview3 SWIR1 band (1195nm - 1225 nm)</td></tr>
+<tr><td>159</td><td>Worldview3 SWIR2 band (1550nm - 1590 nm)</td></tr>
+<tr><td>160</td><td>Worldview3 SWIR3 band (1640nm - 1680 nm)</td></tr>
+<tr><td>161</td><td>Worldview3 SWIR4 band (1710nm - 1750 nm)</td></tr>
+<tr><td>162</td><td>Worldview3 SWIR5 band (2145nm - 2185 nm)</td></tr>
+<tr><td>163</td><td>Worldview3 SWIR6 band (2185nm - 2225 nm)</td></tr>
+<tr><td>163</td><td>Worldview3 SWIR7 band (2235nm - 2285 nm)</td></tr>
+<tr><td>165</td><td>Worldview3 SWIR8 band (2295nm - 2365 nm)</td></tr>
+
</table>
<h2>EXAMPLES</h2>
@@ -867,6 +888,9 @@
<p><em>Geoeye1 addition 7/2015:</em>
<br>Marco Vizzari
+<p><em>Worldview3 addition 8/2016:</em>
+<br>Markus Neteler, mundialis, Germany
+
<p>
<i>Last changed: $Date$</i>
Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp 2016-09-22 12:13:53 UTC (rev 69549)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp 2016-09-22 12:17:01 UTC (rev 69550)
@@ -6089,10 +6089,10 @@
else G_warning(_("Unsupported iwave value: %d"), iwave);
}
- iinf = (int)((ffu.wlinf - 0.25f) / 0.0025f + 1.5f) - 1; /* remember indexing*/
- isup = (int)((ffu.wlsup - 0.25f) / 0.0025f + 1.5f) - 1; /* "*/
+ iinf = (int)((ffu.wlinf - 0.25f) / 0.0025f + 1.5f) - 1; /* remember indexing */
+ isup = (int)((ffu.wlsup - 0.25f) / 0.0025f + 1.5f) - 1; /* " */
- if(iwave == 1) /* moved here to avoid unnecessery gotos */
+ if(iwave == 1) /* moved here to avoid unnecessary gotos */
{
for(int i = iinf; i <= isup; i++) cin >> ffu.s[i];
cin.ignore(numeric_limits<int>::max(),'\n');
More information about the grass-commit
mailing list