[GRASS-SVN] r72140 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 25 12:49:35 PST 2018
Author: mmetz
Date: 2018-01-25 12:49:35 -0800 (Thu, 25 Jan 2018)
New Revision: 72140
Modified:
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update Pleiades1B
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 20:46:27 UTC (rev 72139)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 20:49:35 UTC (rev 72140)
@@ -680,11 +680,11 @@
<tr><td>142</td><td>Pleiades1A NIR band (740nm - 945nm)</td></tr>
<tr><td>143</td><td>Pleiades1A Pan band (460nm - 845nm)</td></tr>
-<tr><td>144</td><td><b>Pleiades1B </b> Blue band (430nm - 550nm)</td></tr>
-<tr><td>145</td><td>Pleiades1B Green band (490nm - 610nm)</td></tr>
-<tr><td>146</td><td>Pleiades1B Red band (600nm - 720nm)</td></tr>
-<tr><td>147</td><td>Pleiades1B NIR band (750nm - 950nm)</td></tr>
-<tr><td>148</td><td>Pleiades1B Pan band (480nm - 830nm)</td></tr>
+<tr><td>144</td><td><b>Pleiades1B </b> Blue band 438nm - 560nm)</td></tr>
+<tr><td>145</td><td>Pleiades1B Green band (498nm - 615nm)</td></tr>
+<tr><td>146</td><td>Pleiades1B Red band (608nm - 727nm)</td></tr>
+<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>
Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 20:46:27 UTC (rev 72139)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 20:49:35 UTC (rev 72140)
@@ -3977,163 +3977,160 @@
void IWave::pleiades1b(int iwa)
{
- /* pleiades1b Blue of pleiades1b */
- static const float sr1[209] = {
- .0016, .0013, .0043, .0111, .0176, .0234, .0574, .1346,
- .2238, .3085, .4616, .6508, .7554, .7477, .7168, .7185,
- .7567, .8101, .8422, .8234, .7752, .7527, .7802, .8199,
- .8517, .8603, .8587, .8658, .8828, .9040, .9197, .9326,
- .9502, .9758, .9950, 1.0000, .9951, .9806, .9417, .8436,
- .6711, .4633, .2889, .1671, .0902, .0505, .0315, .0238,
- .0213, .0206, .0196, .0168, .0114, .0067, .0041, .0030,
- .0024, .0020, .0016, .0011, .0013, .0008, .0006, .0004,
- .0004, .0004, .0005, .0011, .0020, .0012, .0004, .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, .0001, .0002, .0008, .0011,
- .0008, .0004, .0004, .0004, .0007, .0016, .0024, .0010,
- .0003, .0002, .0001, .0001, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0001, .0000, .0001, .0001, .0001,
- .0002, .0003, .0004, .0007, .0009, .0007, .0006, .0004,
- .0003, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
- .0003, .0004, .0004, .0005, .0007, .0010, .0016, .0026,
- .0046, .0091, .0172, .0238, .0215, .0159, .0120, .0095,
- .0079, .0072, .0072, .0076, .0084, .0099, .0123, .0163,
- .0226, .0320, .0444, .0547, .0564, .0480, .0358, .0258,
- .0189, .0144, .0117, .0099, .0086, .0078, .0072, .0070,
- .0069, .0069, .0070, .0073, .0074, .0075, .0075, .0071,
- .0064
+ /* Pleiades1b blue of pleiades1b */
+ static const float sr1[208] = {
+ .0016, .0013, .0043, .0111, .0176, .0234, .0574, .1346,
+ .2238, .3085, .4616, .6508, .7554, .7477, .7168, .7185,
+ .7567, .8101, .8422, .8234, .7752, .7527, .7802, .8199,
+ .8517, .8603, .8587, .8658, .8828, .9040, .9197, .9326,
+ .9502, .9758, .9950, 1.0000, .9951, .9806, .9417, .8436,
+ .6711, .4633, .2889, .1671, .0902, .0505, .0315, .0238,
+ .0213, .0206, .0196, .0168, .0114, .0067, .0041, .0030,
+ .0024, .0020, .0016, .0011, .0013, .0008, .0006, .0004,
+ .0004, .0004, .0005, .0011, .0020, .0012, .0004, .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, .0001, .0002, .0008, .0011,
+ .0008, .0004, .0004, .0004, .0007, .0016, .0024, .0010,
+ .0003, .0002, .0001, .0001, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0001, .0000, .0001, .0001, .0001,
+ .0002, .0003, .0004, .0007, .0009, .0007, .0006, .0004,
+ .0003, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+ .0003, .0004, .0004, .0005, .0007, .0010, .0016, .0026,
+ .0046, .0091, .0172, .0238, .0215, .0159, .0120, .0095,
+ .0079, .0072, .0072, .0076, .0084, .0099, .0123, .0163,
+ .0226, .0320, .0444, .0547, .0564, .0480, .0358, .0258,
+ .0189, .0144, .0117, .0099, .0086, .0078, .0072, .0070,
+ .0069, .0069, .0070, .0073, .0074, .0075, .0075, .0071
+
};
- /* Pleiades1b Green of pleiades1b */
- static const float sr2[209] = {
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0001, .0001, .0001, .0002, .0003, .0005, .0006, .0008,
- .0015, .0041, .0100, .0196, .0325, .0568, .1238, .2859,
- .5290, .7716, .8838, .9080, .9131, .9137, .9225, .9367,
- .9498, .9545, .9586, .9642, .9705, .9723, .9675, .9589,
- .9524, .9525, .9560, .9552, .9490, .9471, .9544, .9711,
- .9898, 1.0000, .9954, .9698, .9253, .8633, .7948, .7239,
- .6453, .5439, .4170, .2767, .1575, .0856, .0492, .0327,
- .0238, .0182, .0141, .0100, .0058, .0030, .0015, .0008,
- .0005, .0003, .0002, .0001, .0001, .0001, .0001, .0001,
- .0000, .0001, .0000, .0000, .0001, .0001, .0001, .0003,
- .0003, .0002, .0001, .0001, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0001,
- .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, .0001, .0001, .0001, .0003, .0007, .0032, .0142,
- .0083, .0022, .0009, .0006, .0004, .0004, .0004, .0004,
- .0005, .0006, .0008, .0011, .0019, .0037, .0064, .0103,
- .0131, .0133, .0111, .0084, .0066, .0057, .0054, .0056,
- .0062, .0072, .0089, .0115, .0149, .0193, .0235, .0264,
- .0270, .0255, .0234, .0214, .0199, .0193, .0191, .0197,
- .0207, .0220, .0232, .0238, .0230, .0207, .0172, .0133,
- .0098
+ /* Pleiades1b green of pleiades1b */
+ static const float sr2[192] = {
+ .0001, .0001, .0001, .0002, .0003, .0005, .0006, .0008,
+ .0015, .0041, .0100, .0196, .0325, .0568, .1238, .2859,
+ .5290, .7716, .8838, .9080, .9131, .9137, .9225, .9367,
+ .9498, .9545, .9586, .9642, .9705, .9723, .9675, .9589,
+ .9524, .9525, .9560, .9552, .9490, .9471, .9544, .9711,
+ .9898, 1.0000, .9954, .9698, .9253, .8633, .7948, .7239,
+ .6453, .5439, .4170, .2767, .1575, .0856, .0492, .0327,
+ .0238, .0182, .0141, .0100, .0058, .0030, .0015, .0008,
+ .0005, .0003, .0002, .0001, .0001, .0001, .0001, .0001,
+ .0000, .0001, .0000, .0000, .0001, .0001, .0001, .0003,
+ .0003, .0002, .0001, .0001, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0001,
+ .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, .0001, .0001, .0001, .0003, .0007, .0032, .0142,
+ .0083, .0022, .0009, .0006, .0004, .0004, .0004, .0004,
+ .0005, .0006, .0008, .0011, .0019, .0037, .0064, .0103,
+ .0131, .0133, .0111, .0084, .0066, .0057, .0054, .0056,
+ .0062, .0072, .0089, .0115, .0149, .0193, .0235, .0264,
+ .0270, .0255, .0234, .0214, .0199, .0193, .0191, .0197,
+ .0207, .0220, .0232, .0238, .0230, .0207, .0172, .0133
+
};
- /* Pleiades1b Red of pleiades1b */
- static const float sr3[209] = {
- .0005, .0009, .0005, .0012, .0051, .0080, .0067, .0109,
- .0247, .0654, .1225, .0570, .0214, .0128, .0063, .0024,
- .0009, .0005, .0004, .0004, .0005, .0008, .0010, .0006,
- .0004, .0003, .0002, .0003, .0004, .0005, .0005, .0004,
- .0003, .0002, .0001, .0001, .0001, .0001, .0001, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0001, .0001, .0001, .0001, .0001, .0002,
- .0002, .0002, .0007, .0012, .0021, .0038, .0068, .0123,
- .0222, .0413, .0781, .1519, .2777, .4510, .6291, .7625,
- .8329, .8579, .8659, .8693, .8752, .8858, .9006, .9175,
- .9349, .9478, .9570, .9623, .9648, .9624, .9613, .9620,
- .9699, .9812, .9934, 1.0000, .9810, .9523, .9132, .8694,
- .8252, .7830, .7361, .6735, .5878, .4805, .3630, .2523,
- .1626, .1022, .0641, .0419, .0285, .0205, .0154, .0121,
- .0099, .0083, .0071, .0061, .0052, .0043, .0035, .0028,
- .0036, .0030, .0023, .0018, .0013, .0010, .0008, .0006,
- .0005, .0004, .0004, .0004, .0003, .0003, .0003, .0003,
- .0003, .0003, .0003, .0003, .0004, .0004, .0005, .0006,
- .0006, .0007, .0007, .0006, .0005, .0005, .0004, .0003,
- .0003, .0003, .0002, .0002, .0002, .0002, .0002, .0002,
- .0002, .0002, .0002, .0003, .0003, .0003, .0003, .0004,
- .0005, .0006, .0008, .0010, .0013, .0018, .0024, .0033,
- .0044, .0057, .0069, .0078, .0083, .0084, .0082, .0081,
- .0080, .0078, .0078, .0080, .0082, .0085, .0088, .0093,
- .0098, .0101, .0104, .0104, .0102, .0095, .0086, .0073,
- .0060
+ /* Pleiades1b red of pleiades1b */
+ static const float sr3[208] = {
+ .0005, .0009, .0005, .0012, .0051, .0080, .0067, .0109,
+ .0247, .0654, .1225, .0570, .0214, .0128, .0063, .0024,
+ .0009, .0005, .0004, .0004, .0005, .0008, .0010, .0006,
+ .0004, .0003, .0002, .0003, .0004, .0005, .0005, .0004,
+ .0003, .0002, .0001, .0001, .0001, .0001, .0001, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+ .0000, .0000, .0001, .0001, .0001, .0001, .0001, .0002,
+ .0002, .0002, .0007, .0012, .0021, .0038, .0068, .0123,
+ .0222, .0413, .0781, .1519, .2777, .4510, .6291, .7625,
+ .8329, .8579, .8659, .8693, .8752, .8858, .9006, .9175,
+ .9349, .9478, .9570, .9623, .9648, .9624, .9613, .9620,
+ .9699, .9812, .9934, 1.0000, .9810, .9523, .9132, .8694,
+ .8252, .7830, .7361, .6735, .5878, .4805, .3630, .2523,
+ .1626, .1022, .0641, .0419, .0285, .0205, .0154, .0121,
+ .0099, .0083, .0071, .0061, .0052, .0043, .0035, .0028,
+ .0036, .0030, .0023, .0018, .0013, .0010, .0008, .0006,
+ .0005, .0004, .0004, .0004, .0003, .0003, .0003, .0003,
+ .0003, .0003, .0003, .0003, .0004, .0004, .0005, .0006,
+ .0006, .0007, .0007, .0006, .0005, .0005, .0004, .0003,
+ .0003, .0003, .0002, .0002, .0002, .0002, .0002, .0002,
+ .0002, .0002, .0002, .0003, .0003, .0003, .0003, .0004,
+ .0005, .0006, .0008, .0010, .0013, .0018, .0024, .0033,
+ .0044, .0057, .0069, .0078, .0083, .0084, .0082, .0081,
+ .0080, .0078, .0078, .0080, .0082, .0085, .0088, .0093,
+ .0098, .0101, .0104, .0104, .0102, .0095, .0086, .0073
+
};
- /* pleiades1b NIR of pleiades1b */
- static const float sr4[209] = {
- .0002, .0008, .0004, .0005, .0017, .0027, .0012, .0007,
- .0007, .0008, .0008, .0010, .0015, .0022, .0020, .0010,
- .0005, .0003, .0002, .0002, .0002, .0003, .0004, .0006,
- .0006, .0004, .0003, .0002, .0002, .0002, .0002, .0002,
- .0004, .0006, .0007, .0006, .0005, .0004, .0004, .0004,
- .0004, .0005, .0006, .0006, .0007, .0008, .0008, .0007,
- .0006, .0006, .0005, .0005, .0005, .0006, .0007, .0012,
- .0023, .0029, .0020, .0008, .0004, .0002, .0001, .0001,
- .0001, .0001, .0001, .0001, .0002, .0003, .0005, .0008,
- .0007, .0003, .0002, .0001, .0001, .0001, .0000, .0000,
- .0000, .0000, .0000, .0000, .0001, .0001, .0001, .0001,
- .0001, .0002, .0002, .0002, .0002, .0001, .0001, .0001,
- .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
- .0001, .0001, .0001, .0001, .0002, .0002, .0003, .0003,
- .0004, .0005, .0006, .0008, .0010, .0012, .0014, .0016,
- .0018, .0020, .0023, .0025, .0029, .0052, .0064, .0080,
- .0101, .0131, .0171, .0229, .0310, .0427, .0592, .0835,
- .1179, .1664, .2311, .3159, .4172, .5285, .6410, .7472,
- .8386, .9088, .9594, .9881, 1.0000, .9992, .9896, .9677,
- .9514, .9375, .9255, .9152, .9088, .9026, .8967, .8925,
- .8855, .8777, .8676, .8569, .8474, .8360, .8237, .8130,
- .8016, .7922, .7828, .7769, .7715, .7631, .7543, .7452,
- .7349, .7255, .7146, .7031, .6919, .6816, .6705, .6595,
- .6476, .6292, .6111, .5934, .5761, .5600, .5449, .5306,
- .5155, .4977, .4734, .4388, .3934, .3368, .2743, .2114,
- .1536, .1063, .0704, .0459, .0295, .0193, .0127, .0085,
- .0058
+ /* Pleiades1b nir of pleiades1b */
+ static const float sr4[208] = {
+ .0002, .0008, .0004, .0005, .0017, .0027, .0012, .0007,
+ .0007, .0008, .0008, .0010, .0015, .0022, .0020, .0010,
+ .0005, .0003, .0002, .0002, .0002, .0003, .0004, .0006,
+ .0006, .0004, .0003, .0002, .0002, .0002, .0002, .0002,
+ .0004, .0006, .0007, .0006, .0005, .0004, .0004, .0004,
+ .0004, .0005, .0006, .0006, .0007, .0008, .0008, .0007,
+ .0006, .0006, .0005, .0005, .0005, .0006, .0007, .0012,
+ .0023, .0029, .0020, .0008, .0004, .0002, .0001, .0001,
+ .0001, .0001, .0001, .0001, .0002, .0003, .0005, .0008,
+ .0007, .0003, .0002, .0001, .0001, .0001, .0000, .0000,
+ .0000, .0000, .0000, .0000, .0001, .0001, .0001, .0001,
+ .0001, .0002, .0002, .0002, .0002, .0001, .0001, .0001,
+ .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+ .0001, .0001, .0001, .0001, .0002, .0002, .0003, .0003,
+ .0004, .0005, .0006, .0008, .0010, .0012, .0014, .0016,
+ .0018, .0020, .0023, .0025, .0029, .0052, .0064, .0080,
+ .0101, .0131, .0171, .0229, .0310, .0427, .0592, .0835,
+ .1179, .1664, .2311, .3159, .4172, .5285, .6410, .7472,
+ .8386, .9088, .9594, .9881, 1.0000, .9992, .9896, .9677,
+ .9514, .9375, .9255, .9152, .9088, .9026, .8967, .8925,
+ .8855, .8777, .8676, .8569, .8474, .8360, .8237, .8130,
+ .8016, .7922, .7828, .7769, .7715, .7631, .7543, .7452,
+ .7349, .7255, .7146, .7031, .6919, .6816, .6705, .6595,
+ .6476, .6292, .6111, .5934, .5761, .5600, .5449, .5306,
+ .5155, .4977, .4734, .4388, .3934, .3368, .2743, .2114,
+ .1536, .1063, .0704, .0459, .0295, .0193, .0127, .0085
+
};
- /* Pleiades1b Pan of pleiades1b */
- static const float sr5[209] = {
- .0000, .0000, .0000, .0000, .0001, .0001, .0001, .0002,
- .0004, .0008, .0028, .0056, .0120, .0221, .0389, .0664,
- .1067, .1614, .2272, .2987, .3678, .4258, .4697, .4992,
- .5193, .5333, .5467, .5603, .5736, .5855, .5957, .6041,
- .6120, .6188, .6256, .6319, .6378, .6422, .6444, .6449,
- .6449, .6451, .6468, .6513, .6591, .6691, .6812, .6937,
- .7056, .7158, .7251, .7324, .7384, .7439, .7493, .7536,
- .7581, .7611, .7639, .7652, .7662, .7666, .7675, .7688,
- .7723, .7771, .7834, .7917, .8015, .8110, .8200, .8291,
- .8365, .8427, .8482, .8519, .8555, .8583, .8620, .8667,
- .8716, .8780, .8847, .8913, .8989, .9046, .9105, .9155,
- .9208, .9253, .9290, .9329, .9370, .9401, .9442, .9469,
- .9503, .9521, .9543, .9574, .9608, .9663, .9721, .9788,
- .9846, .9912, .9957, .9991, 1.0000, .9963, .9915, .9870,
- .9817, .9771, .9746, .9729, .9739, .9742, .9769, .9798,
- .9828, .9846, .9851, .9837, .9826, .9790, .9746, .9697,
- .9648, .9598, .9533, .9484, .9445, .9397, .9345, .9297,
- .9248, .9183, .9112, .9061, .9006, .8953, .8908, .8895,
- .8885, .8810, .8708, .8567, .8369, .8102, .7729, .7190,
- .6529, .5711, .4796, .3846, .2948, .2166, .1531, .1057,
- .0717, .0491, .0338, .0257, .0182, .0132, .0122, .0090,
- .0084, .0043, .0033, .0027, .0022, .0018, .0015, .0014,
- .0012, .0011, .0010, .0009, .0009, .0008, .0007, .0007,
- .0007, .0006, .0006, .0006, .0006, .0006, .0005, .0005,
- .0005, .0005, .0004, .0004, .0004, .0005, .0004, .0004,
- .0004, .0004, .0004, .0004, .0003, .0004, .0003, .0003,
- .0003
+ /* Pleiades1b pan of pleiades1b */
+ static const float sr5[203] = {
+ .0001, .0001, .0002, .0004, .0008, .0028, .0056, .0120,
+ .0221, .0389, .0664, .1067, .1614, .2272, .2987, .3678,
+ .4258, .4697, .4992, .5193, .5333, .5467, .5603, .5736,
+ .5855, .5957, .6041, .6120, .6188, .6256, .6319, .6378,
+ .6422, .6444, .6449, .6449, .6451, .6468, .6513, .6591,
+ .6691, .6812, .6937, .7056, .7158, .7251, .7324, .7384,
+ .7439, .7493, .7536, .7581, .7611, .7639, .7652, .7662,
+ .7666, .7675, .7688, .7723, .7771, .7834, .7917, .8015,
+ .8110, .8200, .8291, .8365, .8427, .8482, .8519, .8555,
+ .8583, .8620, .8667, .8716, .8780, .8847, .8913, .8989,
+ .9046, .9105, .9155, .9208, .9253, .9290, .9329, .9370,
+ .9401, .9442, .9469, .9503, .9521, .9543, .9574, .9608,
+ .9663, .9721, .9788, .9846, .9912, .9957, .9991, 1.0000,
+ .9963, .9915, .9870, .9817, .9771, .9746, .9729, .9739,
+ .9742, .9769, .9798, .9828, .9846, .9851, .9837, .9826,
+ .9790, .9746, .9697, .9648, .9598, .9533, .9484, .9445,
+ .9397, .9345, .9297, .9248, .9183, .9112, .9061, .9006,
+ .8953, .8908, .8895, .8885, .8810, .8708, .8567, .8369,
+ .8102, .7729, .7190, .6529, .5711, .4796, .3846, .2948,
+ .2166, .1531, .1057, .0717, .0491, .0338, .0257, .0182,
+ .0132, .0122, .0090, .0084, .0043, .0033, .0027, .0022,
+ .0018, .0015, .0014, .0012, .0011, .0010, .0009, .0009,
+ .0008, .0007, .0007, .0007, .0006, .0006, .0006, .0006,
+ .0006, .0005, .0005, .0005, .0005, .0004, .0004, .0004,
+ .0005, .0004, .0004, .0004, .0004, .0004, .0004, .0003,
+ .0004, .0003, .0003
};
- static const float wli[5] = {0.430, 0.430, 0.430, 0.430, 0.430};
- static const float wls[5] = {0.950, 0.950, 0.950, 0.950, 0.950};
+ static const float wli[5] = {0.4300, 0.4700, 0.4300, 0.4300, 0.4425};
+ static const float wls[5] = {0.9500, 0.9500, 0.9500, 0.9500, 0.9500};
ffu.wlinf = (float)wli[iwa-1];
ffu.wlsup = (float)wls[iwa-1];
@@ -4143,15 +4140,15 @@
switch(iwa)
{
- case 1: for(i = 0; i < 209; i++) ffu.s[72+i] = sr1[i];
+ case 1: for(i = 0; i < 208; i++) ffu.s[72+i] = sr1[i];
break;
- case 2: for(i = 0; i < 209; i++) ffu.s[72+i] = sr2[i];
+ case 2: for(i = 0; i < 192; i++) ffu.s[88+i] = sr2[i];
break;
- case 3: for(i = 0; i < 209; i++) ffu.s[72+i] = sr3[i];
+ case 3: for(i = 0; i < 208; i++) ffu.s[72+i] = sr3[i];
break;
- case 4: for(i = 0; i < 209; i++) ffu.s[72+i] = sr4[i];
+ case 4: for(i = 0; i < 208; i++) ffu.s[72+i] = sr4[i];
break;
- case 5: for(i = 0; i < 209; i++) ffu.s[72+i] = sr5[i];
+ case 5: for(i = 0; i < 203; i++) ffu.s[77+i] = sr5[i];
break;
}
}
More information about the grass-commit
mailing list