diff --git a/tests/modules/conex_output_REF.txt b/tests/modules/conex_output_REF.txt index fd32d4e2effa259d0b409524bc3d550522ee66a0..c609d74bdfa35897498dd1ba46e68a502079ee78 100644 --- a/tests/modules/conex_output_REF.txt +++ b/tests/modules/conex_output_REF.txt @@ -1,59 +1,59 @@ # X N dEdX Mu dMu Gamma El Had - 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 10.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 20.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 30.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 40.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 50.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 60.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 70.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 80.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 90.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 100.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 110.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 120.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 130.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 140.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 150.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 160.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 170.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 180.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 190.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 200.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 210.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 220.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 230.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 240.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 250.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 260.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 270.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 280.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 290.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 300.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 310.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 320.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 330.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 340.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 350.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 360.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 370.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 380.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 390.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 400.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 410.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 420.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 430.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 440.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 450.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 460.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 470.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 480.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 490.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 500.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 510.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 520.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 530.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 - 540.00 0.00 0.00062 0.00 0.00 1.00 0.00 0.00 + 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 10.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 20.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 30.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 40.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 50.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 60.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 70.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 80.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 90.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 100.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 110.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 120.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 130.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 140.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 150.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 160.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 170.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 180.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 190.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 200.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 210.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 220.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 230.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 240.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 250.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 260.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 270.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 280.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 290.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 300.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 310.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 320.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 330.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 340.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 350.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 360.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 370.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 380.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 390.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 400.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 410.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 420.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 430.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 440.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 450.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 460.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 470.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 480.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 490.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 500.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 510.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 520.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 530.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 + 540.00 0.00 0.000620 0.00 0.00 1.00 0.00 0.00 550.00 0.512 0.00246 0.000784 0.000802 1.69 0.272 0.00518 560.00 1.45 0.00598 0.00326 0.00256 4.23 0.787 0.00985 570.00 3.23 0.0123 0.00719 0.00411 9.26 1.78 0.0145 @@ -61,148 +61,148 @@ 590.00 11.2 0.0385 0.0194 0.00734 32.0 6.27 0.0248 600.00 18.4 0.0613 0.0278 0.00906 53.3 10.4 0.0304 610.00 28.6 0.0925 0.0376 0.0108 84.1 16.2 0.0364 - 620.00 42.3 0.134 0.0489 0.0125 127.0 24.1 0.0425 - 630.00 60.1 0.186 0.0615 0.0142 184.0 34.5 0.0489 - 640.00 82.5 0.251 0.0753 0.0158 258.0 47.5 0.0553 - 650.00 110.0 0.328 0.0902 0.0173 350.0 63.4 0.0618 - 660.00 142.0 0.416 0.106 0.0186 464.0 82.5 0.0681 - 670.00 180.0 0.518 0.123 0.0198 600.0 105.0 0.0744 - 680.00 223.0 0.632 0.14 0.0208 759.0 130.0 0.0803 - 690.00 270.0 0.757 0.157 0.0216 942.0 158.0 0.086 - 700.00 322.0 0.892 0.175 0.0223 1.15e+03 189.0 0.0913 - 710.00 378.0 1.04 0.193 0.0227 1.38e+03 222.0 0.0962 - 720.00 437.0 1.19 0.21 0.023 1.62e+03 257.0 0.101 - 730.00 497.0 1.34 0.227 0.023 1.89e+03 294.0 0.104 - 740.00 559.0 1.50 0.244 0.0229 2.17e+03 331.0 0.108 - 750.00 621.0 1.65 0.26 0.0227 2.46e+03 369.0 0.111 - 760.00 683.0 1.81 0.275 0.0223 2.76e+03 406.0 0.113 - 770.00 742.0 1.96 0.289 0.0218 3.06e+03 443.0 0.114 - 780.00 799.0 2.10 0.303 0.0212 3.36e+03 478.0 0.116 - 790.00 853.0 2.23 0.315 0.0205 3.66e+03 511.0 0.116 - 800.00 902.0 2.35 0.327 0.0197 3.94e+03 542.0 0.116 - 810.00 947.0 2.45 0.337 0.0189 4.21e+03 570.0 0.116 - 820.00 986.0 2.55 0.347 0.018 4.47e+03 595.0 0.115 - 830.00 1.02e+03 2.63 0.355 0.0171 4.70e+03 616.0 0.113 - 840.00 1.05e+03 2.69 0.362 0.0162 4.92e+03 634.0 0.112 - 850.00 1.07e+03 2.74 0.369 0.0153 5.10e+03 648.0 0.109 - 860.00 1.08e+03 2.77 0.374 0.0144 5.27e+03 659.0 0.107 - 870.00 1.09e+03 2.79 0.379 0.0135 5.40e+03 666.0 0.104 - 880.00 1.10e+03 2.79 0.382 0.0126 5.50e+03 669.0 0.101 - 890.00 1.09e+03 2.78 0.385 0.0117 5.58e+03 669.0 0.0983 - 900.00 1.08e+03 2.76 0.387 0.0109 5.63e+03 665.0 0.095 - 910.00 1.07e+03 2.72 0.388 0.0101 5.64e+03 658.0 0.0916 - 920.00 1.05e+03 2.67 0.388 0.00933 5.64e+03 649.0 0.0881 - 930.00 1.03e+03 2.62 0.388 0.00861 5.60e+03 636.0 0.0845 - 940.00 1.01e+03 2.55 0.388 0.00793 5.54e+03 622.0 0.0809 - 950.00 978.0 2.48 0.387 0.00729 5.46e+03 605.0 0.0773 - 960.00 947.0 2.39 0.385 0.00669 5.36e+03 587.0 0.0737 - 970.00 913.0 2.31 0.383 0.00613 5.24e+03 567.0 0.0702 - 980.00 878.0 2.22 0.38 0.00561 5.11e+03 546.0 0.0667 - 990.00 841.0 2.12 0.378 0.00512 4.96e+03 524.0 0.0633 - 1000.00 803.0 2.03 0.375 0.00467 4.80e+03 501.0 0.0599 - 1010.00 765.0 1.93 0.371 0.00426 4.63e+03 478.0 0.0566 - 1020.00 726.0 1.83 0.368 0.00387 4.45e+03 455.0 0.0535 - 1030.00 688.0 1.73 0.364 0.00352 4.26e+03 431.0 0.0504 - 1040.00 650.0 1.64 0.36 0.0032 4.07e+03 408.0 0.0475 - 1050.00 612.0 1.54 0.356 0.0029 3.88e+03 385.0 0.0447 - 1060.00 575.0 1.45 0.352 0.00263 3.69e+03 362.0 0.042 - 1070.00 539.0 1.36 0.348 0.00239 3.50e+03 340.0 0.0394 - 1080.00 504.0 1.27 0.344 0.00216 3.31e+03 319.0 0.037 - 1090.00 470.0 1.19 0.34 0.00196 3.12e+03 298.0 0.0346 - 1100.00 438.0 1.10 0.336 0.00177 2.94e+03 278.0 0.0324 - 1110.00 407.0 1.03 0.331 0.0016 2.76e+03 258.0 0.0303 - 1120.00 377.0 0.952 0.327 0.00145 2.58e+03 240.0 0.0283 - 1130.00 349.0 0.881 0.323 0.00131 2.41e+03 222.0 0.0265 - 1140.00 323.0 0.814 0.319 0.00119 2.25e+03 206.0 0.0247 - 1150.00 298.0 0.751 0.314 0.00108 2.10e+03 190.0 0.023 - 1160.00 274.0 0.692 0.31 0.000973 1.95e+03 175.0 0.0215 - 1170.00 252.0 0.636 0.306 0.000881 1.81e+03 161.0 0.02 - 1180.00 231.0 0.584 0.302 0.000798 1.67e+03 148.0 0.0186 - 1190.00 212.0 0.535 0.298 0.000722 1.55e+03 136.0 0.0173 - 1200.00 194.0 0.49 0.294 0.000655 1.43e+03 125.0 0.0161 - 1210.00 177.0 0.447 0.29 0.000593 1.32e+03 114.0 0.015 - 1220.00 161.0 0.408 0.286 0.000538 1.21e+03 104.0 0.014 - 1230.00 147.0 0.372 0.283 0.000489 1.11e+03 94.8 0.013 - 1240.00 134.0 0.338 0.279 0.000444 1.02e+03 86.3 0.0121 - 1250.00 121.0 0.307 0.275 0.000403 933.0 78.5 0.0112 - 1260.00 110.0 0.279 0.272 0.000367 853.0 71.3 0.0104 - 1270.00 99.8 0.253 0.268 0.000335 779.0 64.7 0.0097 - 1280.00 90.3 0.229 0.265 0.000305 710.0 58.6 0.00901 - 1290.00 81.6 0.207 0.262 0.000278 647.0 53.0 0.00838 - 1300.00 73.7 0.187 0.258 0.000254 588.0 47.9 0.00779 - 1310.00 66.5 0.169 0.255 0.000232 534.0 43.2 0.00724 - 1320.00 59.9 0.152 0.252 0.000212 485.0 39.0 0.00673 - 1330.00 53.9 0.137 0.249 0.000194 439.0 35.1 0.00626 - 1340.00 48.5 0.123 0.246 0.000178 397.0 31.6 0.00582 - 1350.00 43.5 0.111 0.243 0.000163 359.0 28.4 0.00541 - 1360.00 39.1 0.0995 0.24 0.00015 324.0 25.5 0.00503 - 1370.00 35.0 0.0892 0.237 0.000138 293.0 22.9 0.00469 - 1380.00 31.4 0.08 0.234 0.000127 264.0 20.5 0.00436 - 1390.00 28.1 0.0716 0.231 0.000117 237.0 18.4 0.00406 - 1400.00 25.1 0.0641 0.229 0.000108 213.0 16.4 0.00379 - 1410.00 22.4 0.0573 0.226 9.93e-05 192.0 14.7 0.00353 - 1420.00 20.0 0.0512 0.223 9.17e-05 172.0 13.1 0.00329 - 1430.00 17.9 0.0457 0.221 8.48e-05 154.0 11.7 0.00307 - 1440.00 16.0 0.0408 0.218 7.85e-05 138.0 10.4 0.00287 - 1450.00 14.2 0.0364 0.216 7.28e-05 124.0 9.29 0.00268 - 1460.00 12.7 0.0325 0.214 6.75e-05 111.0 8.27 0.0025 + 620.00 42.3 0.134 0.0489 0.0125 127.0 24.1 0.0425 + 630.00 60.1 0.186 0.0615 0.0142 184.0 34.5 0.0489 + 640.00 82.5 0.251 0.0753 0.0158 258.0 47.5 0.0553 + 650.00 110.0 0.328 0.0902 0.0173 350.0 63.4 0.0618 + 660.00 142.0 0.416 0.106 0.0186 464.0 82.5 0.0681 + 670.00 180.0 0.518 0.123 0.0198 600.0 105.0 0.0744 + 680.00 223.0 0.632 0.140 0.0208 759.0 130.0 0.0803 + 690.00 270.0 0.757 0.157 0.0216 942.0 158.0 0.0860 + 700.00 322.0 0.892 0.175 0.0223 1.15e+03 189.0 0.0913 + 710.00 378.0 1.04 0.193 0.0227 1.38e+03 222.0 0.0962 + 720.00 437.0 1.19 0.210 0.0230 1.62e+03 257.0 0.101 + 730.00 497.0 1.34 0.227 0.0230 1.89e+03 294.0 0.104 + 740.00 559.0 1.50 0.244 0.0229 2.17e+03 331.0 0.108 + 750.00 621.0 1.65 0.260 0.0227 2.46e+03 369.0 0.111 + 760.00 683.0 1.81 0.275 0.0223 2.76e+03 406.0 0.113 + 770.00 742.0 1.96 0.289 0.0218 3.06e+03 443.0 0.114 + 780.00 799.0 2.10 0.303 0.0212 3.36e+03 478.0 0.116 + 790.00 853.0 2.23 0.315 0.0205 3.66e+03 511.0 0.116 + 800.00 902.0 2.35 0.327 0.0197 3.94e+03 542.0 0.116 + 810.00 947.0 2.45 0.337 0.0189 4.21e+03 570.0 0.116 + 820.00 986.0 2.55 0.347 0.0180 4.47e+03 595.0 0.115 + 830.00 1.02e+03 2.63 0.355 0.0171 4.70e+03 616.0 0.113 + 840.00 1.05e+03 2.69 0.362 0.0162 4.92e+03 634.0 0.112 + 850.00 1.07e+03 2.74 0.369 0.0153 5.10e+03 648.0 0.109 + 860.00 1.08e+03 2.77 0.374 0.0144 5.27e+03 659.0 0.107 + 870.00 1.09e+03 2.79 0.379 0.0135 5.40e+03 666.0 0.104 + 880.00 1.10e+03 2.79 0.382 0.0126 5.50e+03 669.0 0.101 + 890.00 1.09e+03 2.78 0.385 0.0117 5.58e+03 669.0 0.0983 + 900.00 1.08e+03 2.76 0.387 0.0109 5.63e+03 665.0 0.0950 + 910.00 1.07e+03 2.72 0.388 0.0101 5.64e+03 658.0 0.0916 + 920.00 1.05e+03 2.67 0.388 0.00933 5.64e+03 649.0 0.0881 + 930.00 1.03e+03 2.62 0.388 0.00861 5.60e+03 636.0 0.0845 + 940.00 1.01e+03 2.55 0.388 0.00793 5.54e+03 622.0 0.0809 + 950.00 978.0 2.48 0.387 0.00729 5.46e+03 605.0 0.0773 + 960.00 947.0 2.39 0.385 0.00669 5.36e+03 587.0 0.0737 + 970.00 913.0 2.31 0.383 0.00613 5.24e+03 567.0 0.0702 + 980.00 878.0 2.22 0.380 0.00561 5.11e+03 546.0 0.0667 + 990.00 841.0 2.12 0.378 0.00512 4.96e+03 524.0 0.0633 + 1000.00 803.0 2.03 0.375 0.00467 4.80e+03 501.0 0.0599 + 1010.00 765.0 1.93 0.371 0.00426 4.63e+03 478.0 0.0566 + 1020.00 726.0 1.83 0.368 0.00387 4.45e+03 455.0 0.0535 + 1030.00 688.0 1.73 0.364 0.00352 4.26e+03 431.0 0.0504 + 1040.00 650.0 1.64 0.360 0.00320 4.07e+03 408.0 0.0475 + 1050.00 612.0 1.54 0.356 0.00290 3.88e+03 385.0 0.0447 + 1060.00 575.0 1.45 0.352 0.00263 3.69e+03 362.0 0.0420 + 1070.00 539.0 1.36 0.348 0.00239 3.50e+03 340.0 0.0394 + 1080.00 504.0 1.27 0.344 0.00216 3.31e+03 319.0 0.0370 + 1090.00 470.0 1.19 0.340 0.00196 3.12e+03 298.0 0.0346 + 1100.00 438.0 1.10 0.336 0.00177 2.94e+03 278.0 0.0324 + 1110.00 407.0 1.03 0.331 0.00160 2.76e+03 258.0 0.0303 + 1120.00 377.0 0.952 0.327 0.00145 2.58e+03 240.0 0.0283 + 1130.00 349.0 0.881 0.323 0.00131 2.41e+03 222.0 0.0265 + 1140.00 323.0 0.814 0.319 0.00119 2.25e+03 206.0 0.0247 + 1150.00 298.0 0.751 0.314 0.00108 2.10e+03 190.0 0.0230 + 1160.00 274.0 0.692 0.310 0.000973 1.95e+03 175.0 0.0215 + 1170.00 252.0 0.636 0.306 0.000881 1.81e+03 161.0 0.0200 + 1180.00 231.0 0.584 0.302 0.000798 1.67e+03 148.0 0.0186 + 1190.00 212.0 0.535 0.298 0.000722 1.55e+03 136.0 0.0173 + 1200.00 194.0 0.490 0.294 0.000655 1.43e+03 125.0 0.0161 + 1210.00 177.0 0.447 0.290 0.000593 1.32e+03 114.0 0.0150 + 1220.00 161.0 0.408 0.286 0.000538 1.21e+03 104.0 0.0140 + 1230.00 147.0 0.372 0.283 0.000489 1.11e+03 94.8 0.0130 + 1240.00 134.0 0.338 0.279 0.000444 1.02e+03 86.3 0.0121 + 1250.00 121.0 0.307 0.275 0.000403 933.0 78.5 0.0112 + 1260.00 110.0 0.279 0.272 0.000367 853.0 71.3 0.0104 + 1270.00 99.8 0.253 0.268 0.000335 779.0 64.7 0.00970 + 1280.00 90.3 0.229 0.265 0.000305 710.0 58.6 0.00901 + 1290.00 81.6 0.207 0.262 0.000278 647.0 53.0 0.00838 + 1300.00 73.7 0.187 0.258 0.000254 588.0 47.9 0.00779 + 1310.00 66.5 0.169 0.255 0.000232 534.0 43.2 0.00724 + 1320.00 59.9 0.152 0.252 0.000212 485.0 39.0 0.00673 + 1330.00 53.9 0.137 0.249 0.000194 439.0 35.1 0.00626 + 1340.00 48.5 0.123 0.246 0.000178 397.0 31.6 0.00582 + 1350.00 43.5 0.111 0.243 0.000163 359.0 28.4 0.00541 + 1360.00 39.1 0.0995 0.240 0.000150 324.0 25.5 0.00503 + 1370.00 35.0 0.0892 0.237 0.000138 293.0 22.9 0.00469 + 1380.00 31.4 0.0800 0.234 0.000127 264.0 20.5 0.00436 + 1390.00 28.1 0.0716 0.231 0.000117 237.0 18.4 0.00406 + 1400.00 25.1 0.0641 0.229 0.000108 213.0 16.4 0.00379 + 1410.00 22.4 0.0573 0.226 9.93e-05 192.0 14.7 0.00353 + 1420.00 20.0 0.0512 0.223 9.17e-05 172.0 13.1 0.00329 + 1430.00 17.9 0.0457 0.221 8.48e-05 154.0 11.7 0.00307 + 1440.00 16.0 0.0408 0.218 7.85e-05 138.0 10.4 0.00287 + 1450.00 14.2 0.0364 0.216 7.28e-05 124.0 9.29 0.00268 + 1460.00 12.7 0.0325 0.214 6.75e-05 111.0 8.27 0.00250 1470.00 11.3 0.0289 0.211 6.27e-05 98.9 7.36 0.00234 1480.00 10.0 0.0258 0.209 5.83e-05 88.3 6.54 0.00219 1490.00 8.93 0.0229 0.207 5.42e-05 78.7 5.81 0.00205 1500.00 7.94 0.0204 0.204 5.05e-05 70.2 5.16 0.00192 - 1510.00 7.05 0.0182 0.202 4.70e-05 62.5 4.58 0.0018 - 1520.00 6.27 0.0161 0.2 4.39e-05 55.7 4.06 0.00169 + 1510.00 7.05 0.0182 0.202 4.70e-05 62.5 4.58 0.00180 + 1520.00 6.27 0.0161 0.200 4.39e-05 55.7 4.06 0.00169 1530.00 5.57 0.0144 0.198 4.10e-05 49.5 3.60 0.00159 - 1540.00 4.95 0.0128 0.196 3.83e-05 44.0 3.18 0.0015 + 1540.00 4.95 0.0128 0.196 3.83e-05 44.0 3.18 0.00150 1550.00 4.40 0.0114 0.194 3.58e-05 39.1 2.82 0.00141 1560.00 3.91 0.0101 0.192 3.35e-05 34.7 2.49 0.00133 - 1570.00 3.47 0.00899 0.19 3.14e-05 30.8 2.20 0.00125 - 1580.00 3.09 0.008 0.188 2.94e-05 27.3 1.95 0.00118 + 1570.00 3.47 0.00899 0.190 3.14e-05 30.8 2.20 0.00125 + 1580.00 3.09 0.00800 0.188 2.94e-05 27.3 1.95 0.00118 1590.00 2.75 0.00712 0.186 2.76e-05 24.2 1.72 0.00112 1600.00 2.44 0.00635 0.185 2.59e-05 21.4 1.52 0.00106 - 1610.00 2.18 0.00566 0.183 2.44e-05 19.0 1.34 0.001 + 1610.00 2.18 0.00566 0.183 2.44e-05 19.0 1.34 0.00100 1620.00 1.94 0.00505 0.181 2.29e-05 16.8 1.19 0.000948 - 1630.00 1.73 0.00451 0.179 2.16e-05 14.9 1.05 0.0009 + 1630.00 1.73 0.00451 0.179 2.16e-05 14.9 1.05 0.000900 1640.00 1.55 0.00404 0.177 2.04e-05 13.1 0.923 0.000855 1650.00 1.38 0.00362 0.176 1.92e-05 11.6 0.814 0.000814 1660.00 1.24 0.00324 0.174 1.81e-05 10.3 0.718 0.000775 - 1670.00 1.11 0.00292 0.173 1.71e-05 9.07 0.634 0.00074 + 1670.00 1.11 0.00292 0.173 1.71e-05 9.07 0.634 0.000740 1680.00 0.998 0.00263 0.171 1.62e-05 8.01 0.559 0.000706 - 1690.00 0.9 0.00237 0.169 1.53e-05 7.08 0.494 0.000675 + 1690.00 0.900 0.00237 0.169 1.53e-05 7.08 0.494 0.000675 1700.00 0.812 0.00214 0.168 1.45e-05 6.25 0.436 0.000647 - 1710.00 0.736 0.00195 0.166 1.38e-05 5.52 0.385 0.00062 - 1720.00 0.668 0.00177 0.165 1.31e-05 4.87 0.34 0.000595 + 1710.00 0.736 0.00195 0.166 1.38e-05 5.52 0.385 0.000620 + 1720.00 0.668 0.00177 0.165 1.31e-05 4.87 0.340 0.000595 1730.00 0.608 0.00161 0.163 1.24e-05 4.30 0.301 0.000572 - 1740.00 0.556 0.00148 0.162 1.18e-05 3.80 0.266 0.00055 - 1750.00 0.509 0.00136 0.161 1.12e-05 3.36 0.236 0.00053 + 1740.00 0.556 0.00148 0.162 1.18e-05 3.80 0.266 0.000550 + 1750.00 0.509 0.00136 0.161 1.12e-05 3.36 0.236 0.000530 1760.00 0.469 0.00125 0.159 1.07e-05 2.97 0.209 0.000512 1770.00 0.433 0.00116 0.158 1.02e-05 2.63 0.185 0.000494 1780.00 0.401 0.00108 0.156 9.71e-06 2.33 0.165 0.000478 - 1790.00 0.373 0.001 0.155 9.27e-06 2.06 0.147 0.000463 + 1790.00 0.373 0.00100 0.155 9.27e-06 2.06 0.147 0.000463 1800.00 0.349 0.000939 0.154 8.86e-06 1.83 0.131 0.000448 1810.00 0.327 0.000882 0.152 8.48e-06 1.62 0.117 0.000435 1820.00 0.308 0.000831 0.151 8.12e-06 1.44 0.105 0.000423 - 1830.00 0.291 0.000787 0.15 7.78e-06 1.28 0.0941 0.000411 - 1840.00 0.276 0.000747 0.149 7.46e-06 1.14 0.0847 0.0004 - 1850.00 0.262 0.000712 0.147 7.16e-06 1.02 0.0764 0.00039 + 1830.00 0.291 0.000787 0.150 7.78e-06 1.28 0.0941 0.000411 + 1840.00 0.276 0.000747 0.149 7.46e-06 1.14 0.0847 0.000400 + 1850.00 0.262 0.000712 0.147 7.16e-06 1.02 0.0764 0.000390 1860.00 0.251 0.000681 0.146 6.88e-06 0.914 0.0692 0.000381 - 1870.00 0.24 0.000653 0.145 6.62e-06 0.82 0.0629 0.000372 + 1870.00 0.240 0.000653 0.145 6.62e-06 0.820 0.0629 0.000372 1880.00 0.231 0.000629 0.144 6.37e-06 0.737 0.0573 0.000364 1890.00 0.222 0.000607 0.143 6.14e-06 0.665 0.0524 0.000356 1900.00 0.215 0.000587 0.142 5.92e-06 0.601 0.0481 0.000349 1910.00 0.208 0.000569 0.141 5.72e-06 0.545 0.0443 0.000342 - 1920.00 0.202 0.000553 0.139 5.52e-06 0.495 0.041 0.000335 + 1920.00 0.202 0.000553 0.139 5.52e-06 0.495 0.0410 0.000335 1930.00 0.197 0.000539 0.138 5.34e-06 0.452 0.0381 0.000329 1940.00 0.192 0.000526 0.137 5.17e-06 0.414 0.0355 0.000324 1950.00 0.188 0.000514 0.136 5.01e-06 0.381 0.0332 0.000318 1960.00 0.184 0.000503 0.135 4.85e-06 0.351 0.0312 0.000313 - 1970.00 0.18 0.000493 0.134 4.71e-06 0.325 0.0295 0.000309 + 1970.00 0.180 0.000493 0.134 4.71e-06 0.325 0.0295 0.000309 1980.00 0.177 0.000484 0.133 4.57e-06 0.303 0.0279 0.000304 - 1990.00 0.174 0.000476 0.132 4.44e-06 0.283 0.0265 0.0003 + 1990.00 0.174 0.000476 0.132 4.44e-06 0.283 0.0265 0.000300 2000.00 0.171 0.000469 0.131 4.32e-06 0.265 0.0252 0.000296 - 2010.00 0.168 0.000461 0.13 4.20e-06 0.249 0.0241 0.000292 + 2010.00 0.168 0.000461 0.130 4.20e-06 0.249 0.0241 0.000292 2020.00 0.166 0.000455 0.129 4.10e-06 0.235 0.0232 0.000289 2030.00 0.164 0.000449 0.128 3.99e-06 0.223 0.0223 0.000285 2040.00 0.162 0.000443 0.127 3.89e-06 0.212 0.0215 0.000282 - 2050.00 0.16 0.000437 0.127 3.80e-06 0.202 0.0208 0.000279 - 2060.00 0.158 0.00 0.126 3.71e-06 0.193 0.0201 0.000276 + 2050.00 0.160 0.000437 0.127 3.80e-06 0.202 0.0208 0.000279 + 2060.00 0.158 0.00 0.126 3.71e-06 0.193 0.0201 0.000276 diff --git a/tests/modules/testCONEX.cpp b/tests/modules/testCONEX.cpp index 299281f58fc2066d88ddf6901cd412e5c5e85829..d93542c5f48642d954a8b344a569bd5df31449bb 100644 --- a/tests/modules/testCONEX.cpp +++ b/tests/modules/testCONEX.cpp @@ -120,7 +120,7 @@ TEST_CASE("ConexOutput", "[output validation]") { SECTION(std::string("check saved data, ") + file + ".txt") { - // compare to binary reference data + // compare to reference data std::ifstream file1(file + ".txt"); std::ifstream file1ref(refDataDir + "/" + file + "_REF.txt"); @@ -129,7 +129,7 @@ TEST_CASE("ConexOutput", "[output validation]") { std::istreambuf_iterator<char> end; - while (begin1 != end && begin1ref != end) { + while (begin1 != end && begin1ref != end) { CHECK(*begin1 == *begin1ref); ++begin1; ++begin1ref;