[GRASS-SVN] r37242 - grass/branches/releasebranch_6_4/imagery/i.atcorr

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-05-15 06:05:36 -0400 (Fri, 15 May 2009)
New Revision: 37242

Modified:
   grass/branches/releasebranch_6_4/imagery/i.atcorr/description.html
   grass/branches/releasebranch_6_4/imagery/i.atcorr/main.cpp
Log:
cache increased; docs cosmetics

Modified: grass/branches/releasebranch_6_4/imagery/i.atcorr/description.html
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.atcorr/description.html	2009-05-15 10:05:17 UTC (rev 37241)
+++ grass/branches/releasebranch_6_4/imagery/i.atcorr/description.html	2009-05-15 10:05:36 UTC (rev 37242)
@@ -507,14 +507,14 @@
 50                           - visibility [km] (aerosol model concentration)
 -0.110                       - mean target elevation above sea level [km]
 -1000                        - sensor on board a satellite
-64                           - 4th band of ETM+ Landsat 7" > icnd.txt
+64                           - 4th band of ETM+ Landsat 7" > icnd_lsat4.txt
 
 # run atmospheric correction (-r for reflectance input map; -a for date >July 2000;
 #                             -o to use cache acceleration):
-i.atcorr -r -a -o lsat7_2002_40 ialt=elev_int icnd=icnd.txt oimg=lsat7_2002_40_atcorr
+i.atcorr -r -a -o lsat7_2002_40 ialt=elev_int icnd=icnd_lsat4.txt oimg=lsat7_2002_40_atcorr
 </pre></div>
 
-Note that the altitude value from 'icnd.txt' file is read at the beginning
+Note that the altitude value from 'icnd_lsat4.txt' file is read at the beginning
 to compute the initial transform. It is necessary to give a value which could
 the the mean value of the elevation model. For the atmospheric correction then
 the raster elevation values are used from the map.

Modified: grass/branches/releasebranch_6_4/imagery/i.atcorr/main.cpp
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.atcorr/main.cpp	2009-05-15 10:05:17 UTC (rev 37241)
+++ grass/branches/releasebranch_6_4/imagery/i.atcorr/main.cpp	2009-05-15 10:05:36 UTC (rev 37242)
@@ -40,12 +40,11 @@
 #include "Transform.h"
 #include "6s.h"
 
-
 /* Input options and flags */
 struct Options
 {
     /* options */
-    struct Option *iimg;    /* input satelite image */
+    struct Option *iimg;    /* input satellite image */
     struct Option *iscl;    /* input data is scaled to this range */
     struct Option *ialt;    /* an input elevation map in km used to increase */
                             /* atmospheric correction accuracy, including this */
@@ -125,11 +124,12 @@
 }
 
 
+/* See also Cache note below */
 class TICache
 {
     enum TICacheSize
     {
-        MAX_TIs = 1024 /* this value is a guess, increase it if in general more categories are used */
+        MAX_TIs = 8192 /* this value is a guess, increase it if in general more categories are used */
     };
     TransformInput tis[MAX_TIs];
     float alts[MAX_TIs];
@@ -161,11 +161,18 @@
 /* the transform input map, is a array of ticaches.
    The first key is the visibility which matches to a TICache for the altitudes.
    This code is horrible, i just spent 20min writing and 5min debugging it. */
+
+/* Cache note:
+   The DEM cases are in range 0 < DEM < 8888 for the World in case of using an 
+   integer DEM values in meters. So the cache should ideally store 8888 different
+   cases for the World-type conditions if all happen in the same image. */
+
 class TIMap
 {
     enum TIMapSize
     {
-	MAX_TICs = 1024 /* this value is a guess. It means that 1024 TI's will be the max combinations of vis/alt pairs */
+	MAX_TICs = 8192  /* this value is a guess. It means that <size> TI's will be 
+                          * the max combinations of vis/alt pairs */
     };
 
     TICache tic[MAX_TICs]; /* array of TICaches */