diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ae8f8afe3..bb6241fca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -529,31 +529,6 @@ jobs: # don't need icecube, so no docker container needed. pip install . - - # -------------------------------------------------------------------- - # splinempe: special handling + gh-issue reminder timer - if [[ "${{ matrix.reco_algo }}" == "splinempe" ]]; then - python tests/compare_scan_results.py \ - --actual $outfile \ - --expected tests/data/results_json/${{ matrix.reco_algo }}/$(basename $outfile) \ - --assert \ - --compare-different-versions-ok \ - || (cat $(ls *.diff.json) && false) - - # put the timer after, so at least we know if the test passes - start_time="2026-11-7" # Set the starting date - end_time=$(date -d "$start_time +2 months" +%s) - current_time=$(date +%s) - if (( current_time >= end_time )); then - echo "::error::alarm went off, how's https://github.com/icecube/skymap_scanner/issues/242 going? Are version-0 result files still being used for splinempe?" - exit 1 - fi - - exit 0 - fi - # -------------------------------------------------------------------- - - python tests/compare_scan_results.py \ --actual $outfile \ --expected tests/data/results_json/${{ matrix.reco_algo }}/$(basename $outfile) \ diff --git a/resources/utils/comp_new_jsons.py b/resources/utils/comp_new_jsons.py index c9ea1d7a4..1815e443d 100644 --- a/resources/utils/comp_new_jsons.py +++ b/resources/utils/comp_new_jsons.py @@ -34,7 +34,6 @@ "--expected", files["expected"], "--assert", - "--compare-different-versions-ok", ] print(f"\n\nRunning: {' '.join(command)}") subprocess.check_call(command) diff --git a/tests/data/results_json/splinempe/run00136662.evt000035405932.neutrino_1.json b/tests/data/results_json/splinempe/run00136662.evt000035405932.neutrino_1.json index fc8614c6b..9fc16e97f 100644 --- a/tests/data/results_json/splinempe/run00136662.evt000035405932.neutrino_1.json +++ b/tests/data/results_json/splinempe/run00136662.evt000035405932.neutrino_1.json @@ -4,89 +4,143 @@ "index", "llh", "E_in", - "E_tot" + "E_tot", + "X", + "Y", + "Z", + "T" ], "data": [ [ 0, - 1046.7078636968658, - NaN, - NaN + 1059.4683331780977, + "", + "", + -99.13639597621479, + 262.4861935411528, + 140.22172199129255, + 31784.40487626459 ], [ 1, - 1079.0788843076734, - NaN, - NaN + 1091.202072755045, + "", + "", + -388.61518108868034, + 334.99539653020247, + 91.19654417105586, + 32472.6266733038 ], [ 2, - 1127.4074434034721, - NaN, - NaN + 1127.2719333203422, + "", + "", + 319.10259332041664, + 434.3549016913477, + 463.32383631025857, + 32658.946093996827 ], [ 3, - 1089.8543019687863, - NaN, - NaN + 1089.854310553774, + "", + "", + -133.43606263792805, + 73.84357813857838, + 178.69398316861196, + 32834.16704579206 ], [ 4, - 1049.9445198407468, - NaN, - NaN + 1059.7596027760685, + "", + "", + -346.5542000104591, + 294.5657116652535, + 9.641020312680707, + 32108.806549633737 ], [ 5, - 1068.6341879665208, - NaN, - NaN + 1047.6091949648608, + "", + "", + 117.45040216270648, + 154.8075964291544, + 190.83064616238195, + 31417.773246252436 ], [ 6, 1110.6678888455301, - NaN, - NaN + "", + "", + 38.54781958166542, + 521.1396182765375, + 201.97156283332467, + 31640.05037767647 ], [ 7, - 1227.878811273679, - NaN, - NaN + 1126.9882016660263, + "", + "", + 41.55815429501524, + 217.2845086251818, + 382.57471346732166, + 33581.5655002183 ], [ 8, - 1044.1316310736643, - NaN, - NaN + 1044.1316219784878, + "", + "", + -106.71407217055022, + 269.08027049164775, + 355.6505084326189, + 31646.864917921004 ], [ 9, - 1184.532089552924, - NaN, - NaN + 1165.85932814376, + "", + "", + 30.493650717529682, + -69.45102717788262, + 121.78384162574153, + 31800.233226938402 ], [ 10, - 1121.4424378701983, - NaN, - NaN + 1121.4424492323017, + "", + "", + 194.68639866197097, + 325.3636933557875, + 79.5027439197845, + 31638.010989220522 ], [ 11, - 1089.6827496407657, - NaN, - NaN + 1089.6828299849512, + "", + "", + -467.14575436247003, + 234.93985537928256, + 444.83971427409836, + 31921.30408850105 ] ], "metadata": { "nside": 1, + "complete": true, "run_id": 136662, "event_id": 35405932, "event_type": "neutrino", "mjd": 59723.32051140454, - "is_real_event": true + "is_real_event": true, + "version": 1 } } -} +} \ No newline at end of file diff --git a/tests/data/results_json/splinempe/run00136766.evt000007637140.neutrino_1.json b/tests/data/results_json/splinempe/run00136766.evt000007637140.neutrino_1.json index c5bf19ad2..6ed8e9338 100644 --- a/tests/data/results_json/splinempe/run00136766.evt000007637140.neutrino_1.json +++ b/tests/data/results_json/splinempe/run00136766.evt000007637140.neutrino_1.json @@ -4,89 +4,143 @@ "index", "llh", "E_in", - "E_tot" + "E_tot", + "X", + "Y", + "Z", + "T" ], "data": [ [ 0, - 1899.893825371186, - NaN, - NaN + 1899.8944908437952, + "", + "", + 261.4769613501107, + -337.7345232128269, + -430.32793916516977, + 735853.2261191674 ], [ 1, - 1931.1844667893647, - NaN, - NaN + 1931.184457858694, + "", + "", + 186.57890254837315, + -650.6099549124193, + -370.46523751078274, + 736039.4042789496 ], [ 2, - 1567.2479451418722, - NaN, - NaN + 1567.2499780226708, + "", + "", + 145.50896433664659, + -371.13868007376516, + -497.61151244154365, + 735541.0 ], [ 3, - 1929.4600777409478, - NaN, - NaN + 1929.4597033116443, + "", + "", + 123.49106806815175, + -204.1283745687375, + -378.7411675247662, + 736126.4057929106 ], [ 4, - 1940.6374669186366, - NaN, - NaN + 1940.6080972698353, + "", + "", + 260.537225775361, + -217.38283678010157, + -563.2982702707122, + 735836.2850255702 ], [ 5, - 1968.52132711062, - NaN, - NaN + 1968.5192296783848, + "", + "", + 585.1376036377835, + -366.4844681482791, + -105.74781049903848, + 736378.7252445936 ], [ 6, - 1933.8375225537582, - NaN, - NaN + 1933.837546412427, + "", + "", + -107.01516224382425, + -1041.5948682444987, + -192.37688245407608, + 737229.2783147543 ], [ 7, - 1912.3561339385842, - NaN, - NaN + 1963.719902916295, + "", + "", + -271.6911235911633, + 93.84810840163122, + -202.32515343600673, + 736199.5401977495 ], [ 8, - 1976.813741609369, - NaN, - NaN + 1965.0588987733988, + "", + "", + 642.4404473402506, + -115.61018149102347, + -527.4137012061295, + 735876.1039786942 ], [ 9, 1980.072677214685, - NaN, - NaN + "", + "", + 207.1948584036379, + -353.2421875798184, + -425.46369874176196, + 735541.0 ], [ 10, 1942.554642890675, - NaN, - NaN + "", + "", + 137.69636759301946, + -379.8121509332793, + -449.7897706514309, + 735541.0 ], [ 11, - 1943.2087745587921, - NaN, - NaN + 1961.5878640643762, + "", + "", + 187.9095134787326, + -318.41100582498416, + -423.00357896444234, + 735541.0 ] ], "metadata": { "nside": 1, + "complete": true, "run_id": 136766, "event_id": 7637140, "event_type": "neutrino", "mjd": 59754.67588432013, - "is_real_event": true + "is_real_event": true, + "version": 1 } } -} +} \ No newline at end of file diff --git a/tests/data/results_json/splinempe/run00138632.evt000031747601.neutrino_1.json b/tests/data/results_json/splinempe/run00138632.evt000031747601.neutrino_1.json index 32ec14388..c8d28f499 100644 --- a/tests/data/results_json/splinempe/run00138632.evt000031747601.neutrino_1.json +++ b/tests/data/results_json/splinempe/run00138632.evt000031747601.neutrino_1.json @@ -4,80 +4,132 @@ "index", "llh", "E_in", - "E_tot" + "E_tot", + "X", + "Y", + "Z", + "T" ], "data": [ [ 0, - 1462.8132539775477, - NaN, - NaN + 1479.8650319155026, + "", + "", + -196.9874378852723, + -30.932953192033892, + -288.50640273672775, + 10617.894287237628 ], [ 1, - 1434.4672900701603, - NaN, - NaN + 1434.4672661317866, + "", + "", + -484.41019913129367, + -150.36044479436603, + -392.1790753411187, + 9774.758296548875 ], [ 2, - 1426.2858180064006, - NaN, - NaN + 1426.285770964141, + "", + "", + -475.6646559157318, + -63.10275052842362, + -216.42440781631956, + 10499.153011957413 ], [ 3, - 1480.8566827909842, - NaN, - NaN + 1480.8569490687244, + "", + "", + -542.0586372365824, + -168.9124355053124, + -9.60059094580458, + 11945.674915634305 ], [ 4, - 1491.9724903598558, - NaN, - NaN + 1492.045122291672, + "", + "", + -260.02505977351854, + -312.4882038553618, + -3.5658650495896733, + 10429.46333486348 ], [ 5, - 1402.3423831681112, - NaN, - NaN + 1414.619325749307, + "", + "", + -452.53128696938114, + 46.695236274428865, + -397.25496351646785, + 10804.324770701196 ], [ 6, - 1386.8448710011514, - NaN, - NaN + 1406.3769935937896, + "", + "", + -410.2371472740441, + -41.21825591825976, + -415.4613231865643, + 10108.733211829858 ], [ 7, - 1486.9105226062386, - NaN, - NaN + 1486.9105285334913, + "", + "", + -166.88234085857346, + -151.1075948125466, + -78.71749329092373, + 11386.750793851583 ], [ 8, - 1454.0937373282607, - NaN, - NaN + 1454.093740488294, + "", + "", + -329.40624489599827, + -48.76834055798798, + -43.84863820070983, + 9974.26870460731 ], [ 9, - 1400.2536400862402, - NaN, - NaN + 1400.2536310969322, + "", + "", + -447.8010778685832, + -19.90639879624025, + -187.45225125579174, + 10694.021839880388 ], [ 10, - 1438.317157681458, - NaN, - NaN + 1438.3172263517545, + "", + "", + -592.9007310471434, + -72.88020050030225, + -156.01312496950874, + 9670.2371039465 ], [ 11, - 1504.7339532097842, - NaN, - NaN + 1504.1442131819967, + "", + "", + -575.3013338743319, + -245.54900923947207, + -361.32448285985777, + 10170.061441424208 ] ], "metadata": { @@ -87,7 +139,8 @@ "event_id": 31747601, "event_type": "neutrino", "mjd": 60280.71416774572, - "is_real_event": true + "is_real_event": true, + "version": 1 } } -} +} \ No newline at end of file diff --git a/tests/data/results_json/splinempe_pointed/run00136662.evt000035405932.neutrino_1.json b/tests/data/results_json/splinempe_pointed/run00136662.evt000035405932.neutrino_1.json index 956cf8754..e272cbbf3 100644 --- a/tests/data/results_json/splinempe_pointed/run00136662.evt000035405932.neutrino_1.json +++ b/tests/data/results_json/splinempe_pointed/run00136662.evt000035405932.neutrino_1.json @@ -14,8 +14,8 @@ [ 8, 1044.1316225136054, - NaN, - NaN, + "", + "", -166.714006041685, 214.91395846951315, 283.57001836616763, @@ -33,4 +33,4 @@ "version": 1 } } -} +} \ No newline at end of file diff --git a/tests/data/results_json/splinempe_pointed/run00136766.evt000007637140.neutrino_1.json b/tests/data/results_json/splinempe_pointed/run00136766.evt000007637140.neutrino_1.json index 6eebdb747..1ea16abd8 100644 --- a/tests/data/results_json/splinempe_pointed/run00136766.evt000007637140.neutrino_1.json +++ b/tests/data/results_json/splinempe_pointed/run00136766.evt000007637140.neutrino_1.json @@ -1,4 +1,4 @@ - { +{ "nside-1": { "columns": [ "index", @@ -14,8 +14,8 @@ [ 2, 1567.2499780226708, - NaN, - NaN, + "", + "", 145.50896433664659, -371.13868007376516, -497.61151244154365, @@ -33,4 +33,4 @@ "version": 1 } } -} +} \ No newline at end of file diff --git a/tests/data/results_json/splinempe_pointed/run00138632.evt000031747601.neutrino_1.json b/tests/data/results_json/splinempe_pointed/run00138632.evt000031747601.neutrino_1.json index 2e5d69db8..75b911c02 100644 --- a/tests/data/results_json/splinempe_pointed/run00138632.evt000031747601.neutrino_1.json +++ b/tests/data/results_json/splinempe_pointed/run00138632.evt000031747601.neutrino_1.json @@ -14,8 +14,8 @@ [ 6, 1370.4553241836998, - NaN, - NaN, + "", + "", -405.4612185250339, -82.38619873570633, -116.24934043253937, @@ -33,4 +33,4 @@ "version": 1 } } -} +} \ No newline at end of file