Recalculated IKONOS filters according to corrected create_iwave.py function, present revision.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@44936 15284696-431f-4ddb-bdfa-cd5b030d7da7

imagery/i.atcorr/Iwave.cpp

@@ -2049,123 +2049,123 @@ void IWave::avnir(int iwa)
 void IWave::ikonos(int iwa)
 {
 
-    /* "Ikonos Green" of ikonos */
-    static const float sr1[274] = {
-		.0008, .0011, .0015, .0012, .0009, .0008, .0007,
-		.0007, .0010, .0013, .0015, .0017, .0018, .0019,
-		.0028, .0040, .0052, .0064, .0077, .0082, .0088,
-		.0119, .0147, .0175, .0262, .0350, .0602, .0854,
-		.1929, .2617, .3305, .3750, .4195, .4638, .5082,
-		.6132, .6437, .6742, .6973, .7204, .7406, .7608,
-		.7601, .7742, .7883, .8225, .8566, .8730, .8894,
-		.9436, .9718, 1.0000, .9934, .9868, .9562, .9255,
-		.7613, .6519, .5424, .4282, .3139, .2590, .2041,
-		.1519, .1188, .0856, .0644, .0432, .0371, .0310,
-		.0266, .0244, .0222, .0221, .0221, .0242, .0262,
-		.0296, .0283, .0270, .0248, .0226, .0240, .0254,
-		.0305, .0289, .0274, .0243, .0213, .0215, .0217,
-		.0296, .0319, .0342, .0306, .0271, .0233, .0195,
-		.0195, .0193, .0190, .0165, .0140, .0107, .0073,
-		.0060, .0056, .0051, .0065, .0079, .0101, .0123,
-		.0200, .0210, .0221, .0214, .0208, .0199, .0190,
-		.0155, .0126, .0097, .0083, .0068, .0059, .0049,
-		.0054, .0085, .0115, .0169, .0222, .0231, .0240,
-		.0121, .0080, .0040, .0031, .0022, .0024, .0026,
-		.0023, .0029, .0035, .0030, .0025, .0024, .0023,
-		.0040, .0038, .0036, .0032, .0027, .0025, .0024,
-		.0026, .0024, .0022, .0019, .0016, .0016, .0016,
-		.0020, .0020, .0020, .0023, .0025, .0031, .0036,
-		.0056, .0061, .0066, .0071, .0075, .0078, .0080,
-		.0095, .0089, .0083, .0085, .0088, .0090, .0093,
-		.0107, .0116, .0125, .0128, .0131, .0131, .0131,
-		.0119, .0112, .0105, .0100, .0095, .0091, .0088,
-		.0084, .0083, .0082, .0081, .0080, .0082, .0084,
-		.0081, .0081, .0080, .0080, .0080, .0074, .0069,
-		.0054, .0051, .0048, .0046, .0045, .0043, .0041,
-		.0036, .0035, .0035, .0034, .0033, .0030, .0028,
-		.0028, .0026, .0024, .0024, .0023, .0025, .0026,
-		.0026, .0026, .0026, .0021, .0016, .0018, .0019,
-		.0024
-    };
-
-    /* "Ikonos Red" of ikonos */
-    static const float sr2[274] = {
-		.0006, .0007, .0008, .0008, .0007, .0008, .0008,
-		.0006, .0007, .0008, .0007, .0006, .0008, .0009,
-		.0006, .0010, .0013, .0013, .0012, .0019, .0027,
-		.0010, .0011, .0013, .0016, .0019, .0023, .0027,
-		.0034, .0037, .0040, .0049, .0057, .0074, .0091,
-		.0113, .0113, .0113, .0122, .0130, .0151, .0172,
-		.0245, .0306, .0367, .0435, .0503, .0565, .0628,
-		.1094, .1512, .1931, .2421, .2911, .3653, .4396,
-		.6507, .7286, .8066, .8391, .8717, .8801, .8884,
-		.8898, .8824, .8749, .8635, .8521, .8722, .8923,
-		.9977, .9819, .9661, .9369, .9077, .9005, .8932,
-		.9459, .9715, .9972, .9785, .9598, .9186, .8774,
-		.7497, .6259, .5020, .3926, .2832, .2215, .1599,
-		.1068, .0947, .0825, .0732, .0640, .0557, .0474,
-		.0320, .0273, .0227, .0196, .0166, .0155, .0145,
-		.0148, .0155, .0162, .0174, .0186, .0193, .0199,
-		.0188, .0170, .0152, .0138, .0125, .0122, .0119,
-		.0109, .0122, .0135, .0150, .0165, .0174, .0183,
-		.0159, .0135, .0112, .0088, .0063, .0059, .0055,
-		.0034, .0036, .0039, .0037, .0035, .0032, .0030,
-		.0031, .0027, .0023, .0029, .0034, .0035, .0036,
-		.0053, .0059, .0065, .0068, .0072, .0080, .0089,
-		.0095, .0088, .0080, .0075, .0070, .0067, .0064,
-		.0061, .0059, .0056, .0054, .0053, .0057, .0061,
-		.0074, .0070, .0067, .0067, .0067, .0081, .0094,
-		.0128, .0135, .0143, .0151, .0159, .0165, .0171,
-		.0172, .0168, .0163, .0158, .0152, .0143, .0134,
-		.0120, .0113, .0106, .0103, .0100, .0096, .0092,
-		.0098, .0093, .0089, .0087, .0084, .0081, .0078,
-		.0075, .0072, .0070, .0064, .0059, .0056, .0054,
-		.0046, .0043, .0039, .0038, .0036, .0034, .0033,
-		.0029, .0029, .0028, .0028, .0028, .0025, .0022,
-		.0025, .0024, .0022, .0024, .0025, .0023, .0021,
-		.0017, .0019, .0021, .0021, .0020, .0021, .0022,
-		.0014
-    };
-
-    /* "Ikonos NIR" of ikonos */
-    static const float sr3[274] = {
-		.0000, .0003, .0005, .0004, .0004, .0005, .0006,
-		.0003, .0006, .0008, .0007, .0007, .0005, .0004,
-		.0015, .0018, .0020, .0025, .0030, .0033, .0035,
-		.0040, .0041, .0041, .0060, .0078, .0081, .0084,
-		.0082, .0066, .0051, .0038, .0026, .0035, .0043,
-		.0055, .0055, .0055, .0042, .0029, .0023, .0017,
-		.0015, .0026, .0036, .0040, .0043, .0034, .0025,
-		.0020, .0017, .0013, .0014, .0015, .0015, .0015,
-		.0021, .0022, .0024, .0025, .0027, .0030, .0034,
-		.0029, .0029, .0029, .0035, .0041, .0050, .0060,
-		.0072, .0083, .0093, .0093, .0093, .0090, .0087,
-		.0095, .0099, .0103, .0118, .0133, .0169, .0204,
-		.0285, .0316, .0347, .0388, .0428, .0502, .0575,
-		.0855, .1052, .1249, .1506, .1764, .2174, .2584,
-		.4188, .5285, .6381, .7213, .8045, .8414, .8784,
-		.9196, .9364, .9532, .9545, .9559, .9424, .9289,
-		.9389, .9628, .9866, .9917, .9968, .9524, .9079,
-		.7698, .6808, .5919, .5067, .4215, .3634, .3053,
-		.2262, .1923, .1583, .1315, .1046, .0860, .0674,
-		.0447, .0373, .0299, .0269, .0239, .0230, .0220,
-		.0184, .0171, .0159, .0161, .0162, .0159, .0157,
-		.0165, .0168, .0171, .0167, .0163, .0142, .0121,
-		.0091, .0079, .0068, .0065, .0062, .0059, .0056,
-		.0042, .0042, .0042, .0046, .0050, .0045, .0040,
-		.0040, .0033, .0027, .0028, .0030, .0028, .0025,
-		.0033, .0029, .0026, .0026, .0026, .0027, .0028,
-		.0027, .0028, .0028, .0027, .0026, .0026, .0026,
-		.0025, .0024, .0024, .0024, .0023, .0026, .0029,
-		.0027, .0029, .0031, .0035, .0039, .0040, .0040,
-		.0040, .0037, .0035, .0031, .0026, .0024, .0022,
-		.0016, .0015, .0014, .0014, .0013, .0013, .0014,
-		.0011, .0011, .0012, .0012, .0012, .0011, .0010,
-		.0016, .0013, .0010, .0012, .0013, .0014, .0014,
-		.0029, .0023, .0018, .0020, .0023, .0018, .0013,
-		.0009
+    /* Ikonos Green of ikonos */
+    static const float sr1[275] = {
+		.0008, .0011, .0015, .0012, .0009, .0008, .0007, .0007,
+		.0007, .0010, .0013, .0015, .0017, .0018, .0019, .0024,
+		.0028, .0040, .0052, .0064, .0077, .0082, .0088, .0103,
+		.0119, .0147, .0175, .0262, .0350, .0602, .0854, .1392,
+		.1929, .2617, .3305, .3750, .4195, .4638, .5082, .5607,
+		.6132, .6437, .6742, .6973, .7204, .7406, .7608, .7605,
+		.7601, .7742, .7883, .8225, .8566, .8730, .8894, .9165,
+		.9436, .9718, 1.0000, .9934, .9868, .9562, .9255, .8434,
+		.7613, .6519, .5424, .4282, .3139, .2590, .2041, .1780,
+		.1519, .1188, .0856, .0644, .0432, .0371, .0310, .0288,
+		.0266, .0244, .0222, .0221, .0221, .0242, .0262, .0279,
+		.0296, .0283, .0270, .0248, .0226, .0240, .0254, .0280,
+		.0305, .0289, .0274, .0243, .0213, .0215, .0217, .0257,
+		.0296, .0319, .0342, .0306, .0271, .0233, .0195, .0195,
+		.0195, .0193, .0190, .0165, .0140, .0107, .0073, .0067,
+		.0060, .0056, .0051, .0065, .0079, .0101, .0123, .0161,
+		.0200, .0210, .0221, .0214, .0208, .0199, .0190, .0172,
+		.0155, .0126, .0097, .0083, .0068, .0059, .0049, .0052,
+		.0054, .0085, .0115, .0169, .0222, .0231, .0240, .0180,
+		.0121, .0080, .0040, .0031, .0022, .0024, .0026, .0024,
+		.0023, .0029, .0035, .0030, .0025, .0024, .0023, .0032,
+		.0040, .0038, .0036, .0032, .0027, .0025, .0024, .0025,
+		.0026, .0024, .0022, .0019, .0016, .0016, .0016, .0018,
+		.0020, .0020, .0020, .0023, .0025, .0031, .0036, .0046,
+		.0056, .0061, .0066, .0071, .0075, .0078, .0080, .0087,
+		.0095, .0089, .0083, .0085, .0088, .0090, .0093, .0100,
+		.0107, .0116, .0125, .0128, .0131, .0131, .0131, .0125,
+		.0119, .0112, .0105, .0100, .0095, .0091, .0088, .0086,
+		.0084, .0083, .0082, .0081, .0080, .0082, .0084, .0082,
+		.0081, .0081, .0080, .0080, .0080, .0074, .0069, .0062,
+		.0054, .0051, .0048, .0046, .0045, .0043, .0041, .0038,
+		.0036, .0035, .0035, .0034, .0033, .0030, .0028, .0028,
+		.0028, .0026, .0024, .0024, .0023, .0025, .0026, .0026,
+		.0026, .0026, .0026, .0021, .0016, .0018, .0019, .0022,
+		.0024, .0019, .0013
     };
-
+	
+    /* Ikonos Red of ikonos */
+    static const float sr2[275] = {
+		.0006, .0007, .0008, .0008, .0007, .0008, .0008, .0007,
+		.0006, .0007, .0008, .0007, .0006, .0008, .0009, .0007,
+		.0006, .0010, .0013, .0013, .0012, .0019, .0027, .0018,
+		.0010, .0011, .0013, .0016, .0019, .0023, .0027, .0030,
+		.0034, .0037, .0040, .0049, .0057, .0074, .0091, .0102,
+		.0113, .0113, .0113, .0122, .0130, .0151, .0172, .0208,
+		.0245, .0306, .0367, .0435, .0503, .0565, .0628, .0861,
+		.1094, .1512, .1931, .2421, .2911, .3653, .4396, .5451,
+		.6507, .7286, .8066, .8391, .8717, .8801, .8884, .8891,
+		.8898, .8824, .8749, .8635, .8521, .8722, .8923, .9450,
+		.9977, .9819, .9661, .9369, .9077, .9005, .8932, .9195,
+		.9459, .9715, .9972, .9785, .9598, .9186, .8774, .8136,
+		.7497, .6259, .5020, .3926, .2832, .2215, .1599, .1334,
+		.1068, .0947, .0825, .0732, .0640, .0557, .0474, .0397,
+		.0320, .0273, .0227, .0196, .0166, .0155, .0145, .0147,
+		.0148, .0155, .0162, .0174, .0186, .0193, .0199, .0193,
+		.0188, .0170, .0152, .0138, .0125, .0122, .0119, .0114,
+		.0109, .0122, .0135, .0150, .0165, .0174, .0183, .0171,
+		.0159, .0135, .0112, .0088, .0063, .0059, .0055, .0044,
+		.0034, .0036, .0039, .0037, .0035, .0032, .0030, .0030,
+		.0031, .0027, .0023, .0029, .0034, .0035, .0036, .0044,
+		.0053, .0059, .0065, .0068, .0072, .0080, .0089, .0092,
+		.0095, .0088, .0080, .0075, .0070, .0067, .0064, .0063,
+		.0061, .0059, .0056, .0054, .0053, .0057, .0061, .0068,
+		.0074, .0070, .0067, .0067, .0067, .0081, .0094, .0111,
+		.0128, .0135, .0143, .0151, .0159, .0165, .0171, .0172,
+		.0172, .0168, .0163, .0158, .0152, .0143, .0134, .0127,
+		.0120, .0113, .0106, .0103, .0100, .0096, .0092, .0095,
+		.0098, .0093, .0089, .0087, .0084, .0081, .0078, .0077,
+		.0075, .0072, .0070, .0064, .0059, .0056, .0054, .0050,
+		.0046, .0043, .0039, .0038, .0036, .0034, .0033, .0031,
+		.0029, .0029, .0028, .0028, .0028, .0025, .0022, .0024,
+		.0025, .0024, .0022, .0024, .0025, .0023, .0021, .0019,
+		.0017, .0019, .0021, .0021, .0020, .0021, .0022, .0018,
+		.0014, .0015, .0016
+    };
+	
+    /* Ikonos NIR of ikonos */
+    static const float sr3[275] = {
+		.0000, .0003, .0005, .0004, .0004, .0005, .0006, .0005,
+		.0003, .0006, .0008, .0007, .0007, .0005, .0004, .0009,
+		.0015, .0018, .0020, .0025, .0030, .0033, .0035, .0038,
+		.0040, .0041, .0041, .0060, .0078, .0081, .0084, .0083,
+		.0082, .0066, .0051, .0038, .0026, .0035, .0043, .0049,
+		.0055, .0055, .0055, .0042, .0029, .0023, .0017, .0016,
+		.0015, .0026, .0036, .0040, .0043, .0034, .0025, .0023,
+		.0020, .0017, .0013, .0014, .0015, .0015, .0015, .0018,
+		.0021, .0022, .0024, .0025, .0027, .0030, .0034, .0031,
+		.0029, .0029, .0029, .0035, .0041, .0050, .0060, .0066,
+		.0072, .0083, .0093, .0093, .0093, .0090, .0087, .0091,
+		.0095, .0099, .0103, .0118, .0133, .0169, .0204, .0244,
+		.0285, .0316, .0347, .0388, .0428, .0502, .0575, .0715,
+		.0855, .1052, .1249, .1506, .1764, .2174, .2584, .3386,
+		.4188, .5285, .6381, .7213, .8045, .8414, .8784, .8990,
+		.9196, .9364, .9532, .9545, .9559, .9424, .9289, .9339,
+		.9389, .9628, .9866, .9917, .9968, .9524, .9079, .8388,
+		.7698, .6808, .5919, .5067, .4215, .3634, .3053, .2658,
+		.2262, .1923, .1583, .1315, .1046, .0860, .0674, .0560,
+		.0447, .0373, .0299, .0269, .0239, .0230, .0220, .0202,
+		.0184, .0171, .0159, .0161, .0162, .0159, .0157, .0161,
+		.0165, .0168, .0171, .0167, .0163, .0142, .0121, .0106,
+		.0091, .0079, .0068, .0065, .0062, .0059, .0056, .0049,
+		.0042, .0042, .0042, .0046, .0050, .0045, .0040, .0040,
+		.0040, .0033, .0027, .0028, .0030, .0028, .0025, .0029,
+		.0033, .0029, .0026, .0026, .0026, .0027, .0028, .0027,
+		.0027, .0028, .0028, .0027, .0026, .0026, .0026, .0025,
+		.0025, .0024, .0024, .0024, .0023, .0026, .0029, .0028,
+		.0027, .0029, .0031, .0035, .0039, .0040, .0040, .0040,
+		.0040, .0037, .0035, .0031, .0026, .0024, .0022, .0019,
+		.0016, .0015, .0014, .0014, .0013, .0013, .0014, .0012,
+		.0011, .0011, .0012, .0012, .0012, .0011, .0010, .0013,
+		.0016, .0013, .0010, .0012, .0013, .0014, .0014, .0022,
+		.0029, .0023, .0018, .0020, .0023, .0018, .0013, .0011,
+		.0009, .0004, .0000
+    };
+	
     static const float wli[3] = {0.350, 0.350, 0.350};
     static const float wls[3] = {1.035, 1.035, 1.035};
 
@@ -2177,11 +2177,11 @@ void IWave::ikonos(int iwa)
 
     switch(iwa)
     {
-    case 1: for(i = 0; i < 274; i++)  ffu.s[40+i] = sr1[i];
+    case 1: for(i = 0; i < 275; i++)  ffu.s[40+i] = sr1[i];
         break;
-    case 2: for(i = 0; i < 274; i++)  ffu.s[40+i] = sr2[i];
+    case 2: for(i = 0; i < 275; i++)  ffu.s[40+i] = sr2[i];
         break;
-    case 3: for(i = 0; i < 274; i++)  ffu.s[40+i] = sr3[i];
+    case 3: for(i = 0; i < 275; i++)  ffu.s[40+i] = sr3[i];
         break;
     }
 }