diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 80e92a772..9ac0cbf3e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -532,31 +532,6 @@ jobs: cat $outfile pip install . # don't need icecube, so no docker container needed - - # -------------------------------------------------------------------- - # 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="2025-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..1acd2b81e 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 + 1048.1587421297838, + "", + "", + -159.47995701532338, + 210.04288726880264, + 23.86742310798023, + 31923.29600153164 ], [ 1, - 1079.0788843076734, - NaN, - NaN + 1079.078884227916, + "", + "", + -245.17802824420616, + 141.50070716694125, + 221.33241097186726, + 32393.17719225609 ], [ 2, - 1127.4074434034721, - NaN, - NaN + 1134.9910299573835, + "", + "", + 334.7432424069043, + 322.5510878653598, + 460.55733233257956, + 32691.023411225193 ], [ 3, - 1089.8543019687863, - NaN, - NaN + 1089.8543176865783, + "", + "", + -152.60541235319727, + 95.05712661988036, + 153.04050425530494, + 32706.139915879474 ], [ 4, - 1049.9445198407468, - NaN, - NaN + 1049.944539655825, + "", + "", + -214.9727664985283, + 239.7046974425789, + 197.28588857041296, + 32591.08553768096 ], [ 5, 1068.6341879665208, - NaN, - NaN + "", + "", + -476.0892747851045, + 313.60660153405433, + 308.8448087465392, + 32804.473565632885 ], [ 6, 1110.6678888455301, - NaN, - NaN + "", + "", + 38.54781958166542, + 521.1396182765375, + 201.97156283332467, + 31640.05037767647 ], [ 7, - 1227.878811273679, - NaN, - NaN + 1125.2372784404552, + "", + "", + -87.83000472704332, + 153.7822987367307, + 377.6461807071271, + 33581.86792460527 ], [ 8, - 1044.1316310736643, - NaN, - NaN + 1044.13164548172, + "", + "", + -143.2051439116106, + 236.1881757066859, + 311.89903754427485, + 31866.43476977145 ], [ 9, 1184.532089552924, - NaN, - NaN + "", + "", + -224.64617456930296, + 419.92624610407165, + -216.94044061994714, + 32214.34422288417 ], [ 10, 1121.4424378701983, - NaN, - NaN + "", + "", + 422.5625871113881, + 529.8847537128725, + -195.12432936498135, + 33009.955400588595 ], [ 11, - 1089.6827496407657, - NaN, - NaN + 1113.4950899300022, + "", + "", + -2.5228324073985666, + 63.02411919540087, + 136.8574651377062, + 32527.600177820048 ] ], "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..a84ace75d 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 + 1936.5132975784823, + "", + "", + 208.56705261252813, + -343.9585899645765, + -500.81325437533667, + 735541.0 ], [ 1, - 1931.1844667893647, - NaN, - NaN + 1931.1844505604631, + "", + "", + 200.01034921838487, + -685.957678470178, + -336.7436834862448, + 736208.5667332726 ], [ 2, - 1567.2479451418722, - NaN, - NaN + 1567.2499780226708, + "", + "", + 145.50896433664659, + -371.13868007376516, + -497.61151244154365, + 735541.0 ], [ 3, 1929.4600777409478, - NaN, - NaN + "", + "", + 170.05548045455885, + -326.20807354791, + -495.9590906120846, + 735541.0 ], [ 4, - 1940.6374669186366, - NaN, - NaN + 1946.370339743454, + "", + "", + 151.33763476665473, + -401.1204533802452, + -547.0344522232585, + 735221.8186431123 ], [ 5, - 1968.52132711062, - NaN, - NaN + 1970.0407529464658, + "", + "", + 408.73302730974046, + -286.6858598675637, + -106.62902069850206, + 735937.2471534929 ], [ 6, - 1933.8375225537582, - NaN, - NaN + 1933.8375396009906, + "", + "", + -23.118290299070992, + -854.7451800231473, + -191.9225976990758, + 736545.906616501 ], [ 7, - 1912.3561339385842, - NaN, - NaN + 1912.356141953777, + "", + "", + -434.7314448498812, + -14.040018875259234, + -196.09725636056817, + 736983.5041176272 ], [ 8, - 1976.813741609369, - NaN, - NaN + 1965.0589110633555, + "", + "", + 695.2372069059779, + -95.37451392428912, + -577.8384182228992, + 736129.4497665231 ], [ 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.5878379496125, + "", + "", + 179.3934828940751, + -295.9465590208314, + -444.465480755301, + 735648.356650415 ] ], "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..65035a6ad 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 + 1467.523371079977, + "", + "", + -491.51227215908, + -103.9713764030023, + -223.52631863696115, + 10930.347879835166 ], [ 1, 1434.4672900701603, - NaN, - NaN + "", + "", + -557.3597583512258, + 166.447653763029, + -102.37592465270774, + 11228.182414294384 ], [ 2, - 1426.2858180064006, - NaN, - NaN + 1426.28582376089, + "", + "", + -650.7817079639344, + -104.03792057123397, + -376.73551132730574, + 9695.718912213253 ], [ 3, - 1480.8566827909842, - NaN, - NaN + 1480.8569490687244, + "", + "", + -542.0586372365824, + -168.9124355053124, + -9.60059094580458, + 11945.674915634305 ], [ 4, - 1491.9724903598558, - NaN, - NaN + 1491.9725068836367, + "", + "", + -103.78258692287721, + -49.924548207741935, + 3.4143612235499887, + 9584.689483592758 ], [ 5, - 1402.3423831681112, - NaN, - NaN + 1414.6193479852807, + "", + "", + -237.31372820332786, + -87.486592237109, + -397.24339558208646, + 9958.515389656066 ], [ 6, - 1386.8448710011514, - NaN, - NaN + 1408.0870400916688, + "", + "", + -35.53322794469219, + 335.51754207813246, + -412.23228121831136, + 11634.970198663685 ], [ 7, - 1486.9105226062386, - NaN, - NaN + 1480.5754724911583, + "", + "", + -267.6162812415648, + 93.75789913605325, + -89.80836768583055, + 11822.445158295419 ], [ 8, - 1454.0937373282607, - NaN, - NaN + 1454.0937303906846, + "", + "", + -339.5052881408779, + -51.13280859670889, + -53.07047027757068, + 10020.60804030612 ], [ 9, - 1400.2536400862402, - NaN, - NaN + 1400.253658398364, + "", + "", + -452.070224206287, + -1.6695375885636103, + -204.21891486124343, + 10777.694078699691 ], [ 10, - 1438.317157681458, - NaN, - NaN + 1438.3172167819985, + "", + "", + -326.4275535968118, + -11.362248493001804, + -401.56877314188864, + 10895.783715270283 ], [ 11, - 1504.7339532097842, - NaN, - NaN + 1504.1690396750973, + "", + "", + -580.8998435245969, + -217.6401850597153, + -334.0368180499757, + 10028.130752921985 ] ], "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