[GRASS-SVN] r72144 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 25 13:02:31 PST 2018
Author: mmetz
Date: 2018-01-25 13:02:31 -0800 (Thu, 25 Jan 2018)
New Revision: 72144
Modified:
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update Spot7
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 20:59:45 UTC (rev 72143)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2018-01-25 21:02:31 UTC (rev 72144)
@@ -668,11 +668,11 @@
<tr><td>132</td><td>Spot6 NIR band (738nm - 897nm)</td></tr>
<tr><td>133</td><td>Spot6 Pan band (438nm - 760nm)</td></tr>
-<tr><td>134</td><td><b>Spot7</b> Blue band (455nm - 525nm)</td></tr>
-<tr><td>135</td><td>Spot7 Green band (530nm - 527nm)</td></tr>
-<tr><td>136</td><td>Spot7 Red band (625nm - 695nm)</td></tr>
-<tr><td>137</td><td>Spot7 NIR band (760nm - 890nm)</td></tr>
-<tr><td>138</td><td>Spot7 Pan band (455nm - 745nm)</td></tr>
+<tr><td>134</td><td><b>Spot7</b> Blue band (445nm - 532nm)</td></tr>
+<tr><td>135</td><td>Spot7 Green band (525nm - 607nm)</td></tr>
+<tr><td>136</td><td>Spot7 Red band (610nm - 727nm)</td></tr>
+<tr><td>137</td><td>Spot7 NIR band (745nm - 902nm)</td></tr>
+<tr><td>138</td><td>Spot7 Pan band (443nm - 760nm)</td></tr>
<tr><td>139</td><td><b>Pleiades1A</b> Blue band (433nm - 560nm)</td></tr>
<tr><td>140</td><td>Pleiades1A Green band (500nm - 617nm)</td></tr>
Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 20:59:45 UTC (rev 72143)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp 2018-01-25 21:02:31 UTC (rev 72144)
@@ -3537,183 +3537,168 @@
void IWave::spot7(int iwa)
{
- /* spot7 Blue of spot7 */
- static const float sr1[241] = {
- .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
- .0001, .0001, .0001, .0001, .0001, .0002, .0004, .0007,
- .0014, .0036, .0145, .0771, .2058, .3851, .5883, .7118,
- .7732, .8001, .8134, .8290, .8540, .8798, .8934, .9007,
- .9104, .9133, .9290, .9436, .9534, .9595, .9525, .9394,
- .9498, .9599, .9648, .9754, .9792, .9920, 1.0000, .9602,
- .8198, .6370, .4136, .1930, .0761, .0275, .0075, .0037,
- .0029, .0021, .0007, .0003, .0002, .0002, .0002, .0002,
- .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
- .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
- .0003, .0003, .0003, .0003, .0003, .0003, .0002, .0002,
- .0002, .0002, .0003, .0003, .0003, .0003, .0003, .0003,
- .0002, .0002, .0002, .0002, .0003, .0003, .0003, .0005,
- .0007, .0013, .0010, .0004, .0003, .0015, .0014, .0046,
- .0036, .0034, .0002, .0011, .0031, .0034, .0041, .0024,
- .0014, .0004, .0004, .0005, .0003, .0004, .0002, .0002,
- .0003, .0002, .0002, .0002, .0002, .0001, .0002, .0001,
- .0002, .0001, .0002, .0002, .0002, .0001, .0002, .0002,
- .0003, .0004, .0003, .0003, .0001, .0002, .0001, .0001,
- .0001, .0002, .0001, .0001, .0000, .0001, .0000, .0001,
- .0000, .0001, .0002, .0002, .0001, .0002, .0002, .0002,
- .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
- .0001, .0001, .0001, .0002, .0002, .0003, .0004, .0004,
- .0005, .0005, .0005, .0005, .0005, .0005, .0005, .0005,
- .0005, .0004, .0004, .0005, .0006, .0006, .0008, .0015,
- .0021, .0020, .0022, .0019, .0018, .0014, .0013, .0011,
- .0009, .0008, .0008, .0007, .0008, .0009, .0011, .0012,
- .0012, .0022, .0021, .0027, .0028, .0021, .0021, .0009,
- .0008, .0003, .0002, .0001, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000
+ /* spot7 blue of spot7 */
+ static const float sr1[229] = {
+ .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+ .0001, .0001, .0001, .0001, .0001, .0002, .0004, .0007,
+ .0014, .0036, .0145, .0771, .2058, .3851, .5883, .7118,
+ .7732, .8001, .8134, .8290, .8540, .8798, .8934, .9007,
+ .9104, .9133, .9290, .9436, .9534, .9595, .9525, .9394,
+ .9498, .9599, .9648, .9754, .9792, .9920, 1.0000, .9602,
+ .8198, .6370, .4136, .1930, .0761, .0275, .0075, .0037,
+ .0029, .0021, .0007, .0003, .0002, .0002, .0002, .0002,
+ .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0003, .0003, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0003, .0003, .0003, .0003, .0003, .0003, .0002, .0002,
+ .0002, .0002, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0002, .0002, .0002, .0002, .0003, .0003, .0003, .0005,
+ .0007, .0013, .0010, .0004, .0003, .0015, .0014, .0046,
+ .0036, .0034, .0002, .0011, .0031, .0034, .0041, .0024,
+ .0014, .0004, .0004, .0005, .0003, .0004, .0002, .0002,
+ .0003, .0002, .0002, .0002, .0002, .0001, .0002, .0001,
+ .0002, .0001, .0002, .0002, .0002, .0001, .0002, .0002,
+ .0003, .0004, .0003, .0003, .0001, .0002, .0001, .0001,
+ .0001, .0002, .0001, .0001, .0000, .0001, .0000, .0001,
+ .0000, .0001, .0002, .0002, .0001, .0002, .0002, .0002,
+ .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+ .0001, .0001, .0001, .0002, .0002, .0003, .0004, .0004,
+ .0005, .0005, .0005, .0005, .0005, .0005, .0005, .0005,
+ .0005, .0004, .0004, .0005, .0006, .0006, .0008, .0015,
+ .0021, .0020, .0022, .0019, .0018, .0014, .0013, .0011,
+ .0009, .0008, .0008, .0007, .0008, .0009, .0011, .0012,
+ .0012, .0022, .0021, .0027, .0028, .0021, .0021, .0009,
+ .0008, .0003, .0002, .0001, .0000
};
- /* spot7 Green of spot7 */
- static const float sr2[241] = {
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .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, .0004, .0007,
- .0019, .0051, .0154, .0747, .2220, .4198, .6371, .7791,
- .8264, .8142, .8193, .8678, .9098, .9331, .9473, .9534,
- .9543, .9588, .9665, .9740, .9853, .9949, .9985, .9979,
- .9994, .9992, .9761, .9071, .8632, .7668, .6158, .5032,
- .3340, .1427, .0470, .0192, .0085, .0037, .0014, .0007,
- .0004, .0002, .0001, .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, .0001, .0001, .0003,
- .0004, .0003, .0001, .0001, .0002, .0001, .0002, .0002,
- .0002, .0000, .0000, .0000, .0000, .0001, .0001, .0001,
- .0002, .0002, .0002, .0003, .0003, .0002, .0002, .0001,
- .0001, .0001, .0001, .0001, .0001, .0000, .0000, .0000,
- .0000, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
- .0001, .0001, .0002, .0003, .0004, .0006, .0008, .0008,
- .0008, .0007, .0006, .0003, .0003, .0003, .0003, .0003,
- .0003, .0002, .0001, .0001, .0001, .0002, .0003, .0004,
- .0005, .0005, .0005, .0006, .0004, .0004, .0002, .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
+ /* spot7 green of spot7 */
+ static const float sr2[180] = {
+ .0001, .0001, .0002, .0004, .0007, .0019, .0051, .0154,
+ .0747, .2220, .4198, .6371, .7791, .8264, .8142, .8193,
+ .8678, .9098, .9331, .9473, .9534, .9543, .9588, .9665,
+ .9740, .9853, .9949, .9985, .9979, .9994, .9992, .9761,
+ .9071, .8632, .7668, .6158, .5032, .3340, .1427, .0470,
+ .0192, .0085, .0037, .0014, .0007, .0004, .0002, .0001,
+ .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, .0001, .0001, .0003, .0004, .0003, .0001,
+ .0001, .0002, .0001, .0002, .0002, .0002, .0000, .0000,
+ .0000, .0000, .0001, .0001, .0001, .0002, .0002, .0002,
+ .0003, .0003, .0002, .0002, .0001, .0001, .0001, .0001,
+ .0001, .0001, .0000, .0000, .0000, .0000, .0001, .0001,
+ .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0002,
+ .0003, .0004, .0006, .0008, .0008, .0008, .0007, .0006,
+ .0003, .0003, .0003, .0003, .0003, .0003, .0002, .0001,
+ .0001, .0001, .0002, .0003, .0004, .0005, .0005, .0005,
+ .0006, .0004, .0004, .0002, .0002, .0002, .0001, .0001,
+ .0001, .0001, .0001, .0001
};
- /* spot7 Red of spot7 */
- static const float sr3[241] = {
- .0001, .0001, .0001, .0002, .0002, .0002, .0006, .0033,
- .0059, .0064, .0040, .0009, .0013, .0016, .0013, .0009,
- .0011, .0013, .0012, .0012, .0012, .0013, .0015, .0010,
- .0008, .0011, .0013, .0012, .0012, .0008, .0008, .0009,
- .0010, .0009, .0008, .0007, .0006, .0007, .0007, .0008,
- .0009, .0008, .0008, .0008, .0008, .0009, .0009, .0009,
- .0009, .0008, .0008, .0008, .0008, .0009, .0011, .0011,
- .0011, .0009, .0008, .0007, .0008, .0008, .0008, .0010,
- .0011, .0013, .0011, .0010, .0008, .0007, .0008, .0008,
- .0008, .0009, .0014, .0024, .0029, .0031, .0026, .0019,
- .0019, .0027, .0045, .0078, .0140, .0292, .0802, .1791,
- .2523, .3239, .3762, .3703, .3855, .4631, .5767, .6899,
- .7903, .8963, .9694, .9814, .9837, .9964, .9995, .9920,
- .9851, .9778, .9612, .9341, .9075, .8951, .9035, .9239,
- .9382, .9348, .9219, .9104, .9044, .8952, .8624, .7922,
- .6672, .5121, .3598, .2257, .1290, .0793, .0577, .0468,
- .0390, .0318, .0232, .0138, .0070, .0040, .0028, .0025,
- .0026, .0028, .0027, .0027, .0024, .0019, .0015, .0016,
- .0019, .0017, .0019, .0018, .0013, .0009, .0008, .0008,
- .0008, .0008, .0008, .0010, .0007, .0010, .0011, .0015,
- .0014, .0016, .0016, .0015, .0014, .0012, .0011, .0008,
- .0009, .0008, .0007, .0007, .0005, .0006, .0005, .0005,
- .0007, .0006, .0005, .0004, .0005, .0011, .0016, .0017,
- .0016, .0019, .0018, .0013, .0013, .0006, .0003, .0003,
- .0002, .0004, .0004, .0004, .0003, .0004, .0006, .0008,
- .0010, .0012, .0013, .0013, .0015, .0015, .0014, .0011,
- .0011, .0017, .0026, .0033, .0026, .0032, .0044, .0040,
- .0028, .0021, .0010, .0009, .0006, .0006, .0004, .0004,
- .0003, .0003, .0003, .0002, .0002, .0002, .0002, .0001,
- .0002, .0001, .0001, .0001, .0001, .0001, .0001, .0000,
- .0001
+ /* spot7 red of spot7 */
+ static const float sr3[235] = {
+ .0001, .0001, .0001, .0002, .0002, .0002, .0006, .0033,
+ .0059, .0064, .0040, .0009, .0013, .0016, .0013, .0009,
+ .0011, .0013, .0012, .0012, .0012, .0013, .0015, .0010,
+ .0008, .0011, .0013, .0012, .0012, .0008, .0008, .0009,
+ .0010, .0009, .0008, .0007, .0006, .0007, .0007, .0008,
+ .0009, .0008, .0008, .0008, .0008, .0009, .0009, .0009,
+ .0009, .0008, .0008, .0008, .0008, .0009, .0011, .0011,
+ .0011, .0009, .0008, .0007, .0008, .0008, .0008, .0010,
+ .0011, .0013, .0011, .0010, .0008, .0007, .0008, .0008,
+ .0008, .0009, .0014, .0024, .0029, .0031, .0026, .0019,
+ .0019, .0027, .0045, .0078, .0140, .0292, .0802, .1791,
+ .2523, .3239, .3762, .3703, .3855, .4631, .5767, .6899,
+ .7903, .8963, .9694, .9814, .9837, .9964, .9995, .9920,
+ .9851, .9778, .9612, .9341, .9075, .8951, .9035, .9239,
+ .9382, .9348, .9219, .9104, .9044, .8952, .8624, .7922,
+ .6672, .5121, .3598, .2257, .1290, .0793, .0577, .0468,
+ .0390, .0318, .0232, .0138, .0070, .0040, .0028, .0025,
+ .0026, .0028, .0027, .0027, .0024, .0019, .0015, .0016,
+ .0019, .0017, .0019, .0018, .0013, .0009, .0008, .0008,
+ .0008, .0008, .0008, .0010, .0007, .0010, .0011, .0015,
+ .0014, .0016, .0016, .0015, .0014, .0012, .0011, .0008,
+ .0009, .0008, .0007, .0007, .0005, .0006, .0005, .0005,
+ .0007, .0006, .0005, .0004, .0005, .0011, .0016, .0017,
+ .0016, .0019, .0018, .0013, .0013, .0006, .0003, .0003,
+ .0002, .0004, .0004, .0004, .0003, .0004, .0006, .0008,
+ .0010, .0012, .0013, .0013, .0015, .0015, .0014, .0011,
+ .0011, .0017, .0026, .0033, .0026, .0032, .0044, .0040,
+ .0028, .0021, .0010, .0009, .0006, .0006, .0004, .0004,
+ .0003, .0003, .0003, .0002, .0002, .0002, .0002, .0001,
+ .0002, .0001, .0001
};
- /* spot7 NIR of spot7 */
- static const float sr4[241] = {
- .0000, .0000, .0000, .0001, .0003, .0004, .0005, .0005,
- .0004, .0004, .0003, .0003, .0004, .0005, .0008, .0009,
- .0009, .0008, .0006, .0007, .0010, .0013, .0019, .0021,
- .0022, .0018, .0013, .0010, .0008, .0005, .0003, .0003,
- .0002, .0001, .0001, .0001, .0001, .0002, .0002, .0002,
- .0002, .0002, .0003, .0003, .0003, .0003, .0001, .0004,
- .0007, .0010, .0010, .0006, .0003, .0005, .0008, .0010,
- .0011, .0008, .0006, .0007, .0010, .0013, .0013, .0010,
- .0006, .0004, .0002, .0002, .0002, .0003, .0003, .0003,
- .0003, .0002, .0002, .0003, .0005, .0007, .0009, .0009,
- .0010, .0007, .0004, .0002, .0001, .0002, .0001, .0001,
- .0002, .0001, .0001, .0001, .0002, .0001, .0001, .0002,
- .0002, .0001, .0001, .0002, .0002, .0002, .0002, .0002,
- .0002, .0002, .0002, .0001, .0002, .0001, .0001, .0002,
- .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0001,
- .0001, .0001, .0001, .0002, .0002, .0002, .0002, .0003,
- .0003, .0004, .0005, .0006, .0007, .0010, .0015, .0024,
- .0039, .0065, .0113, .0202, .0353, .0606, .1026, .1796,
- .3276, .4949, .6522, .7976, .9149, .9645, .9593, .9472,
- .9500, .9614, .9741, .9798, .9945, .9989, .9942, .9787,
- .9669, .9546, .9411, .9290, .9171, .9071, .8970, .8867,
- .8749, .8603, .8429, .8247, .8050, .7864, .7700, .7573,
- .7482, .7402, .7312, .7216, .7074, .6893, .6667, .6404,
- .6118, .5830, .5529, .5224, .4938, .4658, .4379, .4077,
- .3707, .3252, .2748, .2212, .1662, .1137, .0696, .0391,
- .0211, .0120, .0073, .0049, .0035, .0029, .0024, .0021,
- .0018, .0016, .0014, .0012, .0010, .0007, .0005, .0004,
- .0003, .0002, .0001, .0001, .0001, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
- .0000
+ /* spot7 nir of spot7 */
+ static const float sr4[219] = {
+ .0000, .0000, .0001, .0003, .0004, .0005, .0005, .0004,
+ .0004, .0003, .0003, .0004, .0005, .0008, .0009, .0009,
+ .0008, .0006, .0007, .0010, .0013, .0019, .0021, .0022,
+ .0018, .0013, .0010, .0008, .0005, .0003, .0003, .0002,
+ .0001, .0001, .0001, .0001, .0002, .0002, .0002, .0002,
+ .0002, .0003, .0003, .0003, .0003, .0001, .0004, .0007,
+ .0010, .0010, .0006, .0003, .0005, .0008, .0010, .0011,
+ .0008, .0006, .0007, .0010, .0013, .0013, .0010, .0006,
+ .0004, .0002, .0002, .0002, .0003, .0003, .0003, .0003,
+ .0002, .0002, .0003, .0005, .0007, .0009, .0009, .0010,
+ .0007, .0004, .0002, .0001, .0002, .0001, .0001, .0002,
+ .0001, .0001, .0001, .0002, .0001, .0001, .0002, .0002,
+ .0001, .0001, .0002, .0002, .0002, .0002, .0002, .0002,
+ .0002, .0002, .0001, .0002, .0001, .0001, .0002, .0002,
+ .0002, .0002, .0002, .0002, .0002, .0002, .0001, .0001,
+ .0001, .0001, .0002, .0002, .0002, .0002, .0003, .0003,
+ .0004, .0005, .0006, .0007, .0010, .0015, .0024, .0039,
+ .0065, .0113, .0202, .0353, .0606, .1026, .1796, .3276,
+ .4949, .6522, .7976, .9149, .9645, .9593, .9472, .9500,
+ .9614, .9741, .9798, .9945, .9989, .9942, .9787, .9669,
+ .9546, .9411, .9290, .9171, .9071, .8970, .8867, .8749,
+ .8603, .8429, .8247, .8050, .7864, .7700, .7573, .7482,
+ .7402, .7312, .7216, .7074, .6893, .6667, .6404, .6118,
+ .5830, .5529, .5224, .4938, .4658, .4379, .4077, .3707,
+ .3252, .2748, .2212, .1662, .1137, .0696, .0391, .0211,
+ .0120, .0073, .0049, .0035, .0029, .0024, .0021, .0018,
+ .0016, .0014, .0012, .0010, .0007, .0005, .0004, .0003,
+ .0002, .0001, .0001
};
- /* spot7 Pan of spot7 */
- static const float sr5[241] = {
- .0001, .0001, .0001, .0001, .0001, .0001, .0000, .0001,
- .0001, .0001, .0001, .0002, .0003, .0004, .0008, .0026,
- .0089, .0293, .0911, .2322, .4161, .5766, .6555, .6834,
- .7001, .7313, .7615, .7761, .7760, .7811, .7970, .8226,
- .8557, .8692, .8794, .8849, .8867, .8913, .8908, .8982,
- .9110, .9220, .9366, .9446, .9460, .9504, .9514, .9529,
- .9519, .9403, .9273, .9205, .9230, .9388, .9551, .9536,
- .9457, .9484, .9614, .9764, .9866, .9868, .9811, .9784,
- .9806, .9841, .9873, .9898, .9901, .9918, .9963, .9997,
- .9971, .9877, .9793, .9768, .9791, .9821, .9814, .9755,
- .9703, .9717, .9777, .9819, .9814, .9786, .9764, .9741,
- .9742, .9739, .9734, .9716, .9677, .9634, .9616, .9617,
- .9620, .9614, .9587, .9529, .9441, .9352, .9302, .9315,
- .9357, .9386, .9379, .9331, .9277, .9235, .9198, .9155,
- .9093, .8992, .8850, .8686, .8561, .8524, .8583, .8648,
- .8692, .8681, .8631, .8572, .8521, .8469, .8403, .8349,
- .8280, .8152, .7916, .7543, .7074, .6639, .6386, .6187,
- .5794, .5198, .4311, .3047, .1803, .1007, .0572, .0331,
- .0176, .0090, .0044, .0026, .0017, .0013, .0011, .0009,
- .0009, .0008, .0008, .0010, .0007, .0010, .0011, .0011,
- .0007, .0008, .0009, .0009, .0008, .0009, .0008, .0008,
- .0008, .0008, .0009, .0010, .0012, .0008, .0007, .0009,
- .0010, .0007, .0007, .0006, .0006, .0006, .0004, .0004,
- .0008, .0005, .0006, .0004, .0007, .0006, .0005, .0004,
- .0003, .0004, .0005, .0004, .0004, .0004, .0004, .0004,
- .0004, .0004, .0004, .0004, .0003, .0003, .0003, .0003,
- .0003, .0003, .0002, .0004, .0003, .0003, .0002, .0002,
- .0004, .0003, .0003, .0002, .0003, .0002, .0002, .0002,
- .0002, .0002, .0001, .0002, .0001, .0002, .0002, .0002,
- .0001, .0001, .0002, .0001, .0000, .0001, .0001, .0001,
- .0000
+ /* spot7 pan of spot7 */
+ static const float sr5[235] = {
+ .0001, .0001, .0001, .0001, .0000, .0001, .0001, .0001,
+ .0001, .0002, .0003, .0004, .0008, .0026, .0089, .0293,
+ .0911, .2322, .4161, .5766, .6555, .6834, .7001, .7313,
+ .7615, .7761, .7760, .7811, .7970, .8226, .8557, .8692,
+ .8794, .8849, .8867, .8913, .8908, .8982, .9110, .9220,
+ .9366, .9446, .9460, .9504, .9514, .9529, .9519, .9403,
+ .9273, .9205, .9230, .9388, .9551, .9536, .9457, .9484,
+ .9614, .9764, .9866, .9868, .9811, .9784, .9806, .9841,
+ .9873, .9898, .9901, .9918, .9963, .9997, .9971, .9877,
+ .9793, .9768, .9791, .9821, .9814, .9755, .9703, .9717,
+ .9777, .9819, .9814, .9786, .9764, .9741, .9742, .9739,
+ .9734, .9716, .9677, .9634, .9616, .9617, .9620, .9614,
+ .9587, .9529, .9441, .9352, .9302, .9315, .9357, .9386,
+ .9379, .9331, .9277, .9235, .9198, .9155, .9093, .8992,
+ .8850, .8686, .8561, .8524, .8583, .8648, .8692, .8681,
+ .8631, .8572, .8521, .8469, .8403, .8349, .8280, .8152,
+ .7916, .7543, .7074, .6639, .6386, .6187, .5794, .5198,
+ .4311, .3047, .1803, .1007, .0572, .0331, .0176, .0090,
+ .0044, .0026, .0017, .0013, .0011, .0009, .0009, .0008,
+ .0008, .0010, .0007, .0010, .0011, .0011, .0007, .0008,
+ .0009, .0009, .0008, .0009, .0008, .0008, .0008, .0008,
+ .0009, .0010, .0012, .0008, .0007, .0009, .0010, .0007,
+ .0007, .0006, .0006, .0006, .0004, .0004, .0008, .0005,
+ .0006, .0004, .0007, .0006, .0005, .0004, .0003, .0004,
+ .0005, .0004, .0004, .0004, .0004, .0004, .0004, .0004,
+ .0004, .0004, .0003, .0003, .0003, .0003, .0003, .0003,
+ .0002, .0004, .0003, .0003, .0002, .0002, .0004, .0003,
+ .0003, .0002, .0003, .0002, .0002, .0002, .0002, .0002,
+ .0001, .0002, .0001, .0002, .0002, .0002, .0001, .0001,
+ .0002, .0001, .0000
};
- static const float wli[5] = {0.400, 0.400, 0.400, 0.400, 0.400};
- static const float wls[5] = {1.000, 1.000, 1.000, 1.000, 1.000};
+ static const float wli[5] = {0.4000, 0.5075, 0.4000, 0.4025, 0.4050};
+ static const float wls[5] = {0.9725, 0.9575, 0.9875, 0.9500, 0.9925};
ffu.wlinf = (float)wli[iwa-1];
ffu.wlsup = (float)wls[iwa-1];
@@ -3723,15 +3708,15 @@
switch(iwa)
{
- case 1: for(i = 0; i < 241; i++) ffu.s[60+i] = sr1[i];
+ case 1: for(i = 0; i < 229; i++) ffu.s[60+i] = sr1[i];
break;
- case 2: for(i = 0; i < 241; i++) ffu.s[60+i] = sr2[i];
+ case 2: for(i = 0; i < 180; i++) ffu.s[102+i] = sr2[i];
break;
- case 3: for(i = 0; i < 241; i++) ffu.s[60+i] = sr3[i];
+ case 3: for(i = 0; i < 235; i++) ffu.s[60+i] = sr3[i];
break;
- case 4: for(i = 0; i < 241; i++) ffu.s[60+i] = sr4[i];
+ case 4: for(i = 0; i < 219; i++) ffu.s[61+i] = sr4[i];
break;
- case 5: for(i = 0; i < 241; i++) ffu.s[60+i] = sr5[i];
+ case 5: for(i = 0; i < 235; i++) ffu.s[62+i] = sr5[i];
break;
}
}
More information about the grass-commit
mailing list