diff --git a/L1Trigger/L1TMuonEndCapPhase2/interface/EMTFLogger.h b/L1Trigger/L1TMuonEndCapPhase2/interface/EMTFLogger.h deleted file mode 100644 index eafe059c160b8..0000000000000 --- a/L1Trigger/L1TMuonEndCapPhase2/interface/EMTFLogger.h +++ /dev/null @@ -1,36 +0,0 @@ - -#ifndef L1Trigger_L1TMuonEndCapPhase2_EMTFLoggger -#define L1Trigger_L1TMuonEndCapPhase2_EMTFLoggger - -#include "L1Trigger/L1TMuonEndCapPhase2/interface/EMTFfwd.h" -#include "L1Trigger/L1TMuonEndCapPhase2/interface/EMTFTypes.h" - -namespace emtf::phase2 { - - class EMTFLoggger { - public: - EMTFLoggger(const EMTFContext&); - - ~EMTFLoggger(); - - // Sections - void print_section_header(const std:string&); - - void print_section_footer(const std:string&); - - void print_subsection_header(const std:string&); - - void print_subsection_footer(const std:string&); - - // Data - void print_segment(const int& lvl, const segment_t&); - void print_track(const int& lvl, const track_t&); - void print_track_features(const int& lvl, const track_t::features_t&); - - private: - const EMTFContext& context_; - - }; -} - -#endif // L1Trigger_L1TMuonEndCapPhase2_EMTFLoggger diff --git a/L1Trigger/L1TMuonEndCapPhase2/src/Algo/TrackBuildingLayer.cc b/L1Trigger/L1TMuonEndCapPhase2/src/Algo/TrackBuildingLayer.cc index 909fb1bc127c9..d8b8a8bf742bf 100644 --- a/L1Trigger/L1TMuonEndCapPhase2/src/Algo/TrackBuildingLayer.cc +++ b/L1Trigger/L1TMuonEndCapPhase2/src/Algo/TrackBuildingLayer.cc @@ -446,16 +446,16 @@ void TrackBuildingLayer::attach_segments( // if theta_window < diff, it is invalid std::vector> site_theta_window = { - { 4, 0, 4, 4, 4, 0, 0, 6, 6, 6, 4, 7}, - { 5, 10, 5, 4, 4, 14, 7, 7, 7, 7, 6, 4}, - {11, 6, 5, 6, 6, 11, 8, 8, 9, 10, 8, 0} + {5, 0, 2, 2, 2, 34, 0, 3, 3, 5, 6, 5}, + {5, 9, 5, 4, 5, 14, 7, 7, 7, 7, 7, 4}, + {11, 6, 5, 6, 6, 10, 8, 8, 9, 8, 0, 0} }; if (displaced_en) { site_theta_window = { - {14, 32, 5, 5, 5, 34, 0, 8, 6, 15, 7, 13}, - {16, 20, 7, 6, 6, 25, 17, 8, 9, 17, 8, 14}, - {27, 14, 8, 10, 10, 18, 11, 10, 11, 26, 20, 0} + {14, 40, 4, 3, 3, 45, 0, 4, 4, 15, 8, 13}, + {16, 18, 7, 5, 5, 22, 7, 7, 8, 17, 9, 14}, + {26, 15, 8, 9, 9, 17, 11, 9, 10, 26, 21, 0} }; } diff --git a/L1Trigger/L1TMuonEndCapPhase2/src/Data/ActivationLut.cc b/L1Trigger/L1TMuonEndCapPhase2/src/Data/ActivationLut.cc index 4ec2c8fb5f8c9..a9efed9fc12bc 100644 --- a/L1Trigger/L1TMuonEndCapPhase2/src/Data/ActivationLut.cc +++ b/L1Trigger/L1TMuonEndCapPhase2/src/Data/ActivationLut.cc @@ -8,104 +8,104 @@ using namespace emtf::phase2::data; ActivationLut::ActivationLut() { prompt_pt_lut_ = {{ - 0, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, - 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8075, 7942, 7818, 7693, 7569, - 7453, 7337, 7220, 7108, 6996, 6889, 6785, 6681, 6582, 6482, 6383, 6287, 6192, 6101, 6010, 5923, 5835, 5748, 5665, - 5582, 5500, 5421, 5342, 5263, 5189, 5110, 5039, 4965, 4894, 4824, 4757, 4687, 4620, 4554, 4488, 4426, 4363, 4301, - 4239, 4181, 4123, 4061, 4007, 3949, 3891, 3837, 3783, 3729, 3675, 3625, 3576, 3522, 3472, 3422, 3376, 3327, 3281, - 3231, 3186, 3140, 3095, 3053, 3007, 2966, 2920, 2879, 2837, 2796, 2754, 2717, 2676, 2638, 2597, 2560, 2522, 2485, - 2448, 2410, 2377, 2340, 2303, 2269, 2236, 2199, 2166, 2134, 2102, 2070, 2043, 2011, 1981, 1954, 1924, 1897, 1871, - 1842, 1816, 1791, 1766, 1741, 1717, 1696, 1671, 1647, 1627, 1604, 1583, 1560, 1541, 1521, 1502, 1479, 1460, 1441, - 1422, 1404, 1388, 1370, 1352, 1334, 1319, 1301, 1283, 1269, 1254, 1237, 1223, 1209, 1192, 1178, 1164, 1150, 1136, - 1123, 1109, 1096, 1082, 1069, 1056, 1046, 1033, 1020, 1007, 997, 984, 974, 962, 952, 939, 930, 920, 908, 898, 889, - 879, 867, 858, 848, 839, 830, 821, 812, 803, 794, 785, 776, 769, 760, 751, 743, 736, 727, 719, 712, 704, 695, 689, - 681, 674, 666, 660, 652, 646, 639, 631, 625, 619, 611, 605, 599, 593, 586, 580, 574, 568, 562, 557, 551, 545, 539, - 534, 528, 523, 517, 511, 506, 500, 495, 489, 484, 480, 475, 470, 464, 461, 455, 450, 446, 441, 436, 432, 427, 422, - 419, 413, 410, 405, 402, 396, 393, 388, 385, 380, 376, 371, 368, 365, 360, 357, 353, 348, 345, 342, 337, 334, 331, - 328, 323, 320, 316, 313, 309, 305, 302, 299, 296, 293, 290, 287, 282, 279, 276, 273, 270, 267, 264, 261, 258, 255, - 252, 249, 246, 243, 240, 237, 236, 233, 230, 227, 224, 221, 218, 217, 214, 211, 208, 205, 202, 201, 198, 195, 193, - 191, 188, 185, 183, 181, 178, 176, 174, 172, 169, 167, 165, 162, 160, 158, 155, 154, 151, 150, 147, 145, 143, 140, - 139, 136, 135, 132, 131, 128, 127, 124, 123, 120, 119, 116, 115, 112, 111, 108, 107, 104, 103, 102, 99, 98, 95, 94, - 93, 90, 89, 87, 85, 84, 81, 80, 79, 76, 75, 73, 71, 70, 68, 67, 65, 63, 62, 60, 58, 57, 56, 53, 52, 51, 50, 47, 46, - 45, 43, 42, 40, 39, 37, 36, 35, 32, 31, 30, 29, 28, 26, 24, 23, 21, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 21, 23, 24, 26, 28, 29, 30, - 31, 32, 35, 36, 37, 39, 40, 42, 43, 45, 46, 47, 50, 51, 52, 53, 56, 57, 58, 60, 62, 63, 65, 67, 68, 70, 71, 73, 75, - 76, 79, 80, 81, 84, 85, 87, 89, 90, 93, 94, 95, 98, 99, 102, 103, 104, 107, 108, 111, 112, 115, 116, 119, 120, 123, - 124, 127, 128, 131, 132, 135, 136, 139, 140, 143, 145, 147, 150, 151, 154, 155, 158, 160, 162, 165, 167, 169, 172, - 174, 176, 178, 181, 183, 185, 188, 191, 193, 195, 198, 201, 202, 205, 208, 211, 214, 217, 218, 221, 224, 227, 230, - 233, 236, 237, 240, 243, 246, 249, 252, 255, 258, 261, 264, 267, 270, 273, 276, 279, 282, 287, 290, 293, 296, 299, - 302, 305, 309, 313, 316, 320, 323, 328, 331, 334, 337, 342, 345, 348, 353, 357, 360, 365, 368, 371, 376, 380, 385, - 388, 393, 396, 402, 405, 410, 413, 419, 422, 427, 432, 436, 441, 446, 450, 455, 461, 464, 470, 475, 480, 484, 489, - 495, 500, 506, 511, 517, 523, 528, 534, 539, 545, 551, 557, 562, 568, 574, 580, 586, 593, 599, 605, 611, 619, 625, - 631, 639, 646, 652, 660, 666, 674, 681, 689, 695, 704, 712, 719, 727, 736, 743, 751, 760, 769, 776, 785, 794, 803, - 812, 821, 830, 839, 848, 858, 867, 879, 889, 898, 908, 920, 930, 939, 952, 962, 974, 984, 997, 1007, 1020, 1033, - 1046, 1056, 1069, 1082, 1096, 1109, 1123, 1136, 1150, 1164, 1178, 1192, 1209, 1223, 1237, 1254, 1269, 1283, 1301, - 1319, 1334, 1352, 1370, 1388, 1404, 1422, 1441, 1460, 1479, 1502, 1521, 1541, 1560, 1583, 1604, 1627, 1647, 1671, - 1696, 1717, 1741, 1766, 1791, 1816, 1842, 1871, 1897, 1924, 1954, 1981, 2011, 2043, 2070, 2102, 2134, 2166, 2199, - 2236, 2269, 2303, 2340, 2377, 2410, 2448, 2485, 2522, 2560, 2597, 2638, 2676, 2717, 2754, 2796, 2837, 2879, 2920, - 2966, 3007, 3053, 3095, 3140, 3186, 3231, 3281, 3327, 3376, 3422, 3472, 3522, 3576, 3625, 3675, 3729, 3783, 3837, - 3891, 3949, 4007, 4061, 4123, 4181, 4239, 4301, 4363, 4426, 4488, 4554, 4620, 4687, 4757, 4824, 4894, 4965, 5039, - 5110, 5189, 5263, 5342, 5421, 5500, 5582, 5665, 5748, 5835, 5923, 6010, 6101, 6192, 6287, 6383, 6482, 6582, 6681, - 6785, 6889, 6996, 7108, 7220, 7337, 7453, 7569, 7693, 7818, 7942, 8075, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, + 8116, 7991, 7867, 7743, 7623, 7503, 7387, 7276, 7165, 7058, 6952, 6845, 6743, 6640, 6543, 6445, 6352, 6258, 6165, + 6076, 5987, 5898, 5814, 5730, 5645, 5565, 5481, 5405, 5325, 5250, 5174, 5103, 5027, 4956, 4885, 4814, 4747, 4681, + 4614, 4547, 4485, 4423, 4356, 4299, 4236, 4174, 4116, 4059, 4001, 3943, 3890, 3836, 3779, 3725, 3672, 3623, 3570, + 3521, 3468, 3419, 3370, 3321, 3277, 3228, 3183, 3134, 3090, 3045, 3001, 2957, 2917, 2872, 2832, 2788, 2748, 2708, + 2668, 2628, 2588, 2552, 2512, 2472, 2437, 2401, 2361, 2326, 2291, 2257, 2223, 2193, 2160, 2127, 2098, 2065, 2037, + 2009, 1977, 1950, 1923, 1896, 1869, 1842, 1820, 1794, 1768, 1746, 1720, 1698, 1673, 1652, 1631, 1610, 1586, 1565, + 1544, 1524, 1504, 1487, 1467, 1448, 1428, 1412, 1392, 1373, 1358, 1342, 1323, 1308, 1292, 1274, 1259, 1244, 1229, + 1214, 1199, 1184, 1170, 1155, 1141, 1127, 1115, 1101, 1087, 1073, 1062, 1049, 1038, 1024, 1013, 1000, 989, 979, 966, + 955, 945, 935, 922, 912, 901, 891, 881, 871, 862, 852, 842, 832, 823, 815, 806, 796, 787, 780, 770, 761, 754, 745, + 736, 729, 720, 713, 704, 698, 689, 682, 676, 667, 660, 654, 645, 639, 633, 626, 618, 611, 605, 599, 593, 587, 581, + 574, 568, 562, 556, 550, 544, 538, 532, 527, 521, 515, 509, 505, 499, 494, 488, 484, 479, 473, 469, 464, 458, 454, + 449, 443, 440, 434, 431, 425, 422, 416, 413, 408, 404, 399, 395, 390, 387, 383, 378, 374, 371, 366, 363, 359, 354, + 351, 347, 344, 339, 336, 333, 329, 324, 321, 318, 315, 311, 308, 305, 302, 297, 294, 291, 288, 284, 281, 278, 275, + 272, 269, 266, 263, 260, 257, 254, 251, 249, 246, 243, 240, 237, 234, 231, 230, 227, 224, 221, 218, 215, 214, 211, + 208, 205, 204, 201, 198, 195, 194, 191, 188, 187, 184, 181, 180, 177, 174, 173, 170, 168, 166, 163, 162, 159, 158, + 155, 153, 151, 149, 147, 145, 143, 141, 139, 137, 135, 133, 132, 129, 128, 125, 124, 121, 120, 117, 116, 115, 112, + 111, 108, 107, 106, 103, 102, 101, 98, 97, 95, 93, 92, 90, 89, 87, 85, 84, 82, 81, 79, 78, 76, 74, 73, 72, 70, 68, + 67, 66, 64, 62, 61, 60, 58, 57, 55, 54, 53, 51, 50, 48, 47, 46, 44, 43, 42, 40, 39, 38, 36, 35, 34, 33, 32, 30, 29, + 27, 26, 25, 24, 23, 22, 21, 20, 19, 16, 15, 14, 13, 12, 11, 10, 9, 8, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 30, 32, 33, 34, 35, 36, 38, 39, 40, 42, 43, 44, + 46, 47, 48, 50, 51, 53, 54, 55, 57, 58, 60, 61, 62, 64, 66, 67, 68, 70, 72, 73, 74, 76, 78, 79, 81, 82, 84, 85, 87, + 89, 90, 92, 93, 95, 97, 98, 101, 102, 103, 106, 107, 108, 111, 112, 115, 116, 117, 120, 121, 124, 125, 128, 129, + 132, 133, 135, 137, 139, 141, 143, 145, 147, 149, 151, 153, 155, 158, 159, 162, 163, 166, 168, 170, 173, 174, 177, + 180, 181, 184, 187, 188, 191, 194, 195, 198, 201, 204, 205, 208, 211, 214, 215, 218, 221, 224, 227, 230, 231, 234, + 237, 240, 243, 246, 249, 251, 254, 257, 260, 263, 266, 269, 272, 275, 278, 281, 284, 288, 291, 294, 297, 302, 305, + 308, 311, 315, 318, 321, 324, 329, 333, 336, 339, 344, 347, 351, 354, 359, 363, 366, 371, 374, 378, 383, 387, 390, + 395, 399, 404, 408, 413, 416, 422, 425, 431, 434, 440, 443, 449, 454, 458, 464, 469, 473, 479, 484, 488, 494, 499, + 505, 509, 515, 521, 527, 532, 538, 544, 550, 556, 562, 568, 574, 581, 587, 593, 599, 605, 611, 618, 626, 633, 639, + 645, 654, 660, 667, 676, 682, 689, 698, 704, 713, 720, 729, 736, 745, 754, 761, 770, 780, 787, 796, 806, 815, 823, + 832, 842, 852, 862, 871, 881, 891, 901, 912, 922, 935, 945, 955, 966, 979, 989, 1000, 1013, 1024, 1038, 1049, 1062, + 1073, 1087, 1101, 1115, 1127, 1141, 1155, 1170, 1184, 1199, 1214, 1229, 1244, 1259, 1274, 1292, 1308, 1323, 1342, + 1358, 1373, 1392, 1412, 1428, 1448, 1467, 1487, 1504, 1524, 1544, 1565, 1586, 1610, 1631, 1652, 1673, 1698, 1720, + 1746, 1768, 1794, 1820, 1842, 1869, 1896, 1923, 1950, 1977, 2009, 2037, 2065, 2098, 2127, 2160, 2193, 2223, 2257, + 2291, 2326, 2361, 2401, 2437, 2472, 2512, 2552, 2588, 2628, 2668, 2708, 2748, 2788, 2832, 2872, 2917, 2957, 3001, + 3045, 3090, 3134, 3183, 3228, 3277, 3321, 3370, 3419, 3468, 3521, 3570, 3623, 3672, 3725, 3779, 3836, 3890, 3943, + 4001, 4059, 4116, 4174, 4236, 4299, 4356, 4423, 4485, 4547, 4614, 4681, 4747, 4814, 4885, 4956, 5027, 5103, 5174, + 5250, 5325, 5405, 5481, 5565, 5645, 5730, 5814, 5898, 5987, 6076, 6165, 6258, 6352, 6445, 6543, 6640, 6743, 6845, + 6952, 7058, 7165, 7276, 7387, 7503, 7623, 7743, 7867, 7991, 8116, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, - 8191, 8191, 8191, 8191, 8191, 8191, 8191 + 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, + 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, + 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191 }}; disp_pt_lut_ = {{ - 0, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, - 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 7956, 7730, - 7515, 7311, 7116, 6932, 6754, 6587, 6425, 6272, 6125, 5983, 5848, 5718, 5593, 5473, 5358, 5247, 5139, 5036, 4936, - 4840, 4747, 4657, 4569, 4485, 4404, 4325, 4249, 4174, 4103, 4032, 3964, 3899, 3834, 3772, 3712, 3652, 3595, 3539, - 3484, 3432, 3380, 3330, 3280, 3233, 3186, 3141, 3096, 3052, 3010, 2968, 2927, 2888, 2849, 2810, 2774, 2737, 2701, - 2667, 2633, 2599, 2566, 2533, 2502, 2471, 2441, 2412, 2383, 2354, 2326, 2298, 2271, 2244, 2219, 2193, 2168, 2143, - 2119, 2095, 2072, 2049, 2026, 2004, 1981, 1960, 1938, 1917, 1897, 1877, 1857, 1837, 1818, 1798, 1780, 1762, 1744, - 1726, 1709, 1692, 1673, 1658, 1641, 1624, 1608, 1592, 1576, 1560, 1546, 1531, 1515, 1501, 1486, 1473, 1458, 1445, - 1430, 1417, 1404, 1390, 1378, 1365, 1353, 1339, 1327, 1315, 1303, 1291, 1280, 1268, 1257, 1245, 1234, 1223, 1212, - 1201, 1190, 1180, 1169, 1158, 1149, 1139, 1128, 1118, 1108, 1099, 1089, 1081, 1071, 1061, 1053, 1043, 1034, 1026, - 1016, 1008, 999, 991, 982, 974, 966, 958, 949, 942, 934, 926, 918, 910, 903, 896, 887, 880, 873, 866, 858, 852, 845, - 838, 830, 824, 817, 810, 804, 798, 790, 784, 778, 771, 765, 759, 753, 747, 740, 734, 728, 722, 716, 710, 705, 699, - 693, 687, 682, 676, 671, 665, 660, 654, 649, 644, 638, 634, 629, 624, 618, 613, 608, 603, 598, 593, 589, 584, 579, - 574, 569, 566, 561, 556, 551, 547, 542, 538, 534, 529, 524, 521, 516, 512, 507, 504, 499, 495, 491, 487, 483, 479, - 474, 471, 467, 463, 459, 455, 451, 448, 444, 440, 437, 433, 429, 426, 422, 419, 415, 411, 408, 404, 400, 397, 393, - 391, 387, 383, 380, 377, 374, 370, 368, 364, 360, 358, 354, 351, 348, 344, 342, 338, 336, 332, 330, 326, 324, 320, - 318, 314, 312, 310, 306, 304, 301, 298, 295, 293, 289, 287, 285, 282, 279, 276, 274, 272, 268, 266, 263, 261, 258, - 256, 254, 251, 248, 245, 243, 241, 238, 236, 234, 231, 229, 226, 224, 222, 219, 217, 215, 212, 211, 209, 206, 204, - 202, 199, 197, 196, 193, 191, 189, 186, 184, 183, 180, 178, 175, 174, 172, 170, 167, 166, 164, 161, 160, 158, 155, - 154, 152, 149, 148, 146, 143, 142, 140, 138, 136, 135, 132, 130, 129, 126, 125, 123, 122, 119, 118, 116, 114, 112, - 111, 108, 107, 105, 104, 101, 100, 97, 96, 95, 93, 91, 89, 88, 86, 84, 83, 82, 79, 78, 75, 74, 73, 71, 69, 68, 66, - 64, 63, 62, 59, 58, 57, 55, 53, 52, 51, 48, 47, 46, 45, 42, 41, 40, 38, 37, 35, 33, 32, 31, 30, 27, 26, 25, 23, 22, - 21, 18, 17, 16, 15, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 15, 16, 17, 18, 21, 22, 23, 25, 26, 27, 30, 31, 32, 33, 35, 37, 38, 40, 41, 42, 45, - 46, 47, 48, 51, 52, 53, 55, 57, 58, 59, 62, 63, 64, 66, 68, 69, 71, 73, 74, 75, 78, 79, 82, 83, 84, 86, 88, 89, 91, - 93, 95, 96, 97, 100, 101, 104, 105, 107, 108, 111, 112, 114, 116, 118, 119, 122, 123, 125, 126, 129, 130, 132, 135, - 136, 138, 140, 142, 143, 146, 148, 149, 152, 154, 155, 158, 160, 161, 164, 166, 167, 170, 172, 174, 175, 178, 180, - 183, 184, 186, 189, 191, 193, 196, 197, 199, 202, 204, 206, 209, 211, 212, 215, 217, 219, 222, 224, 226, 229, 231, - 234, 236, 238, 241, 243, 245, 248, 251, 254, 256, 258, 261, 263, 266, 268, 272, 274, 276, 279, 282, 285, 287, 289, - 293, 295, 298, 301, 304, 306, 310, 312, 314, 318, 320, 324, 326, 330, 332, 336, 338, 342, 344, 348, 351, 354, 358, - 360, 364, 368, 370, 374, 377, 380, 383, 387, 391, 393, 397, 400, 404, 408, 411, 415, 419, 422, 426, 429, 433, 437, - 440, 444, 448, 451, 455, 459, 463, 467, 471, 474, 479, 483, 487, 491, 495, 499, 504, 507, 512, 516, 521, 524, 529, - 534, 538, 542, 547, 551, 556, 561, 566, 569, 574, 579, 584, 589, 593, 598, 603, 608, 613, 618, 624, 629, 634, 638, - 644, 649, 654, 660, 665, 671, 676, 682, 687, 693, 699, 705, 710, 716, 722, 728, 734, 740, 747, 753, 759, 765, 771, - 778, 784, 790, 798, 804, 810, 817, 824, 830, 838, 845, 852, 858, 866, 873, 880, 887, 896, 903, 910, 918, 926, 934, - 942, 949, 958, 966, 974, 982, 991, 999, 1008, 1016, 1026, 1034, 1043, 1053, 1061, 1071, 1081, 1089, 1099, 1108, - 1118, 1128, 1139, 1149, 1158, 1169, 1180, 1190, 1201, 1212, 1223, 1234, 1245, 1257, 1268, 1280, 1291, 1303, 1315, - 1327, 1339, 1353, 1365, 1378, 1390, 1404, 1417, 1430, 1445, 1458, 1473, 1486, 1501, 1515, 1531, 1546, 1560, 1576, - 1592, 1608, 1624, 1641, 1658, 1673, 1692, 1709, 1726, 1744, 1762, 1780, 1798, 1818, 1837, 1857, 1877, 1897, 1917, - 1938, 1960, 1981, 2004, 2026, 2049, 2072, 2095, 2119, 2143, 2168, 2193, 2219, 2244, 2271, 2298, 2326, 2354, 2383, - 2412, 2441, 2471, 2502, 2533, 2566, 2599, 2633, 2667, 2701, 2737, 2774, 2810, 2849, 2888, 2927, 2968, 3010, 3052, - 3096, 3141, 3186, 3233, 3280, 3330, 3380, 3432, 3484, 3539, 3595, 3652, 3712, 3772, 3834, 3899, 3964, 4032, 4103, - 4174, 4249, 4325, 4404, 4485, 4569, 4657, 4747, 4840, 4936, 5036, 5139, 5247, 5358, 5473, 5593, 5718, 5848, 5983, - 6125, 6272, 6425, 6587, 6754, 6932, 7116, 7311, 7515, 7730, 7956, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, - 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191 + 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8117, 7880, + 7657, 7444, 7243, 7050, 6868, 6692, 6527, 6367, 6216, 6070, 5930, 5796, 5668, 5544, 5425, 5311, 5202, 5095, 4993, + 4894, 4799, 4707, 4618, 4532, 4449, 4368, 4290, 4214, 4141, 4070, 4001, 3933, 3868, 3805, 3744, 3683, 3625, 3568, + 3513, 3459, 3407, 3356, 3306, 3257, 3210, 3163, 3119, 3074, 3031, 2989, 2948, 2908, 2869, 2831, 2792, 2756, 2720, + 2684, 2650, 2617, 2583, 2551, 2518, 2487, 2457, 2427, 2398, 2369, 2341, 2313, 2285, 2259, 2232, 2207, 2182, 2157, + 2133, 2109, 2085, 2062, 2039, 2016, 1995, 1972, 1951, 1930, 1909, 1889, 1870, 1849, 1830, 1811, 1792, 1774, 1756, + 1738, 1720, 1703, 1686, 1668, 1652, 1635, 1619, 1603, 1587, 1572, 1556, 1542, 1527, 1512, 1497, 1483, 1470, 1455, + 1442, 1428, 1414, 1401, 1388, 1376, 1363, 1351, 1338, 1326, 1314, 1302, 1289, 1279, 1267, 1256, 1244, 1233, 1222, + 1211, 1201, 1190, 1180, 1169, 1159, 1149, 1139, 1129, 1119, 1109, 1100, 1090, 1082, 1072, 1062, 1054, 1044, 1036, + 1028, 1018, 1010, 1001, 993, 984, 976, 969, 960, 952, 945, 936, 929, 921, 914, 906, 899, 891, 883, 876, 869, 862, + 856, 849, 841, 834, 828, 821, 814, 808, 802, 795, 789, 783, 775, 769, 763, 757, 751, 745, 739, 733, 727, 721, 715, + 711, 705, 699, 693, 688, 682, 677, 671, 666, 660, 655, 650, 644, 640, 635, 630, 624, 619, 614, 610, 605, 600, 595, + 590, 586, 581, 576, 572, 568, 563, 558, 554, 550, 545, 541, 536, 532, 528, 523, 520, 515, 511, 506, 503, 499, 494, + 491, 487, 482, 479, 475, 471, 467, 463, 459, 456, 452, 449, 445, 441, 438, 434, 431, 427, 423, 420, 416, 413, 409, + 405, 402, 399, 396, 392, 389, 386, 383, 379, 377, 373, 369, 367, 363, 360, 357, 354, 351, 348, 346, 342, 340, 336, + 334, 330, 328, 324, 322, 320, 316, 314, 312, 308, 306, 304, 300, 298, 295, 293, 290, 287, 285, 283, 279, 277, 275, + 273, 270, 268, 266, 263, 260, 258, 255, 253, 251, 249, 246, 244, 242, 240, 237, 235, 233, 231, 228, 226, 225, 223, + 220, 218, 216, 214, 211, 210, 208, 206, 204, 201, 199, 198, 196, 193, 191, 190, 188, 186, 183, 182, 180, 178, 177, + 174, 172, 171, 169, 166, 165, 163, 161, 160, 157, 156, 154, 153, 151, 148, 147, 145, 144, 142, 140, 138, 137, 135, + 134, 131, 130, 128, 127, 125, 123, 121, 120, 118, 117, 115, 113, 112, 110, 109, 107, 105, 104, 103, 101, 99, 97, 96, + 95, 92, 91, 90, 88, 87, 86, 84, 82, 81, 80, 77, 76, 75, 74, 72, 70, 69, 68, 66, 65, 63, 62, 61, 59, 58, 56, 55, 54, + 52, 50, 49, 48, 47, 46, 43, 42, 41, 40, 39, 37, 36, 35, 33, 31, 30, 29, 28, 27, 25, 24, 23, 22, 21, 18, 17, 16, 15, + 13, 12, 11, 10, 9, 7, 6, 5, 4, 2, 1, 0, 1, 2, 4, 5, 6, 7, 9, 10, 11, 12, 13, 15, 16, 17, 18, 21, 22, 23, 24, 25, 27, + 28, 29, 30, 31, 33, 35, 36, 37, 39, 40, 41, 42, 43, 46, 47, 48, 49, 50, 52, 54, 55, 56, 58, 59, 61, 62, 63, 65, 66, + 68, 69, 70, 72, 74, 75, 76, 77, 80, 81, 82, 84, 86, 87, 88, 90, 91, 92, 95, 96, 97, 99, 101, 103, 104, 105, 107, + 109, 110, 112, 113, 115, 117, 118, 120, 121, 123, 125, 127, 128, 130, 131, 134, 135, 137, 138, 140, 142, 144, 145, + 147, 148, 151, 153, 154, 156, 157, 160, 161, 163, 165, 166, 169, 171, 172, 174, 177, 178, 180, 182, 183, 186, 188, + 190, 191, 193, 196, 198, 199, 201, 204, 206, 208, 210, 211, 214, 216, 218, 220, 223, 225, 226, 228, 231, 233, 235, + 237, 240, 242, 244, 246, 249, 251, 253, 255, 258, 260, 263, 266, 268, 270, 273, 275, 277, 279, 283, 285, 287, 290, + 293, 295, 298, 300, 304, 306, 308, 312, 314, 316, 320, 322, 324, 328, 330, 334, 336, 340, 342, 346, 348, 351, 354, + 357, 360, 363, 367, 369, 373, 377, 379, 383, 386, 389, 392, 396, 399, 402, 405, 409, 413, 416, 420, 423, 427, 431, + 434, 438, 441, 445, 449, 452, 456, 459, 463, 467, 471, 475, 479, 482, 487, 491, 494, 499, 503, 506, 511, 515, 520, + 523, 528, 532, 536, 541, 545, 550, 554, 558, 563, 568, 572, 576, 581, 586, 590, 595, 600, 605, 610, 614, 619, 624, + 630, 635, 640, 644, 650, 655, 660, 666, 671, 677, 682, 688, 693, 699, 705, 711, 715, 721, 727, 733, 739, 745, 751, + 757, 763, 769, 775, 783, 789, 795, 802, 808, 814, 821, 828, 834, 841, 849, 856, 862, 869, 876, 883, 891, 899, 906, + 914, 921, 929, 936, 945, 952, 960, 969, 976, 984, 993, 1001, 1010, 1018, 1028, 1036, 1044, 1054, 1062, 1072, 1082, + 1090, 1100, 1109, 1119, 1129, 1139, 1149, 1159, 1169, 1180, 1190, 1201, 1211, 1222, 1233, 1244, 1256, 1267, 1279, + 1289, 1302, 1314, 1326, 1338, 1351, 1363, 1376, 1388, 1401, 1414, 1428, 1442, 1455, 1470, 1483, 1497, 1512, 1527, + 1542, 1556, 1572, 1587, 1603, 1619, 1635, 1652, 1668, 1686, 1703, 1720, 1738, 1756, 1774, 1792, 1811, 1830, 1849, + 1870, 1889, 1909, 1930, 1951, 1972, 1995, 2016, 2039, 2062, 2085, 2109, 2133, 2157, 2182, 2207, 2232, 2259, 2285, + 2313, 2341, 2369, 2398, 2427, 2457, 2487, 2518, 2551, 2583, 2617, 2650, 2684, 2720, 2756, 2792, 2831, 2869, 2908, + 2948, 2989, 3031, 3074, 3119, 3163, 3210, 3257, 3306, 3356, 3407, 3459, 3513, 3568, 3625, 3683, 3744, 3805, 3868, + 3933, 4001, 4070, 4141, 4214, 4290, 4368, 4449, 4532, 4618, 4707, 4799, 4894, 4993, 5095, 5202, 5311, 5425, 5544, + 5668, 5796, 5930, 6070, 6216, 6367, 6527, 6692, 6868, 7050, 7243, 7444, 7657, 7880, 8117, 8191, 8191, 8191, 8191, + 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, + 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191 }}; rels_lut_ = {{ @@ -149,12 +149,11 @@ ActivationLut::ActivationLut() { }}; dxy_lut_ = {{ - 0, 0, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, - 11, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 21, 21, 21, 21, 22, - 22, 22, 22, 24, 24, 24, 24, 25, 25, 25, 25, 27, 27, 27, 28, 28, 28, 28, 30, 30, 30, 30, 31, 31, 31, 31, 33, 33, 33, - 33, 35, 35, 35, 35, 36, 36, 36, 36, 38, 38, 38, 40, 40, 40, 40, 41, 41, 41, 41, 43, 43, 43, 43, 45, 45, 45, 45, 47, - 47, 47, 47, 49, 49, 49, 51, 51, 51, 51, 52, 52, 52, 52, 54, 54, 54, 54, 56, 56, 56, 56, 58, 58, 58, 58, 60, 60, 60, - 60, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 0, 0, 2, 2, 2, 2, 3, 3, 3, 3, 5, 5, 5, 5, 6, 6, 6, 6, 8, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 11, 11, 11, 11, 12, 12, + 12, 12, 13, 13, 13, 13, 15, 15, 15, 15, 16, 16, 16, 16, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 21, 21, 21, 21, + 22, 22, 22, 22, 23, 23, 23, 23, 25, 25, 25, 25, 27, 27, 27, 28, 28, 28, 28, 30, 30, 30, 30, 32, 32, 32, 32, 35, 35, + 35, 35, 37, 37, 37, 37, 40, 40, 40, 40, 43, 43, 43, 46, 46, 46, 46, 49, 49, 49, 49, 53, 53, 53, 53, 56, 56, 56, 56, + 60, 60, 60, 60, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, @@ -166,7 +165,10 @@ ActivationLut::ActivationLut() { 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, @@ -181,14 +183,12 @@ ActivationLut::ActivationLut() { -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, - -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, -62, - -62, -62, -60, -60, -60, -60, -58, -58, -58, -58, -56, -56, -56, -56, -54, -54, -54, -54, -52, -52, -52, -52, -51, - -51, -51, -51, -49, -49, -49, -47, -47, -47, -47, -45, -45, -45, -45, -43, -43, -43, -43, -41, -41, -41, -41, -40, - -40, -40, -40, -38, -38, -38, -36, -36, -36, -36, -35, -35, -35, -35, -33, -33, -33, -33, -31, -31, -31, -31, -30, - -30, -30, -30, -28, -28, -28, -28, -27, -27, -27, -25, -25, -25, -25, -24, -24, -24, -24, -22, -22, -22, -22, -21, - -21, -21, -21, -19, -19, -19, -19, -18, -18, -18, -18, -17, -17, -17, -15, -15, -15, -15, -14, -14, -14, -14, -13, - -13, -13, -13, -11, -11, -11, -11, -10, -10, -10, -10, -9, -9, -9, -8, -8, -8, -8, -7, -7, -7, -7, -6, -6, -6, -6, - -4, -4, -4, -4, -3, -3, -3, -3, -2, -2, -2, -2, 0 + -64, -64, -64, -64, -64, -64, -60, -60, -60, -60, -56, -56, -56, -56, -53, -53, -53, -53, -49, -49, -49, -49, -46, + -46, -46, -46, -43, -43, -43, -40, -40, -40, -40, -37, -37, -37, -37, -35, -35, -35, -35, -32, -32, -32, -32, -30, + -30, -30, -30, -28, -28, -28, -28, -27, -27, -27, -25, -25, -25, -25, -23, -23, -23, -23, -22, -22, -22, -22, -21, + -21, -21, -21, -19, -19, -19, -19, -18, -18, -18, -18, -17, -17, -17, -16, -16, -16, -16, -15, -15, -15, -15, -13, + -13, -13, -13, -12, -12, -12, -12, -11, -11, -11, -11, -10, -10, -10, -9, -9, -9, -9, -8, -8, -8, -8, -6, -6, -6, + -6, -5, -5, -5, -5, -3, -3, -3, -3, -2, -2, -2, -2, 0 }}; }