diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index acb873923..9a1307ab3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -338,6 +338,13 @@ jobs: - 5672:5672 - 15672:15672 steps: + - uses: jlumbroso/free-disk-space@main + with: + tool-cache: 'true' + large-packages: false # TODO: remove once https://github.com/jlumbroso/free-disk-space/issues/4 is fixed + - uses: actionhippie/swap-space@v1 + with: + size: 10G - uses: actions/checkout@v3 - uses: docker/setup-buildx-action@v2 - uses: docker/build-push-action@v3 @@ -359,18 +366,8 @@ jobs: cd ./resources/launch_scripts ./local-scan.sh - - name: test output against known result (.npz/.json) + - name: test output against known result (.json) run: | - if [[ ${{ matrix.reco_algo }} == 'millipede_wilks' ]]; then - if [[ $(date +"%s") -gt 1695235370 ]]; then - echo "Date and time (GMT): Wednesday, September 20, 2023 18:42:50" - echo "tests should pass nowish, ping Tianlu about the ftp-v1 timing spline table fix" - exit 1 - else - exit 0 - fi - fi - ls $SKYSCAN_OUTPUT_DIR # get newest run*.json outfile=$(find $SKYSCAN_OUTPUT_DIR -type f -name "run*.json" -exec stat -c '%y %n' {} + | sort | tail -1 | awk '{print $4}') @@ -531,4 +528,4 @@ jobs: git_committer_email: ${{ env.BOT_EMAIL }} github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} # repository_username: __token__ - # repository_password: ${{ secrets.PYPI_TOKEN }} \ No newline at end of file + # repository_password: ${{ secrets.PYPI_TOKEN }} diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index 3d6d108a1..e4ac46835 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -26,13 +26,13 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.0 +ewms-pilot==0.12.2 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 healpy==1.15.0 htchirp==2.0 -htcondor==10.7.0 +htcondor==10.8.0 html5lib==1.1 humanfriendly==10.0 hypothesis==6.36.0 @@ -122,7 +122,7 @@ tables==3.7.0 toml==0.10.2 tornado==6.3.3 traitlets==5.1.1 -typing_extensions==4.7.1 +typing_extensions==4.8.0 ufoLib2==0.13.1 unicodedata2==14.0.0 UNKNOWN @ file:///root/nuflux-2.0.4 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index 570f0f526..c5d2f4583 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.0 +ewms-pilot==0.12.2 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 @@ -122,7 +122,7 @@ tables==3.7.0 toml==0.10.2 tornado==6.3.3 traitlets==5.1.1 -typing_extensions==4.7.1 +typing_extensions==4.8.0 ufoLib2==0.13.1 unicodedata2==14.0.0 UNKNOWN @ file:///root/nuflux-2.0.4 diff --git a/setup.cfg b/setup.cfg index bc598eb28..ca115999b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ branch = main [options] # generated by wipac:cicd_setup_builder: python_requires, packages install_requires = - ewms-pilot==0.12.0 # the extras here are the same as 'oms-mqclient', so just define one place + ewms-pilot==0.12.2 # the extras here are the same as 'oms-mqclient', so just define one place healpy icecube-skyreader iminuit diff --git a/skymap_scanner/client/reco_icetray.py b/skymap_scanner/client/reco_icetray.py index b2ef4f0c8..60048f22c 100644 --- a/skymap_scanner/client/reco_icetray.py +++ b/skymap_scanner/client/reco_icetray.py @@ -11,7 +11,7 @@ from pathlib import Path from typing import Any, List, Union -from I3Tray import I3Tray # type: ignore[import] +from icecube.icetray import I3Tray # type: ignore[import] from icecube import ( # type: ignore[import] # noqa: F401 dataio, frame_object_diff, diff --git a/skymap_scanner/recos/common/pulse_proc.py b/skymap_scanner/recos/common/pulse_proc.py index 554f9440a..5172d841c 100644 --- a/skymap_scanner/recos/common/pulse_proc.py +++ b/skymap_scanner/recos/common/pulse_proc.py @@ -1,8 +1,8 @@ import copy import numpy -from typing import Final, Union +from typing import Final, Union, List -from I3Tray import I3Units # type: ignore[import] +from icecube.icetray import I3Units # type: ignore[import] from icecube import dataclasses # type: ignore[import] @@ -77,3 +77,50 @@ def late_pulse_cleaning( frame[output_pulses_name + "TimeRange"] = copy.deepcopy( frame[orig_pulses_name + "TimeRange"] ) + + +def pulse_cleaning( + frame, + input_pulses_name: str, + output_pulses_name: str, + residual, +): + pulses = dataclasses.I3RecoPulseSeriesMap.from_frame(frame, input_pulses_name) + mask = dataclasses.I3RecoPulseSeriesMapMask(frame, input_pulses_name) + counter, charge = 0, 0 + qtot = 0 + times = dataclasses.I3TimeWindowSeriesMap() + all_ts: List[float] = [] + all_cs: List[float] = [] + for omkey, ps in pulses.items(): + ts = numpy.asarray([p.time for p in ps]) + all_ts.extend(ts) + cs = numpy.asarray([p.charge for p in ps]) + all_cs.extend(cs) + tw_start = weighted_quantile(numpy.asarray(all_ts), numpy.asarray(all_cs), 0.1) - 1000 + tw_stop = weighted_quantile(numpy.asarray(all_ts), numpy.asarray(all_cs), 0.95) + 1000 + for omkey, ps in pulses.items(): + ts = numpy.asarray([p.time for p in ps]) + cs = numpy.asarray([p.charge for p in ps]) + median = weighted_median(ts, cs) + dts = numpy.ediff1d(ts) + median_dts = numpy.median(dts) + qtot += cs.sum() + for p in ps: + if median_dts > 1200 and len(dts) > 1: + # attempt to mask out correlated noise + mask.set(omkey, p, False) + elif p.time >= (latest_time := min(median + residual, tw_stop)) or p.time < tw_start: + if omkey not in times: + tws = dataclasses.I3TimeWindowSeries() + tws.append( + dataclasses.I3TimeWindow(latest_time, numpy.inf) + ) # this defines the **excluded** time window + times[omkey] = tws + mask.set(omkey, p, False) + counter += 1 + charge += p.charge + + frame[output_pulses_name] = mask + frame[output_pulses_name + "TimeWindows"] = times + frame[output_pulses_name + "TimeRange"] = dataclasses.I3TimeWindow(tw_start, tw_stop) diff --git a/skymap_scanner/recos/common/vertex_gen.py b/skymap_scanner/recos/common/vertex_gen.py index 8bb3b0059..79ee1d803 100644 --- a/skymap_scanner/recos/common/vertex_gen.py +++ b/skymap_scanner/recos/common/vertex_gen.py @@ -3,7 +3,7 @@ import numpy as np from icecube import dataclasses # type: ignore[import] -from I3Tray import I3Units # type: ignore[import] +from icecube.icetray import I3Units # type: ignore[import] class VertexGenerator: diff --git a/skymap_scanner/recos/dummy.py b/skymap_scanner/recos/dummy.py index 2c19bc7ba..a753ffc09 100644 --- a/skymap_scanner/recos/dummy.py +++ b/skymap_scanner/recos/dummy.py @@ -6,7 +6,7 @@ import time from typing import List, Final -from I3Tray import I3Units # type: ignore[import] +from icecube.icetray import I3Units # type: ignore[import] from icecube import ( # type: ignore[import] # noqa: F401 dataclasses, frame_object_diff, diff --git a/skymap_scanner/recos/millipede_original.py b/skymap_scanner/recos/millipede_original.py index 7ca905395..2ef5cb34f 100644 --- a/skymap_scanner/recos/millipede_original.py +++ b/skymap_scanner/recos/millipede_original.py @@ -10,7 +10,7 @@ import numpy -from I3Tray import I3Units +from icecube.icetray import I3Units from icecube import ( # noqa: F401 VHESelfVeto, dataclasses, diff --git a/skymap_scanner/recos/millipede_wilks.py b/skymap_scanner/recos/millipede_wilks.py index bbac52bd0..ee3a970fd 100644 --- a/skymap_scanner/recos/millipede_wilks.py +++ b/skymap_scanner/recos/millipede_wilks.py @@ -10,7 +10,7 @@ from typing import Final, List, Tuple import numpy -from I3Tray import I3Units +from icecube.icetray import I3Units from icecube import ( # noqa: F401 VHESelfVeto, dataclasses, @@ -22,14 +22,14 @@ millipede, photonics_service, recclasses, - simclasses, + simclasses ) from icecube.icetray import I3Frame from .. import config as cfg from ..utils.pixel_classes import RecoPixelVariation from . import RecoInterface, VertexGenerator -from .common.pulse_proc import mask_deepcore, late_pulse_cleaning +from .common.pulse_proc import mask_deepcore, pulse_cleaning class MillipedeWilks(RecoInterface): """Reco logic for millipede.""" @@ -38,11 +38,13 @@ class MillipedeWilks(RecoInterface): FTP_ABS_SPLINE = "cascade_single_spice_ftp-v1_flat_z20_a5.abs.fits" FTP_PROB_SPLINE = "cascade_single_spice_ftp-v1_flat_z20_a5.prob.fits" FTP_EFFD_SPLINE = "cascade_effectivedistance_spice_ftp-v1_z20.eff.fits" + FTP_EFFP_SPLINE = "cascade_effectivedistance_spice_ftp-v1_z20.prob.fits" + FTP_TMOD_SPLINE = "cascade_effectivedistance_spice_ftp-v1_z20.tmod.fits" - SPLINE_REQUIREMENTS = [FTP_ABS_SPLINE, FTP_PROB_SPLINE, FTP_EFFD_SPLINE] + SPLINE_REQUIREMENTS = [FTP_ABS_SPLINE, FTP_PROB_SPLINE, FTP_EFFD_SPLINE, + FTP_EFFP_SPLINE, FTP_TMOD_SPLINE] # Constants ######################################################## - pulsesName_orig = cfg.INPUT_PULSES_NAME pulsesName = cfg.INPUT_PULSES_NAME + "IC" pulsesName_cleaned = pulsesName+'LatePulseCleaned' @@ -65,12 +67,16 @@ def setup_reco(self): abs_spline: str = datastager.get_filepath(self.FTP_ABS_SPLINE) prob_spline: str = datastager.get_filepath(self.FTP_PROB_SPLINE) effd_spline: str = datastager.get_filepath(self.FTP_EFFD_SPLINE) + effp_spline: str = datastager.get_filepath(self.FTP_EFFP_SPLINE) + tmod_spline: str = datastager.get_filepath(self.FTP_TMOD_SPLINE) self.cascade_service = photonics_service.I3PhotoSplineService( abs_spline, prob_spline, timingSigma=0.0, effectivedistancetable = effd_spline, tiltTableDir = os.path.expandvars('$I3_BUILD/ice-models/resources/models/ICEMODEL/spice_ftp-v1/'), - quantileEpsilon=1 + quantileEpsilon=1, + effectivedistancetableprob = effp_spline, + effectivedistancetabletmod = tmod_spline ) self.muon_service = None @@ -172,17 +178,17 @@ def skipunhits(frame, output, pulses): frame[output] = unhits - tray.Add(skipunhits, output='OtherUnhits', pulses=cls.pulsesName) - ExcludedDOMs.append('OtherUnhits') - ################## - - tray.AddModule(late_pulse_cleaning, "LatePulseCleaning", + tray.AddModule(pulse_cleaning, "LatePulseCleaning", input_pulses_name=cls.pulsesName, output_pulses_name=cls.pulsesName_cleaned, - orig_pulses_name=cls.pulsesName_orig, residual=1.5e3*I3Units.ns) - return ExcludedDOMs + [cls.pulsesName_cleaned+'TimeWindows'] + ExcludedDOMs.append(cls.pulsesName_cleaned+'TimeWindows') + + tray.Add(skipunhits, output='OtherUnhits', pulses=cls.pulsesName_cleaned) + ExcludedDOMs.append('OtherUnhits') + return ExcludedDOMs + @icetray.traysegment def traysegment(self, tray, name, logger, seed=None): @@ -207,7 +213,7 @@ def notify0(frame): Pulses=self.pulsesName_cleaned, BinSigma=2, MinTimeWidth=25, - RelUncertainty=0.3) + RelUncertainty=1) tray.AddService('I3GSLRandomServiceFactory','I3RandomService') diff --git a/skymap_scanner/recos/splinempe.py b/skymap_scanner/recos/splinempe.py index 92a781fb6..96fda512c 100644 --- a/skymap_scanner/recos/splinempe.py +++ b/skymap_scanner/recos/splinempe.py @@ -6,7 +6,7 @@ from typing import Final, List -from I3Tray import I3Units # type: ignore[import] +from icecube.icetray import I3Units # type: ignore[import] # NOTE: icecube module imports are required to make IceTray modules and services available. from icecube import ( # type: ignore[import] # noqa: F401 diff --git a/skymap_scanner/server/start_scan.py b/skymap_scanner/server/start_scan.py index c99659c7a..67aff6278 100644 --- a/skymap_scanner/server/start_scan.py +++ b/skymap_scanner/server/start_scan.py @@ -15,7 +15,7 @@ import healpy # type: ignore[import] import mqclient as mq import numpy -from I3Tray import I3Units # type: ignore[import] +from icecube.icetray import I3Units # type: ignore[import] from icecube import ( # type: ignore[import] astro, dataclasses, diff --git a/skymap_scanner/utils/prepare_frames.py b/skymap_scanner/utils/prepare_frames.py index 2545a3f26..f7155652a 100644 --- a/skymap_scanner/utils/prepare_frames.py +++ b/skymap_scanner/utils/prepare_frames.py @@ -9,7 +9,7 @@ import os from typing import Union, List -from I3Tray import I3Tray # type: ignore[import] +from icecube.icetray import I3Tray # type: ignore[import] from icecube import icetray # type: ignore[import] from icecube.frame_object_diff.segments import uncompress # type: ignore[import] diff --git a/tests/compare_scan_results.py b/tests/compare_scan_results.py index bb9fce91a..b0beb8d95 100644 --- a/tests/compare_scan_results.py +++ b/tests/compare_scan_results.py @@ -8,7 +8,7 @@ from skyreader import SkyScanResult from wipac_dev_tools import logging_tools -RTOL_PER_FIELD = {"llh": 0.18, "E_in": 0.7, "E_tot": 0.7} +RTOL_PER_FIELD = {"llh": 0.15, "E_in": 0.1, "E_tot": 0.1} def read_file(filepath: Path) -> SkyScanResult: diff --git a/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/pix.out.pkl b/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/pix.out.pkl index f81ffe8cb..3e9c09d51 100644 Binary files a/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/pix.out.pkl and b/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/pix.out.pkl differ diff --git a/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/out-ed65a85bfd0641919f6cd3df4a534bd3.pkl b/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/out-ed65a85bfd0641919f6cd3df4a534bd3.pkl index 336eac333..bd503802f 100644 Binary files a/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/out-ed65a85bfd0641919f6cd3df4a534bd3.pkl and b/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/out-ed65a85bfd0641919f6cd3df4a534bd3.pkl differ diff --git a/tests/data/reco_pixel_pkls/millipede_wilks/JSON/out-18a51be2fe3e41ca97be68a84dd892df.pkl b/tests/data/reco_pixel_pkls/millipede_wilks/JSON/out-18a51be2fe3e41ca97be68a84dd892df.pkl index b5f862f6d..3423b479e 100644 Binary files a/tests/data/reco_pixel_pkls/millipede_wilks/JSON/out-18a51be2fe3e41ca97be68a84dd892df.pkl and b/tests/data/reco_pixel_pkls/millipede_wilks/JSON/out-18a51be2fe3e41ca97be68a84dd892df.pkl differ diff --git a/tests/data/results_json/millipede_wilks/run00127907.evt000020178442.HESE_1.json b/tests/data/results_json/millipede_wilks/run00127907.evt000020178442.HESE_1.json index d4eedfb9a..674d2e568 100644 --- a/tests/data/results_json/millipede_wilks/run00127907.evt000020178442.HESE_1.json +++ b/tests/data/results_json/millipede_wilks/run00127907.evt000020178442.HESE_1.json @@ -7,77 +7,77 @@ "E_tot" ], "data": [ - [ + [ 0, - 333.8115059639348, - 8563.892342009616, - 8563.892342009616 + 126.38114632411437, + 5241.262194364837, + 5241.262194364837 ], [ 1, - 333.7291416388994, - 14753.6997025439, - 14753.6997025439 + 125.18614261171011, + 4770.901739386568, + 97317068489.0751 ], [ 2, - 324.54558625576686, - 7264.871600857262, - 10515.68731299288 + 120.5334856322618, + 4541.573130514726, + 4541.573130514726 ], [ 3, - 334.7846753468303, - 6598.2632814149565, - 7577.056152015813 + 127.51615963455372, + 5157.642800402355, + 5201.420713265329 ], [ 4, - 327.8656127148552, - 7229.275061582002, - 14185.14125705467 + 120.58305726767188, + 4179.421962017046, + 17697.095837204422 ], [ 5, - 325.29146978913224, - 9977.181123899314, - 7895763.342219342 + 125.55386417676894, + 5401.557410295537, + 5401.557410295537 ], [ 6, - 331.5395815324554, - 7454.208046150723, - 50303.60385834099 + 120.81547847480626, + 4470.270273289149, + 14979.397763776346 ], [ 7, - 324.70916170926915, - 11017.804391750058, - 18576754.509056866 + 124.2783280347043, + 5712.5845051136175, + 5712.5845051136175 ], [ 8, - 311.3694736493094, - 8137.554624196082, - 9797.958766249872 + 116.42702192317712, + 3800.472255088158, + 3800.472255088158 ], [ 9, - 324.84472870443784, - 6282.414244617621, - 964695010.097 + 125.83301174352532, + 4415.348401578086, + 4415.348401578086 ], [ 10, - 329.011384345754, - 7206.515271762042, - 7206.515271762042 + 124.16439913624171, + 4295.2972095867735, + 4295.2972095867735 ], [ 11, - 323.2556751592042, - 354786.45979516796, - 354786.45979516796 + 120.79128966342194, + 3607.4755539002545, + 4978041313.265813 ] ], "metadata": { @@ -89,4 +89,4 @@ "is_real_event": false } } -} \ No newline at end of file +} diff --git a/tests/data/results_json/millipede_wilks/run00136662.evt000035405932.neutrino_1.json b/tests/data/results_json/millipede_wilks/run00136662.evt000035405932.neutrino_1.json index ebc30bdcc..4c6492c8c 100644 --- a/tests/data/results_json/millipede_wilks/run00136662.evt000035405932.neutrino_1.json +++ b/tests/data/results_json/millipede_wilks/run00136662.evt000035405932.neutrino_1.json @@ -9,75 +9,75 @@ "data": [ [ 0, - 1545.8400104549182, + 1004.48026988896, 0.0, 0.0 ], [ 1, - 1970.208826812829, - 236192.35246055335, - 250087.7438833808 + 1267.1655838995944, + 12.59703641528351, + 72396936962.93512 ], [ 2, - 1729.5021261383893, - 19251670.03919484, - 19251670.03919484 + 1240.5014051330152, + 70169693.05732596, + 70169693.05732596 ], [ 3, - 1877.7270815289523, - 11941.150513694414, - 414839574.8511649 + 1285.4000519592587, + 1036.1553694450936, + 121766746632.06186 ], [ 4, - 1458.206250694135, - 156290.65052274425, - 1446490.7626548628 + 885.9409673160844, + 589563.2297666022, + 2892177.9076265353 ], [ 5, - 1738.7243757182262, - 0.0, - 0.0 + 899.2143212666816, + 314782.6563148461, + 4040195.2462747307 ], [ 6, - 1739.124090724066, - 486588.06684078655, - 486860.48571567057 + 1214.0005583446107, + 5420543.008139428, + 5422616.039253067 ], [ 7, - 1475.6155209271724, - 7998.549415788376, - 164849413.5862351 + 971.443099707949, + 3001.6761834696595, + 970939058.0200933 ], [ 8, - 1457.109346389954, - 433927.5762162365, - 433927.5762162365 + 949.1815391042028, + 6923584.314179762, + 6923584.314179762 ], [ 9, - 1868.6539912014223, - 6889.193972353964, - 234711224.21033812 + 1280.805716321421, + 0.0, + 9957944086.526676 ], [ 10, - 1918.4197455427764, - 0.0, - 0.0 + 1307.8127022454644, + 6046910.806898432, + 6240783.194212153 ], [ 11, - 1871.7735039205495, - 123612.76817305968, - 440732334.3108262 + 1289.2825767777463, + 12.881336652186679, + 60788056849.03612 ] ], "metadata": { @@ -89,4 +89,4 @@ "is_real_event": true } } -} \ No newline at end of file +} diff --git a/tests/data/results_json/millipede_wilks/run00136766.evt000007637140.neutrino_1.json b/tests/data/results_json/millipede_wilks/run00136766.evt000007637140.neutrino_1.json index 23812b6f8..e51675479 100644 --- a/tests/data/results_json/millipede_wilks/run00136766.evt000007637140.neutrino_1.json +++ b/tests/data/results_json/millipede_wilks/run00136766.evt000007637140.neutrino_1.json @@ -9,75 +9,75 @@ "data": [ [ 0, - 3168.832935410601, - 14904.353056321115, - 33112903.854202233 + 2236.0852490899024, + 14379.625917047306, + 1831216.1259640679 ], [ 1, - 2912.783352461024, - 0.0, - 0.0 + 2351.607779995118, + 156692.36727807156, + 156692.36727807156 ], [ 2, - 1169.8936462249574, - 22015.867591402104, - 42238.265056230084 + 966.0506139474076, + 13747.178780938762, + 14153.211690142853 ], [ 3, - 2932.6031794590554, - 78842.7575318918, - 598970.5617964783 + 2438.662664357953, + 90780.1579533567, + 90780.1579533567 ], [ 4, - 2541.9442983636127, - 12662.714561419283, - 390374.8658668274 + 1755.4454043709177, + 7976.31566038792, + 711711.9457682836 ], [ 5, - 3366.871469488516, - 156741.65379912523, - 232859.11103577947 + 2309.2657892016173, + 2044446.599015025, + 2080560.9446302163 ], [ 6, - 2835.9840831489305, - 30275.157147246835, - 66829.25962685159 + 1894.3263161405857, + 36856.52833684265, + 80529.74319232801 ], [ 7, - 3068.2473210643784, - 20311.19361235851, - 480251.6137087273 + 2373.6369809442676, + 66489.95678217073, + 79991.70271357206 ], [ 8, - 2931.3665841916254, - 30714.953099507515, - 4053925.680368716 + 1957.334633180752, + 85819.90337002686, + 4514311.304182041 ], [ 9, - 3335.046371824551, - 53331.85140614017, - 53331.85140614017 + 2498.435261844039, + 231854.39901606322, + 231854.39901606322 ], [ 10, - 3287.252921906848, - 76518.33326465017, - 180225.90341459936 + 2040.9405085587157, + 0.0, + 0.0 ], [ 11, - 2758.057382030177, - 13013.053734304685, - 2570155.5410982594 + 1870.963942484449, + 8334.942447299516, + 13449898.363858048 ] ], "metadata": { @@ -89,4 +89,4 @@ "is_real_event": true } } -} \ No newline at end of file +} diff --git a/tests/data/results_npz/millipede_original/run00127907.evt000020178442.HESE_1.npz b/tests/data/results_npz/millipede_original/run00127907.evt000020178442.HESE_1.npz deleted file mode 100644 index ee9751219..000000000 Binary files a/tests/data/results_npz/millipede_original/run00127907.evt000020178442.HESE_1.npz and /dev/null differ diff --git a/tests/data/results_npz/millipede_original/run00136662.evt000035405932.neutrino_1.npz b/tests/data/results_npz/millipede_original/run00136662.evt000035405932.neutrino_1.npz deleted file mode 100644 index 7f3dca03a..000000000 Binary files a/tests/data/results_npz/millipede_original/run00136662.evt000035405932.neutrino_1.npz and /dev/null differ diff --git a/tests/data/results_npz/millipede_original/run00136766.evt000007637140.neutrino_1.npz b/tests/data/results_npz/millipede_original/run00136766.evt000007637140.neutrino_1.npz deleted file mode 100644 index 8c98a968d..000000000 Binary files a/tests/data/results_npz/millipede_original/run00136766.evt000007637140.neutrino_1.npz and /dev/null differ diff --git a/tests/data/results_npz/millipede_wilks/run00127907.evt000020178442.HESE_1.npz b/tests/data/results_npz/millipede_wilks/run00127907.evt000020178442.HESE_1.npz deleted file mode 100644 index 9c3ddc9e4..000000000 Binary files a/tests/data/results_npz/millipede_wilks/run00127907.evt000020178442.HESE_1.npz and /dev/null differ diff --git a/tests/data/results_npz/millipede_wilks/run00136662.evt000035405932.neutrino_1.npz b/tests/data/results_npz/millipede_wilks/run00136662.evt000035405932.neutrino_1.npz deleted file mode 100644 index c3573fb24..000000000 Binary files a/tests/data/results_npz/millipede_wilks/run00136662.evt000035405932.neutrino_1.npz and /dev/null differ diff --git a/tests/data/results_npz/millipede_wilks/run00136766.evt000007637140.neutrino_1.npz b/tests/data/results_npz/millipede_wilks/run00136766.evt000007637140.neutrino_1.npz deleted file mode 100644 index 57842d187..000000000 Binary files a/tests/data/results_npz/millipede_wilks/run00136766.evt000007637140.neutrino_1.npz and /dev/null differ diff --git a/tests/data/results_npz/splinempe/run00136662.evt000035405932.neutrino_1.npz b/tests/data/results_npz/splinempe/run00136662.evt000035405932.neutrino_1.npz deleted file mode 100644 index d4c5eac68..000000000 Binary files a/tests/data/results_npz/splinempe/run00136662.evt000035405932.neutrino_1.npz and /dev/null differ diff --git a/tests/data/results_npz/splinempe/run00136766.evt000007637140.neutrino_1.npz b/tests/data/results_npz/splinempe/run00136766.evt000007637140.neutrino_1.npz deleted file mode 100644 index ac82061d5..000000000 Binary files a/tests/data/results_npz/splinempe/run00136766.evt000007637140.neutrino_1.npz and /dev/null differ diff --git a/tests/env-vars.sh b/tests/env-vars.sh index 187765625..1fcc9188a 100755 --- a/tests/env-vars.sh +++ b/tests/env-vars.sh @@ -5,11 +5,11 @@ set -ex # file is sourced so turn off at end # export SKYSCAN_OUTPUT_DIR=$PWD/output-dir -- rely on user value export SKYSCAN_BROKER_CLIENT=rabbitmq # note=auth env vars are in job(s) -export EWMS_PILOT_TASK_TIMEOUT=600 +export EWMS_PILOT_TASK_TIMEOUT=1800 # export SKYSCAN_DEBUG_DIR=debug-pkl-dir -- rely on user value export SKYSCAN_MQ_TIMEOUT_TO_CLIENTS=5 -# export SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS=60 # use default -export SKYSCAN_MQ_CLIENT_TIMEOUT_WAIT_FOR_FIRST_MESSAGE=120 +export SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS=1800 +# export SKYSCAN_MQ_CLIENT_TIMEOUT_WAIT_FOR_FIRST_MESSAGE=120 export SKYSCAN_DOCKER_PULL_ALWAYS=0 export SKYSCAN_DOCKER_IMAGE_TAG=local export SKYSCAN_MINI_TEST='yes' @@ -17,4 +17,4 @@ export SKYSCAN_LOG=DEBUG export SKYSCAN_LOG_THIRD_PARTY=INFO export CLIENT_STARTER_WAIT_FOR_STARTUP_JSON=120 -set +ex \ No newline at end of file +set +ex