[GRASS-SVN] r69549 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Sep 22 05:13:53 PDT 2016
Author: neteler
Date: 2016-09-22 05:13:53 -0700 (Thu, 22 Sep 2016)
New Revision: 69549
Modified:
grass/trunk/imagery/i.atcorr/README
grass/trunk/imagery/i.atcorr/create_iwave.py
grass/trunk/imagery/i.atcorr/iwave.h
Log:
i.atcorr: minor cleanup
Modified: grass/trunk/imagery/i.atcorr/README
===================================================================
--- grass/trunk/imagery/i.atcorr/README 2016-09-22 12:06:19 UTC (rev 69548)
+++ grass/trunk/imagery/i.atcorr/README 2016-09-22 12:13:53 UTC (rev 69549)
@@ -13,11 +13,11 @@
one after the other.
Example Lsat TM: (435-250) / 2.5 = 74
- o add filter function to Iwave.cpp, before IWave::equivwl()
+ o run create_iwave.py and add new filter function to Iwave.cpp, before IWave::equivwl()
o add else-if in IWave::parse() in Iwave.cpp
o add print strings in Iwave.cpp
- o add iwave values and signature in Iwave.h
+ o add satellite sensor to Iwave.h
o add to GeomCond.cpp and GeomCond.h
o add to i.atcorr.html
Modified: grass/trunk/imagery/i.atcorr/create_iwave.py
===================================================================
--- grass/trunk/imagery/i.atcorr/create_iwave.py 2016-09-22 12:06:19 UTC (rev 69548)
+++ grass/trunk/imagery/i.atcorr/create_iwave.py 2016-09-22 12:13:53 UTC (rev 69549)
@@ -271,7 +271,7 @@
print " > Filter functions exported to %s" % ("sensors_csv/"+sensor+"_cpp_template.txt")
print " > Please check this file for possible errors before inserting the code into file iwave.cpp"
- print " > Don't forget to add the necessary data to file iwave.h and to i.atcorr.html"
+ print " > Don't forget to add the necessary data to the files iwave.h, geomcond.h, geomcond.cpp, and to i.atcorr.html"
print
return
Modified: grass/trunk/imagery/i.atcorr/iwave.h
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.h 2016-09-22 12:06:19 UTC (rev 69548)
+++ grass/trunk/imagery/i.atcorr/iwave.h 2016-09-22 12:13:53 UTC (rev 69549)
@@ -2,194 +2,39 @@
#define IWAVE_H
-/**********************************************************************c
-c iwave input of the spectral conditions c
-c -------------------------------- c
-c c
-c you choose to define your own spectral conditions: iwave=-1,0 or 1 c
-c (three user s conditions ) c
-c -2 enter wlinf, wlsup, the filter function will be equal to 1c
-c over the whole band (as iwave=0) but step by step output c
-c will be printed c
-c -1 enter wl (monochr. cond, gaseous absorption is included) c
-c c
-c 0 enter wlinf, wlsup. the filter function will be equal to 1c
-c over the whole band. c
-c c
-c 1 enter wlinf, wlsup and user's filter function s(lambda) c
-c ( by step of 0.0025 micrometer). c
-c c
-c c
-c or you select one of the following satellite spectral band c
-c with indication in brackets of the band limits used in the code : c
-c iwave=2 to 60 c
-c 2 vis band of meteosat ( 0.350-1.110 ) c
-c 3 vis band of goes east ( 0.490-0.900 ) c
-c 4 vis band of goes west ( 0.490-0.900 ) c
-c 5 1st band of avhrr(noaa6) ( 0.550-0.750 ) c
-c 6 2nd " ( 0.690-1.120 ) c
-c 7 1st band of avhrr(noaa7) ( 0.500-0.800 ) c
-c 8 2nd " ( 0.640-1.170 ) c
-c 9 1st band of avhrr(noaa8) ( 0.540-1.010 ) c
-c 10 2nd " ( 0.680-1.120 ) c
-c 11 1st band of avhrr(noaa9) ( 0.530-0.810 ) c
-c 12 2nd " ( 0.680-1.170 ) c
-c 13 1st band of avhrr(noaa10 ( 0.530-0.780 ) c
-c 14 2nd " ( 0.600-1.190 ) c
-c 15 1st band of avhrr(noaa11 ( 0.540-0.820 ) c
-c 16 2nd " ( 0.600-1.120 ) c
-c 17 1st band of hrv1(spot1) ( 0.470-0.650 ) c
-c 18 2nd " ( 0.600-0.720 ) c
-c 19 3rd " ( 0.730-0.930 ) c
-c 20 pan " ( 0.470-0.790 ) c
-c 21 1st band of hrv2(spot1) ( 0.470-0.650 ) c
-c 22 2nd " ( 0.590-0.730 ) c
-c 23 3rd " ( 0.740-0.940 ) c
-c 24 pan " ( 0.470-0.790 ) c
-c 25 1st band of tm(landsat5) ( 0.430-0.560 ) c
-c 26 2nd " ( 0.500-0.650 ) c
-c 27 3rd " ( 0.580-0.740 ) c
-c 28 4th " ( 0.730-0.950 ) c
-c 29 5th " ( 1.5025-1.890 ) c
-c 30 7th " ( 1.950-2.410 ) c
-c 31 1st band of mss(landsat5)( 0.475-0.640 ) c
-c 32 2nd " ( 0.580-0.750 ) c
-c 33 3rd " ( 0.655-0.855 ) c
-c 34 4th " ( 0.785-1.100 ) c
-c 35 1st band of MAS (ER2) ( 0.5025-0.5875) c
-c 36 2nd " ( 0.6075-0.7000) c
-c 37 3rd " ( 0.8300-0.9125) c
-c 38 4th " ( 0.9000-0.9975) c
-c 39 5th " ( 1.8200-1.9575) c
-c 40 6th " ( 2.0950-2.1925) c
-c 41 7th " ( 3.5800-3.8700) c
-c 42 MODIS band 1 ( 0.6100-0.6850) c
-c 43 MODIS band 2 ( 0.8200-0.9025) c
-c 44 MODIS band 3 ( 0.4500-0.4825) c
-c 45 MODIS band 4 ( 0.5400-0.5700) c
-c 46 MODIS band 5 ( 1.2150-1.2700) c
-c 47 MODIS band 6 ( 1.6000-1.6650) c
-c 48 MODIS band 7 ( 2.0575-2.1825) c
-c 49 1st band of avhrr(noaa12 ( 0.500-1.000 ) c
-c 50 2nd " ( 0.650-1.120 ) c
-c 51 1st band of avhrr(noaa14 ( 0.500-1.110 ) c
-c 52 2nd " ( 0.680-1.100 ) c
-c 53 POLDER band 1 ( 0.4125-0.4775) c
-c 54 POLDER band 2 (non polar( 0.4100-0.5225) c
-c 55 POLDER band 3 (non polar( 0.5325-0.5950) c
-c 56 POLDER band 4 P1 ( 0.6300-0.7025) c
-c 57 POLDER band 5 (non polar( 0.7450-0.7800) c
-c 58 POLDER band 6 (non polar( 0.7000-0.8300) c
-c 59 POLDER band 7 P1 ( 0.8100-0.9200) c
-c 60 POLDER band 8 (non polar( 0.8650-0.9400) c
-c 61 1st band of etm+(landsat7( 0.435-0.520 ) c
-c 62 2nd " ( 0.506-0.621 ) c
-c 63 3rd " ( 0.622-0.702 ) c
-c 64 4th " ( 0.751-0.911 ) c
-c 65 5th " ( 1.512-1.792 ) c
-c 66 7th " ( 2.020-2.380 ) c
-c 67 8th " ( 0.504-0.909 ) c
-c 68 2nd band of liss (IRC 1C)( 0.502-0.620 ) c
-c 69 3rd " ( 0.612-0.700 ) c
-c 70 4th " ( 0.752-0.880 ) c
-c 71 5th " ( 1.452-1.760 ) c
-c 72 1st band of aster ( 0.480-0.645 ) c
-c 73 2nd " ( 0.588-0.733 ) c
-c 74 3N " ( 0.723-0.913 ) c
-c 75 4th " ( 1.530-1.750 ) c
-c 76 5th " ( 2.103-2.285 ) c
-c 77 6th " ( 2.105-2.298 ) c
-c 78 7th " ( 2.200-2.393 ) c
-c 79 8th " ( 2.248-2.475 ) c
-c 80 9th " ( 2.295-2.538 ) c
-c 81 1st band of avnir ( 0.390-0.550 ) c
-c 82 2nd " ( 0.485-0.695 ) c
-c 83 3rd " ( 0.545-0.745 ) c
-c 84 4th " ( 0.700-0.925 ) c
-c 85 Green band of IKONOS ( 0.350-1.035 ) c
-c 86 Red " ( 0.350-1.035 ) c
-c 87 NIR " ( 0.350-1.035 ) c
-c 88 Blue band of RapidEye ( 0.438-0.513 ) c
-c 89 Green " ( 0.463-0.594 ) c
-c 90 Red " ( 0.624-0.690 ) c
-c 91 RedEdge " ( 0.500-0.737 ) c
-c 92 NIR " ( 0.520-0.862 ) c
-c 93 B0 band of VGT1 (SPOT4) ( 0.400-0.500 ) c
-c 94 B2 " ( 0.580-0.782 ) c
-c 95 B3 " ( 0.700-1.030 ) c
-c 96 MIR " ( 1.450-1.800 ) c
-c 97 B0 band of VGT2 (SPOT5) ( 0.400-0.550 ) c
-c 98 B2 " ( 0.580-0.780 ) c
-c 99 B3 " ( 0.700-1.000 ) c
-c 100 MIR " ( 1.450-1.800 ) c
-c 101 Pan band of Worldview 2 ( 0.450-0.800 ) c
-c 102 Coastal " ( 0.396-0.458 ) c
-c 103 Blue " ( 0.442-0.515 ) c
-c 104 Green " ( 0.506-0.586 ) c
-c 105 Yellow " ( 0.584-0.632 ) c
-c 106 Red " ( 0.624-0.694 ) c
-c 107 RedEdge " ( 0.699-0.749 ) c
-c 108 NIR1 " ( 0.765-0.901 ) c
-c 109 NIR2 " ( 0.856-1.043 ) c
-c 110 Pan band of QuickBird 2 ( 0.405-1.053 ) c
-c 111 Blue " ( 0.430-0.545 ) c
-c 112 Green " ( 0.466-0.620 ) c
-c 113 Red " ( 0.590-0.710 ) c
-c 114 NIR " ( 0.715-0.918 ) c
-c 115 Coastal Aerosol of LS8 ( 0.427-0.459 ) c
-c 116 Blue " ( 0.436-0.527 ) c
-c 117 Green " ( 0.512-0.610 ) c
-c 118 Red " ( 0.625-0.691 ) c
-c 119 Pan " ( 0.488-0.692 ) c
-c 120 NIR " ( 0.829-0.900 ) c
-c 121 Cirrus " ( 1.340-1.409 ) c
-c 122 SWIR1 " ( 1.515-1.697 ) c
-c 123 SWIR2 " ( 2.037-2.037 ) c
-c 124 Pan band of GeoEye 1 ( 0.450-0.800 ) c
-c 125 Blue " ( 0.450-0.510 ) c
-c 126 Green " ( 0.510-0.580 ) c
-c 127 Red " ( 0.655-0.690 ) c
-c 128 NIR " ( 0.780-0.920 ) c
-c 129 Blue band of spot6 ( 0.455-0.525 ) c
-c 130 Green " ( 0.530-0.590 ) c
-c 131 Red " ( 0.625-0.695 ) c
-c 132 NIR " ( 0.760-0.890 ) c
-c 133 Pan " ( 0.455-0.745 ) c
-c 129 Blue band of spot7 ( 0.455-0.525 ) c
-c 130 Green " ( 0.530-0.590 ) c
-c 131 Red " ( 0.625-0.695 ) c
-c 132 NIR " ( 0.760-0.890 ) c
-c 133 Pan " ( 0.455-0.745 ) c
-c 129 Blue band of pleiades1a ( 0.430-0.550 ) c
-c 130 Green " ( 0.490-0.610 ) c
-c 131 Red " ( 0.600-0.720 ) c
-c 132 NIR " ( 0.750-0.950 ) c
-c 133 Pan " ( 0.480-0.830 ) c
-c 129 Blue band of pleiades1b ( 0.455-0.525 ) c
-c 130 Green " ( 0.530-0.590 ) c
-c 131 Red " ( 0.625-0.695 ) c
-c 132 NIR " ( 0.760-0.890 ) c
-c 133 Pan " ( 0.480-0.830 ) c
-c 134 Pan band of Worldview 3
-c 135 Coastal_MS7 "
-c 136 Blue_MS4 "
-c 137 Green_MS3
-c 138 Yellow_MS6
-c 139 Red_MS2 "
-c 140 Red Edge_MS5
-c 141 NIR1_MS1 "
-c 142 NIR2_MS8 "
-c 143 SWIR1 "
-c 144 SWIR2 "
-c 145 SWIR3 "
-c 146 SWIR4 "
-c 147 SWIR5 "
-c 148 SWIR6 "
-c 149 SWIR7 "
-c 150 SWIR8 "
-c c
-c note: wl has to be in micrometer c
-c**********************************************************************/
+/***********************************************************************
+ * iwave input of the spectral conditions
+ * --------------------------------
+ *
+ * you choose to define your own spectral conditions: iwave=-1,0 or 1
+ * (three user s conditions )
+ * -2 enter wlinf, wlsup, the filter function will be equal to 1
+ * over the whole band (as iwave=0) but step by step output
+ * will be printed
+ * -1 enter wl (monochr. cond, gaseous absorption is included)
+ *
+ * 0 enter wlinf, wlsup. the filter function will be equal to 1
+ * over the whole band.
+ *
+ * 1 enter wlinf, wlsup and user's filter function s(lambda)
+ * ( by step of 0.0025 micrometer).
+ *
+ *
+ * or you select one of the following satellite spectral band
+ * with indication in brackets of the band limits used in the code :
+ * iwave=2 to 60
+ * 2 vis band of meteosat ( 0.350-1.110 )
+ * 3 vis band of goes east ( 0.490-0.900 )
+ * 4 vis band of goes west ( 0.490-0.900 )
+ * 5 1st band of avhrr(noaa6) ( 0.550-0.750 )
+ * 6 2nd " ( 0.690-1.120 )
+ * 7 1st band of avhrr(noaa7) ( 0.500-0.800 )
+ * 8 2nd " ( 0.640-1.170 )
+ * 9 1st band of avhrr(noaa8) ( 0.540-1.010 )
+ * [...] - see iwave.cpp
+ *
+ * note: wl has to be in micrometer
+***********************************************************************/
struct IWave
{
More information about the grass-commit
mailing list