[GRASS-SVN] r72148 - grass/trunk/imagery/i.atcorr

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jan 25 13:27:56 PST 2018


Author: mmetz
Date: 2018-01-25 13:27:56 -0800 (Thu, 25 Jan 2018)
New Revision: 72148

Modified:
   grass/trunk/imagery/i.atcorr/i.atcorr.html
   grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update WorldView 3

Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html	2018-01-25 21:19:27 UTC (rev 72147)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html	2018-01-25 21:27:56 UTC (rev 72148)
@@ -686,23 +686,23 @@
 <tr><td>147</td><td>Pleiades1B NIR band (750nm - 945nm)</td></tr>
 <tr><td>148</td><td>Pleiades1B Pan band (460nm - 845nm)</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>
+<tr><td>149</td><td><b>Worldview3 </b> Pan band (445nm - 812nm)</td></tr>
+<tr><td>150</td><td>Worldview3 Coastal blue band (395nm - 455nm)</td></tr>
+<tr><td>151</td><td>Worldview3 Blue band (443nm - 517nm)</td></tr>
+<tr><td>152</td><td>Worldview3 Green band (508nm - 587nm)</td></tr>
+<tr><td>153</td><td>Worldview3 Yellow band (580nm - 630nm)</td></tr>
+<tr><td>154</td><td>Worldview3 Red band 625nm - 697nm)</td></tr>
+<tr><td>155</td><td>Worldview3 Red edge band (698nm - 752nm)</td></tr>
+<tr><td>156</td><td>Worldview3 NIR1 band (760nm - 902nm)</td></tr>
+<tr><td>157</td><td>Worldview3 NIR2 band (855nm - 1042nm)</td></tr>
+<tr><td>158</td><td>Worldview3 SWIR1 band (1178nm - 1242nm)</td></tr>
+<tr><td>159</td><td>Worldview3 SWIR2 band (1545nm - 1600nm)</td></tr>
+<tr><td>160</td><td>Worldview3 SWIR3 band (1633nm - 1687nm)</td></tr>
+<tr><td>161</td><td>Worldview3 SWIR4 band (1698nm - 1762nm)</td></tr>
+<tr><td>162</td><td>Worldview3 SWIR5 band (2133nm - 2195nm)</td></tr>
+<tr><td>163</td><td>Worldview3 SWIR6 band (2170nm - 2235nm)</td></tr>
+<tr><td>163</td><td>Worldview3 SWIR7 band (2225nm - 2295nm)</td></tr>
+<tr><td>165</td><td>Worldview3 SWIR8 band (2283nm - 2377nm)</td></tr>
 
 <!-- derived from sensors_csv/sentinel_2A_msi.csv -->
 <tr><td>166</td><td><b>Sentinel2A</b> Coastal blue band B1 (430nm - 455nm)</td></tr>

Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp	2018-01-25 21:19:27 UTC (rev 72147)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp	2018-01-25 21:27:56 UTC (rev 72148)
@@ -3909,1877 +3909,243 @@
 {
 
     /* Pan of worldview3 */
-    static const float sr1[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .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, .0005, .0018, .0040, .0437, .0999,
-		.2023, .3598, .4607, .4963, .5229, .5402, .5483, .5464,
-		.5491, .5563, .5584, .5565, .5580, .5663, .5684, .5652,
-		.5674, .5758, .5779, .5740, .5814, .5982, .6074, .6086,
-		.6140, .6240, .6297, .6323, .6369, .6421, .6537, .6723,
-		.6853, .6929, .6990, .7052, .7116, .7163, .7205, .7239,
-		.7298, .7369, .7446, .7530, .7589, .7626, .7700, .7778,
-		.7844, .7917, .7971, .8030, .8088, .8133, .8203, .8269,
-		.8358, .8451, .8507, .8532, .8567, .8614, .8684, .8768,
-		.8824, .8882, .8900, .8896, .8910, .8936, .9016, .9128,
-		.9218, .9295, .9286, .9244, .9243, .9263, .9334, .9439,
-		.9480, .9513, .9530, .9507, .9534, .9566, .9606, .9626,
-		.9653, .9670, .9676, .9686, .9538, .9360, .9365, .9431,
-		.9533, .9661, .9744, .9783, .9859, .9935, .9972, .9997,
-		.9985, .9964, .9917, .9875, .9869, .9871, .9841, .9803,
-		.9789, .9753, .9744, .9739, .9753, .9755, .9726, .9685,
-		.9654, .9614, .9579, .9573, .9557, .9525, .9487, .9448,
-		.9443, .9420, .9429, .9446, .9411, .9377, .9310, .9255,
-		.9240, .9205, .8438, .7458, .5255, .2833, .1646, .0703,
-		.0337, .0104, .0031, .0017, .0010, .0006, .0004, .0002,
-		.0002, .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, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr1[162] = {
+        .0000, .0001, .0002, .0005, .0018, .0040, .0437, .0999,
+        .2023, .3598, .4607, .4963, .5229, .5402, .5483, .5464,
+        .5491, .5563, .5584, .5565, .5580, .5663, .5684, .5652,
+        .5674, .5758, .5779, .5740, .5814, .5982, .6074, .6086,
+        .6140, .6240, .6297, .6323, .6369, .6421, .6537, .6723,
+        .6853, .6929, .6990, .7052, .7116, .7163, .7205, .7239,
+        .7298, .7369, .7446, .7530, .7589, .7626, .7700, .7778,
+        .7844, .7917, .7971, .8030, .8088, .8133, .8203, .8269,
+        .8358, .8451, .8507, .8532, .8567, .8614, .8684, .8768,
+        .8824, .8882, .8900, .8896, .8910, .8936, .9016, .9128,
+        .9218, .9295, .9286, .9244, .9243, .9263, .9334, .9439,
+        .9480, .9513, .9530, .9507, .9534, .9566, .9606, .9626,
+        .9653, .9670, .9676, .9686, .9538, .9360, .9365, .9431,
+        .9533, .9661, .9744, .9783, .9859, .9935, .9972, .9997,
+        .9985, .9964, .9917, .9875, .9869, .9871, .9841, .9803,
+        .9789, .9753, .9744, .9739, .9753, .9755, .9726, .9685,
+        .9654, .9614, .9579, .9573, .9557, .9525, .9487, .9448,
+        .9443, .9420, .9429, .9446, .9411, .9377, .9310, .9255,
+        .9240, .9205, .8438, .7458, .5255, .2833, .1646, .0703,
+        .0337, .0104, .0031, .0017, .0010, .0006, .0004, .0002,
+        .0002, .0001
     };
 	
     /* Coastal_MS7 of worldview3 */
-    static const float sr2[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0002,
-		.0006, .0025, .0226, .1048, .3527, .5648, .6403, .6701,
-		.7018, .7234, .7547, .7860, .8122, .8297, .8511, .8795,
-		.8988, .8979, .9066, .9363, .9680, .9882, 1.0000, .8771,
-		.4725, .1212, .0196, .0037, .0011, .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, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .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, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr2[34] = {
+        .0000, .0000, .0002, .0006, .0025, .0226, .1048, .3527,
+        .5648, .6403, .6701, .7018, .7234, .7547, .7860, .8122,
+        .8297, .8511, .8795, .8988, .8979, .9066, .9363, .9680,
+        .9882, 1.0000, .8771, .4725, .1212, .0196, .0037, .0011,
+        .0003, .0001
     };
 	
     /* Blue_MS4 of worldview3 */
-    static const float sr3[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .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, .0004, .0008, .0020, .0052, .0145, .0523, .1391,
-		.3701, .6262, .7571, .7961, .8125, .8259, .8327, .8311,
-		.8464, .8596, .8824, .8860, .9003, .9034, .9042, .9240,
-		.9537, .9661, .9668, .9831, .9967, .9997, .9531, .8053,
-		.5343, .2451, .0889, .0348, .0099, .0041, .0016, .0007,
-		.0004, .0003, .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, .0000,
-		.0000, .0000, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0003, .0003, .0001, .0001, .0001, .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, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr3[176] = {
+        .0000, .0001, .0002, .0004, .0008, .0020, .0052, .0145,
+        .0523, .1391, .3701, .6262, .7571, .7961, .8125, .8259,
+        .8327, .8311, .8464, .8596, .8824, .8860, .9003, .9034,
+        .9042, .9240, .9537, .9661, .9668, .9831, .9967, .9997,
+        .9531, .8053, .5343, .2451, .0889, .0348, .0099, .0041,
+        .0016, .0007, .0004, .0003, .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, .0000, .0000, .0000, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0003, .0003, .0001, .0001, .0001
+
     };
 	
     /* Green_MS3 of worldview3 */
-    static const float sr4[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .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, .0007, .0065, .0851,
-		.4023, .6996, .7702, .7801, .8082, .7873, .8085, .8168,
-		.8360, .8423, .7935, .8164, .8616, .8783, .8763, .8792,
-		.8934, .9187, .9544, .9716, .9713, .9720, .9459, .9458,
-		.9834, .9994, .9601, .7693, .4286, .1704, .0586, .0208,
-		.0075, .0030, .0015, .0008, .0004, .0002, .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, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr4[45] = {
+        .0000, .0001, .0007, .0065, .0851, .4023, .6996, .7702,
+        .7801, .8082, .7873, .8085, .8168, .8360, .8423, .7935,
+        .8164, .8616, .8783, .8763, .8792, .8934, .9187, .9544,
+        .9716, .9713, .9720, .9459, .9458, .9834, .9994, .9601,
+        .7693, .4286, .1704, .0586, .0208, .0075, .0030, .0015,
+        .0008, .0004, .0002, .0001, .0001
     };
 	
     /* Yellow_MS6 of worldview3 */
-    static const float sr5[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0002, .0007, .0037, .0342, .2139, .6005, .8636,
-		.8941, .9078, .9180, .9227, .9286, .9467, .9433, .9607,
-		.9878, .9963, .9933, .9959, .9587, .6899, .3138, .0944,
-		.0261, .0093, .0036, .0016, .0007, .0004, .0002, .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, .0000,
-		.0000, .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, .0005, .0008, .0019, .0057, .0055,
-		.0016, .0005, .0002, .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, .0000, .0000, .0000, .0000,
-		.0000, .0000, .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, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr5[165] = {
+        .0000, .0000, .0002, .0007, .0037, .0342, .2139, .6005,
+        .8636, .8941, .9078, .9180, .9227, .9286, .9467, .9433,
+        .9607, .9878, .9963, .9933, .9959, .9587, .6899, .3138,
+        .0944, .0261, .0093, .0036, .0016, .0007, .0004, .0002,
+        .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,
+        .0000, .0000, .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, .0005, .0008, .0019, .0057,
+        .0055, .0016, .0005, .0002, .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, .0000, .0000, .0000,
+        .0000, .0000, .0000, .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
     };
 	
     /* Red_MS2 of worldview3 */
-    static const float sr6[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .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, .0004, .0020, .0203, .1547,
-		.4879, .8183, .9395, .9432, .9370, .9429, .9488, .9468,
-		.9548, .9586, .9625, .9732, .9790, .9840, .9931, .9922,
-		.9949, .9945, .9875, .9886, .9949, .9993, .9714, .8022,
-		.4694, .1876, .0607, .0229, .0093, .0039, .0018, .0008,
-		.0004, .0003, .0002, .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, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr6[42] = {
+        .0000, .0001, .0004, .0020, .0203, .1547, .4879, .8183,
+        .9395, .9432, .9370, .9429, .9488, .9468, .9548, .9586,
+        .9625, .9732, .9790, .9840, .9931, .9922, .9949, .9945,
+        .9875, .9886, .9949, .9993, .9714, .8022, .4694, .1876,
+        .0607, .0229, .0093, .0039, .0018, .0008, .0004, .0003,
+        .0002, .0001
     };
 	
     /* Red Edge_MS5 of worldview3 */
-    static const float sr7[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .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, .0005,
-		.0012, .0032, .0088, .0326, .1111, .3243, .6486, .8933,
-		.9838, .9935, .9864, .9820, .9795, .9812, .9855, .9921,
-		.9979, .9995, .9895, .9330, .7780, .4940, .2209, .0826,
-		.0292, .0123, .0055, .0027, .0013, .0007, .0004, .0002,
-		.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, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr7[38] = {
+        .0000, .0001, .0002, .0005, .0012, .0032, .0088, .0326,
+        .1111, .3243, .6486, .8933, .9838, .9935, .9864, .9820,
+        .9795, .9812, .9855, .9921, .9979, .9995, .9895, .9330,
+        .7780, .4940, .2209, .0826, .0292, .0123, .0055, .0027,
+        .0013, .0007, .0004, .0002, .0001, .0001
     };
 	
     /* NIR1_MS1 of worldview3 */
-    static const float sr8[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .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, .0003,
-		.0006, .0013, .0027, .0053, .0104, .0231, .0588, .1652,
-		.3962, .6715, .8709, .9739, 1.0000, .9922, .9818, .9712,
-		.9554, .9382, .9261, .9178, .9153, .9139, .9153, .9127,
-		.9056, .8989, .8899, .8803, .8697, .8670, .8662, .8676,
-		.8673, .8596, .8528, .8439, .8341, .8247, .8115, .7939,
-		.7757, .7585, .7400, .7253, .7101, .6925, .6740, .6561,
-		.6427, .6302, .6203, .6125, .6055, .6017, .6020, .6027,
-		.5664, .4018, .2039, .0823, .0309, .0135, .0063, .0033,
-		.0021, .0015, .0010, .0007, .0004, .0002, .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, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr8[76] = {
+        .0001, .0001, .0001, .0003, .0006, .0013, .0027, .0053,
+        .0104, .0231, .0588, .1652, .3962, .6715, .8709, .9739,
+        1.0000, .9922, .9818, .9712, .9554, .9382, .9261, .9178,
+        .9153, .9139, .9153, .9127, .9056, .8989, .8899, .8803,
+        .8697, .8670, .8662, .8676, .8673, .8596, .8528, .8439,
+        .8341, .8247, .8115, .7939, .7757, .7585, .7400, .7253,
+        .7101, .6925, .6740, .6561, .6427, .6302, .6203, .6125,
+        .6055, .6017, .6020, .6027, .5664, .4018, .2039, .0823,
+        .0309, .0135, .0063, .0033, .0021, .0015, .0010, .0007,
+        .0004, .0002, .0001, .0001
     };
 	
     /* NIR2_MS8 of worldview3 */
-    static const float sr9[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .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, .0021,
-		.0050, .0071, .0155, .0519, .1987, .5721, .8996, .9942,
-		.9981, .9767, .9538, .9337, .9134, .8942, .8730, .8531,
-		.8382, .8188, .8047, .7914, .7726, .7577, .7403, .7301,
-		.7191, .7061, .6928, .6801, .6680, .6568, .6439, .6304,
-		.6170, .6000, .5864, .5722, .5544, .5405, .5268, .5100,
-		.4928, .4761, .4612, .4439, .4297, .4132, .3972, .3822,
-		.3674, .3515, .3365, .3214, .3091, .2956, .2844, .2740,
-		.2628, .2523, .2411, .2303, .2218, .2105, .2013, .1933,
-		.1836, .1755, .1660, .1567, .1508, .1429, .1366, .1304,
-		.1232, .1151, .0999, .0731, .0419, .0195, .0082, .0035,
-		.0017, .0008, .0005, .0003, .0002, .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, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr9[89] = {
+        .0000, .0001, .0021, .0050, .0071, .0155, .0519, .1987,
+        .5721, .8996, .9942, .9981, .9767, .9538, .9337, .9134,
+        .8942, .8730, .8531, .8382, .8188, .8047, .7914, .7726,
+        .7577, .7403, .7301, .7191, .7061, .6928, .6801, .6680,
+        .6568, .6439, .6304, .6170, .6000, .5864, .5722, .5544,
+        .5405, .5268, .5100, .4928, .4761, .4612, .4439, .4297,
+        .4132, .3972, .3822, .3674, .3515, .3365, .3214, .3091,
+        .2956, .2844, .2740, .2628, .2523, .2411, .2303, .2218,
+        .2105, .2013, .1933, .1836, .1755, .1660, .1567, .1508,
+        .1429, .1366, .1304, .1232, .1151, .0999, .0731, .0419,
+        .0195, .0082, .0035, .0017, .0008, .0005, .0003, .0002,
+        .0001
     };
 	
     /* SWIR1 of worldview3 */
-    static const float sr10[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0002, .0003, .0003,
-		.0004, .0004, .0005, .0007, .0008, .0011, .0015, .0021,
-		.0030, .0044, .0068, .0111, .0188, .0331, .0607, .1164,
-		.2198, .4033, .6350, .8383, .9524, .9828, .9904, .9904,
-		.9880, .9882, .9949, .9986, .9536, .7801, .5373, .3037,
-		.1597, .0858, .0470, .0273, .0163, .0103, .0067, .0046,
-		.0032, .0023, .0017, .0013, .0010, .0009, .0007, .0006,
-		.0005, .0004, .0004, .0004, .0003, .0003, .0003, .0003,
-		.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,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr10[63] = {
+        .0000, .0000, .0002, .0003, .0003, .0004, .0004, .0005,
+        .0007, .0008, .0011, .0015, .0021, .0030, .0044, .0068,
+        .0111, .0188, .0331, .0607, .1164, .2198, .4033, .6350,
+        .8383, .9524, .9828, .9904, .9904, .9880, .9882, .9949,
+        .9986, .9536, .7801, .5373, .3037, .1597, .0858, .0470,
+        .0273, .0163, .0103, .0067, .0046, .0032, .0023, .0017,
+        .0013, .0010, .0009, .0007, .0006, .0005, .0004, .0004,
+        .0004, .0003, .0003, .0003, .0003, .0003, .0001
     };
 	
     /* SWIR2 of worldview3 */
-    static const float sr11[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.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, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0002,
-		.0002, .0004, .0006, .0014, .0034, .0098, .0310, .1039,
-		.2858, .6176, .9095, .9226, .8949, .9136, .9476, .9752,
-		.9884, .9883, .9859, .9913, .9971, .9966, 1.0000, .9555,
-		.7257, .4157, .1524, .0495, .0153, .0057, .0023, .0011,
-		.0006, .0003, .0002, .0002, .0001, .0001, .0001, .0001,
-		.0001, .0001, .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, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr11[56] = {
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0002, .0002, .0004, .0006, .0014, .0034,
+        .0098, .0310, .1039, .2858, .6176, .9095, .9226, .8949,
+        .9136, .9476, .9752, .9884, .9883, .9859, .9913, .9971,
+        .9966, 1.0000, .9555, .7257, .4157, .1524, .0495, .0153,
+        .0057, .0023, .0011, .0006, .0003, .0002, .0002, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001
+
     };
 	
     /* SWIR3 of worldview3 */
-    static const float sr12[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .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, .0002, .0003, .0005, .0013,
-		.0033, .0101, .0339, .1087, .2884, .5790, .7930, .8898,
-		.8970, .9117, .9246, .9352, .9474, .9610, .9773, .9953,
-		.9989, .9866, .9786, .8403, .5534, .2201, .0665, .0197,
-		.0062, .0025, .0011, .0005, .0003, .0001, .0000, .0001,
-		.0000, .0000, .0000, .0001, .0000, .0000, .0000, .0000,
-		.0000, .0000, .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, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr12[39] = {
+        .0000, .0001, .0001, .0002, .0003, .0005, .0013, .0033,
+        .0101, .0339, .1087, .2884, .5790, .7930, .8898, .8970,
+        .9117, .9246, .9352, .9474, .9610, .9773, .9953, .9989,
+        .9866, .9786, .8403, .5534, .2201, .0665, .0197, .0062,
+        .0025, .0011, .0005, .0003, .0001, .0000, .0001
     };
 	
     /* SWIR4 of worldview3 */
-    static const float sr13[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.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, .0002, .0002, .0003, .0004, .0007, .0011,
-		.0019, .0034, .0064, .0131, .0284, .0659, .1419, .3122,
-		.5747, .8196, .9650, .9582, .9516, .9666, .9852, .9952,
-		.9995, .9999, .9997, .9949, .9868, .9743, .9339, .7642,
-		.5640, .3207, .1506, .0712, .0328, .0161, .0082, .0045,
-		.0026, .0015, .0009, .0006, .0004, .0003, .0001, .0001,
-		.0001, .0000, .0001, .0000, .0001, .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, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr13[50] = {
+        .0000, .0001, .0001, .0002, .0002, .0003, .0004, .0007,
+        .0011, .0019, .0034, .0064, .0131, .0284, .0659, .1419,
+        .3122, .5747, .8196, .9650, .9582, .9516, .9666, .9852,
+        .9952, .9995, .9999, .9997, .9949, .9868, .9743, .9339,
+        .7642, .5640, .3207, .1506, .0712, .0328, .0161, .0082,
+        .0045, .0026, .0015, .0009, .0006, .0004, .0003, .0001,
+        .0001, .0001
     };
 	
     /* SWIR5 of worldview3 */
-    static const float sr14[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .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, .0001, .0000, .0001,
-		.0000, .0002, .0001, .0003, .0005, .0008, .0014, .0027,
-		.0054, .0119, .0282, .0703, .1534, .3105, .5282, .7231,
-		.8960, .9577, .9628, .9709, .9846, .9959, .9999, .9898,
-		.9701, .9473, .9435, .9416, .8180, .6295, .3992, .1832,
-		.0741, .0302, .0124, .0059, .0029, .0016, .0009, .0005,
-		.0003, .0003, .0001, .0001, .0002, .0001, .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, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr14[54] = {
+        .0001, .0002, .0001, .0000, .0001, .0000, .0002, .0001,
+        .0003, .0005, .0008, .0014, .0027, .0054, .0119, .0282,
+        .0703, .1534, .3105, .5282, .7231, .8960, .9577, .9628,
+        .9709, .9846, .9959, .9999, .9898, .9701, .9473, .9435,
+        .9416, .8180, .6295, .3992, .1832, .0741, .0302, .0124,
+        .0059, .0029, .0016, .0009, .0005, .0003, .0003, .0001,
+        .0001, .0002, .0001, .0000, .0001, .0000
     };
 	
     /* SWIR6 of worldview3 */
-    static const float sr15[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .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, .0001,
-		.0001, .0003, .0004, .0006, .0011, .0019, .0033, .0063,
-		.0125, .0283, .0650, .1343, .2683, .4892, .7200, .9225,
-		.9984, .9977, .9954, .9949, .9915, .9896, .9825, .9642,
-		.9341, .8872, .8615, .8581, .7748, .6345, .4488, .2272,
-		.1005, .0451, .0194, .0093, .0047, .0026, .0015, .0009,
-		.0005, .0004, .0003, .0002, .0001, .0001, .0000, .0001,
-		.0000, .0001, .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, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr15[51] = {
+        .0000, .0001, .0001, .0001, .0001, .0001, .0003, .0004,
+        .0006, .0011, .0019, .0033, .0063, .0125, .0283, .0650,
+        .1343, .2683, .4892, .7200, .9225, .9984, .9977, .9954,
+        .9949, .9915, .9896, .9825, .9642, .9341, .8872, .8615,
+        .8581, .7748, .6345, .4488, .2272, .1005, .0451, .0194,
+        .0093, .0047, .0026, .0015, .0009, .0005, .0004, .0003,
+        .0002, .0001, .0001
     };
 	
     /* SWIR7 of worldview3 */
-    static const float sr16[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .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, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0001, .0001,
-		.0001, .0003, .0006, .0012, .0025, .0061, .0156, .0468,
-		.1112, .2458, .4584, .6318, .7693, .9092, .9488, .9662,
-		.9842, .9932, .9963, .9989, 1.0000, .9969, .9914, .9850,
-		.9769, .9635, .9483, .9148, .7730, .6197, .4182, .2046,
-		.0865, .0340, .0125, .0053, .0024, .0012, .0006, .0003,
-		.0002, .0001, .0001, .0001, .0000, .0000, .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
+    static const float sr16[47] = {
+        .0000, .0001, .0001, .0001, .0003, .0006, .0012, .0025,
+        .0061, .0156, .0468, .1112, .2458, .4584, .6318, .7693,
+        .9092, .9488, .9662, .9842, .9932, .9963, .9989, 1.0000,
+        .9969, .9914, .9850, .9769, .9635, .9483, .9148, .7730,
+        .6197, .4182, .2046, .0865, .0340, .0125, .0053, .0024,
+        .0012, .0006, .0003, .0002, .0001, .0001, .0001
     };
 	
     /* SWIR8 of worldview3 */
-    static const float sr17[841] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .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, .0002, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0002, .0003, .0003, .0003, .0004, .0005,
-		.0009, .0014, .0025, .0049, .0100, .0217, .0479, .0922,
-		.1664, .2868, .4459, .6204, .7669, .8738, .9340, .9624,
-		.9784, .9885, .9946, .9984, 1.0000, .9993, .9970, .9937,
-		.9905, .9896, .9899, .9885, .9839, .9739, .9568, .9309,
-		.9055, .8919, .8997, .9116, .8201, .6699, .5134, .2892,
-		.1348, .0631, .0270, .0123, .0058, .0030, .0017, .0010,
-		.0006, .0005, .0003, .0003, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0002, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr17[83] = {
+        .0000, .0001, .0002, .0002, .0002, .0002, .0002, .0002,
+        .0002, .0002, .0002, .0003, .0003, .0003, .0004, .0005,
+        .0009, .0014, .0025, .0049, .0100, .0217, .0479, .0922,
+        .1664, .2868, .4459, .6204, .7669, .8738, .9340, .9624,
+        .9784, .9885, .9946, .9984, 1.0000, .9993, .9970, .9937,
+        .9905, .9896, .9899, .9885, .9839, .9739, .9568, .9309,
+        .9055, .8919, .8997, .9116, .8201, .6699, .5134, .2892,
+        .1348, .0631, .0270, .0123, .0058, .0030, .0017, .0010,
+        .0006, .0005, .0003, .0003, .0002, .0002, .0002, .0002,
+        .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+        .0002, .0002, .0002
     };
 	
-    static const float wli[17] = {0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350, 0.350};
-    static const float wls[17] = {2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450, 2.450};
+    static const float wli[17] = {0.4300, 0.3825, 0.4250, 0.4975, 0.5675, 0.6150, 0.6800, 0.7400, 0.8425, 1.1375, 1.5025, 1.6125, 1.6675, 2.0975, 2.1375, 2.2025, 2.2300};
+    static const float wls[17] = {0.8350, 0.4675, 0.8650, 0.6100, 0.9800, 0.7200, 0.7750, 0.9300, 1.0650, 1.2950, 1.6425, 1.7100, 1.7925, 2.2325, 2.2650, 2.3200, 2.4375};
 
     ffu.wlinf = (float)wli[iwa-1];
     ffu.wlsup = (float)wls[iwa-1];
@@ -5789,39 +4155,39 @@
 
     switch(iwa)
     {
-    case 1: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr1[i];
+    case 1: for(i = 0; i < 162; i++)  ffu.s[72+i] = sr1[i];
         break;
-    case 2: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr2[i];
+    case 2: for(i = 0; i < 34; i++)  ffu.s[53+i] = sr2[i];
         break;
-    case 3: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr3[i];
+    case 3: for(i = 0; i < 176; i++)  ffu.s[70+i] = sr3[i];
         break;
-    case 4: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr4[i];
+    case 4: for(i = 0; i < 45; i++)  ffu.s[99+i] = sr4[i];
         break;
-    case 5: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr5[i];
+    case 5: for(i = 0; i < 165; i++)  ffu.s[127+i] = sr5[i];
         break;
-    case 6: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr6[i];
+    case 6: for(i = 0; i < 42; i++)  ffu.s[146+i] = sr6[i];
         break;
-    case 7: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr7[i];
+    case 7: for(i = 0; i < 38; i++)  ffu.s[172+i] = sr7[i];
         break;
-    case 8: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr8[i];
+    case 8: for(i = 0; i < 76; i++)  ffu.s[196+i] = sr8[i];
         break;
-    case 9: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr9[i];
+    case 9: for(i = 0; i < 89; i++)  ffu.s[237+i] = sr9[i];
         break;
-    case 10: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr10[i];
+    case 10: for(i = 0; i < 63; i++)  ffu.s[355+i] = sr10[i];
         break;
-    case 11: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr11[i];
+    case 11: for(i = 0; i < 56; i++)  ffu.s[501+i] = sr11[i];
         break;
-    case 12: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr12[i];
+    case 12: for(i = 0; i < 39; i++)  ffu.s[545+i] = sr12[i];
         break;
-    case 13: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr13[i];
+    case 13: for(i = 0; i < 50; i++)  ffu.s[567+i] = sr13[i];
         break;
-    case 14: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr14[i];
+    case 14: for(i = 0; i < 54; i++)  ffu.s[739+i] = sr14[i];
         break;
-    case 15: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr15[i];
+    case 15: for(i = 0; i < 51; i++)  ffu.s[755+i] = sr15[i];
         break;
-    case 16: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr16[i];
+    case 16: for(i = 0; i < 47; i++)  ffu.s[781+i] = sr16[i];
         break;
-    case 17: for(i = 0; i < 841; i++)  ffu.s[40+i] = sr17[i];
+    case 17: for(i = 0; i < 83; i++)  ffu.s[792+i] = sr17[i];
         break;
     }
 }



More information about the grass-commit mailing list