athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T14:32:54+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70186MuonTesterTree - Fix linker error2024-03-28T14:32:54+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonTesterTree - Fix linker errorCloses ATLASRECTS-7946Closes ATLASRECTS-7946https://gitlab.cern.ch/atlas/athena/-/merge_requests/70181Fix bug in han configuration merging2024-03-28T11:30:32+01:00Peter OnyisiFix bug in han configuration mergingFix issue introduced in !69798 (without this fix offline DQ configurations will not be built properly)Fix issue introduced in !69798 (without this fix offline DQ configurations will not be built properly)https://gitlab.cern.ch/atlas/athena/-/merge_requests/70108Remove nullptr initialiser that causes a crashing2024-03-26T14:38:23+01:00Rui ZhangRemove nullptr initialiser that causes a crashingRemove nullptr initialiser that causes a crashing when setting SetInterOpNumThreads/SetIntraOpNumThreads Subsequent merge of [!69945 (merged)](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69945 "Prevent ONNX from spawning additio...Remove nullptr initialiser that causes a crashing when setting SetInterOpNumThreads/SetIntraOpNumThreads Subsequent merge of [!69945 (merged)](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69945 "Prevent ONNX from spawning additional threads").
```plaintext
Prevent ONNX from spawning additional threads in the FastCaloSim implementation.
Should fix ATLASSIM-7146 (and potentially ATLASSIM-7031 ?)
```
fyi @zhangr @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70101Fix FPGASim workflow test to use input RDO from CVMFS2024-03-27T19:37:25+01:00Tomasz BoldFix FPGASim workflow test to use input RDO from CVMFSCloses EFTRACK-504
This MR improves FPGASim testing scriptCloses EFTRACK-504
This MR improves FPGASim testing scripthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70077Revert merge request !69655 (ATLSWUPGR-242)2024-03-25T14:46:45+01:00John Derek ChapmanRevert merge request !69655 (ATLSWUPGR-242)Merge request !69655 causes unintended output changes in some ART tests: ATLSWUPGR-242
Therefore reverting for now to allow me to do some further testing/tweaking of the changes before reintroducing them.Merge request !69655 causes unintended output changes in some ART tests: ATLSWUPGR-242
Therefore reverting for now to allow me to do some further testing/tweaking of the changes before reintroducing them.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70025Update to Gaudi v38r0.0012024-03-25T16:45:17+01:00Frank WinklmeierUpdate to Gaudi v38r0.001A very minor patch to our current Gaudi version. Changes compared to v38r0.000 (see [diff](https://gitlab.cern.ch/atlas/Gaudi/-/compare/v38r0.000...v38r0.001?from_project_id=6676&straight=false)):
- New `maxParallelismExtra` property in...A very minor patch to our current Gaudi version. Changes compared to v38r0.000 (see [diff](https://gitlab.cern.ch/atlas/Gaudi/-/compare/v38r0.000...v38r0.001?from_project_id=6676&straight=false)):
- New `maxParallelismExtra` property in `AvalancheSchedulerSvc` to adjust the maximum TBB parallelism ( gaudi/Gaudi!1567)
This is required for the new async I/O HltEventLoopMgr ( ATR-26285) to be usable at Point-1. The default behavior is unchanged.
cc @ssottoco @leggetthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69970Disable ONNXRuntime CUDA Support, 24.0 branch (2024.03.20.)2024-03-21T15:21:43+01:00Attila KrasznahorkayDisable ONNXRuntime CUDA Support, 24.0 branch (2024.03.20.)Disabled CUDA support for [ONNXRuntime](https://github.com/microsoft/onnxruntime) on all platforms.
After the recent update to CUDA 12.4 in the ~main branch, as discussed in ATLINFR-5283, the flag for disabling this CUDA support with GC...Disabled CUDA support for [ONNXRuntime](https://github.com/microsoft/onnxruntime) on all platforms.
After the recent update to CUDA 12.4 in the ~main branch, as discussed in ATLINFR-5283, the flag for disabling this CUDA support with GCC 13 was removed from the CI for both ~main and ~"24.0". In the past this flag was set in the build system, since on CentOS 7, with GCC 11, we did want to have CUDA support enabled.
But since we're only using a single platform for ~24.0, we can disable CUDA support globally like this instead. :thinking: (It will be re-enabled in ~main after we make all clients compatible with a newer version of ONNXRuntime. Long story...)
Note that this is responsible for warnings in some recent CI builds, like: !69963. So the sooner it goes in, the sooner the warnings will disappear. :wink:https://gitlab.cern.ch/atlas/athena/-/merge_requests/69896JpsiUpsilonTools: Fix to skip GSF J/psi tracks (originally worked only for ID...2024-03-25T11:04:21+01:00Tomas JakoubekJpsiUpsilonTools: Fix to skip GSF J/psi tracks (originally worked only for ID tracks).In the BLS package JpsiUpsilonTools, there are two places where we want to skips ID TrackParticles if these are used to build a J/psi candidate. However, we use GSF TrackParticles for electrons and the "simple" (original) comparison didn...In the BLS package JpsiUpsilonTools, there are two places where we want to skips ID TrackParticles if these are used to build a J/psi candidate. However, we use GSF TrackParticles for electrons and the "simple" (original) comparison didn't work for them, leading to e.g. Bd-meson candidate (should be 4 different TracksParticles) built from 2 GSF TrackParticles + their 2 original ID TrackParticles.
The fix uses already defined property UseGSFTrackIndices, thus no change in a setup is needed.
This fix is crucial for BPHY18 (R(K*) analaysis), where it removes these spoiled Bd/BdBar candidates (which makes the DAOD smaller). It does NOT affect any other derivation/analysis or any default behaviour.Tomas JakoubekTomas Jakoubekhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69882TrigEFMissingET: add missing ROOT find package call2024-03-20T15:24:32+01:00Frank WinklmeierTrigEFMissingET: add missing ROOT find package callAdd missing `ROOT` find package call to fix [CPack installation warning](http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/PRODUCTIONWebArea/ardoc_web_area24064BE9G13AthenaOpt/ARDOC_Log_2024-03-17T2101/ardoc_c...Add missing `ROOT` find package call to fix [CPack installation warning](http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/PRODUCTIONWebArea/ardoc_web_area24064BE9G13AthenaOpt/ARDOC_Log_2024-03-17T2101/ardoc_cpack_combined.html#pb1083).https://gitlab.cern.ch/atlas/athena/-/merge_requests/69844Solve compilation issue in gcc11 due to struct2024-03-15T13:21:25+01:00Carlo Varnicarlo.varni@cern.chSolve compilation issue in gcc11 due to structThis solves a compilation failure in the `gcc11/centos7` nightly.This solves a compilation failure in the `gcc11/centos7` nightly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69800OnTrackCalibrator: Add missing 'typename'2024-03-14T20:01:55+01:00Louis-Guillaume Gagnonlouis.guillaume.gagnon@cern.chOnTrackCalibrator: Add missing 'typename'!69716 broke the centos7-gcc11 nightly because of a missing `typename`. This MR fixes it.
c.f. https://gitlab.cern.ch/atlas/athena/-/merge_requests/69716#note_7725951!69716 broke the centos7-gcc11 nightly because of a missing `typename`. This MR fixes it.
c.f. https://gitlab.cern.ch/atlas/athena/-/merge_requests/69716#note_7725951https://gitlab.cern.ch/atlas/athena/-/merge_requests/69766Update BPHY252024-03-14T16:15:10+01:00Xin ChenUpdate BPHY25Updated BPHY25 in release 21.2 with two major things:
1) Adding V0 daughters' momenta without mass constraint to the V0 vertex (before mass-constrained refit) as decorations.
2) Removing Jpsi subvertex in the cascade tree since Jpsi is n...Updated BPHY25 in release 21.2 with two major things:
1) Adding V0 daughters' momenta without mass constraint to the V0 vertex (before mass-constrained refit) as decorations.
2) Removing Jpsi subvertex in the cascade tree since Jpsi is not long-lived, although it is not technically wrong (but should better make it correct physics-wise according to Vadim).
And some other code tidy-up.Xin ChenXin Chenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69765TauAnalysisTools: change default truth jet container in tau truth matching2024-03-13T17:06:35+01:00Bertrand Martin Dit LatourTauAnalysisTools: change default truth jet container in tau truth matchingHello,
This MR is changing the default truth jet container used for tau truth matching from `AntiKt4TruthJets` to `AntiKt4TruthDressedWZJets`, as the latter is much more widely used.
It's a follow-up of !68328 .
This will hopefully fix ...Hello,
This MR is changing the default truth jet container used for tau truth matching from `AntiKt4TruthJets` to `AntiKt4TruthDressedWZJets`, as the latter is much more widely used.
It's a follow-up of !68328 .
This will hopefully fix the AnalysisAlgorithmsConfig ctest failure.
Not sure what the test was doing so far... it was also using the wrong container, but maybe the use of data handles creates a louder error.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69705Manual sweep of !69641 from main to 24.0: Obtain smallest run which has not y...2024-03-13T12:00:23+01:00John Derek ChapmanManual sweep of !69641 from main to 24.0: Obtain smallest run which has not yet been released for Tier-0 bulk and current online run from web serviceManual sweep of !69641 from main to 24.0: Obtain smallest run which has not yet been released for Tier-0 bulk and current online run from web service
See merge request atlas/athena!69641
(cherry picked from commit cd5c691043cf18cdcfd00...Manual sweep of !69641 from main to 24.0: Obtain smallest run which has not yet been released for Tier-0 bulk and current online run from web service
See merge request atlas/athena!69641
(cherry picked from commit cd5c691043cf18cdcfd003f8ae4a3604db4f426d)
7aa8d7f6 Obtain smallest run which has not yet been released for Tier-0 bulk and...
81276b13 fixed warning in compilationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69688Decouple 24.0 and main references2024-03-13T12:00:23+01:00Tadej Novaktadej.novak@cern.chDecouple 24.0 and main referencesDecouple ~24.0 and ~main references.
It is important this is NOT swept into ~main (/cc @wlampl).
/cc @ahabouel @dtaDecouple ~24.0 and ~main references.
It is important this is NOT swept into ~main (/cc @wlampl).
/cc @ahabouel @dtahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69661added ZBTopo to L1excluded thresholds (ATR-28938)2024-03-08T23:01:52+01:00Francesca Pastoreadded ZBTopo to L1excluded thresholds (ATR-28938)fix for trigger operation, see e-log: https://atlasop.cern.ch/elisa/display/536933 and related JIRA
tagging @shanischfix for trigger operation, see e-log: https://atlasop.cern.ch/elisa/display/536933 and related JIRA
tagging @shanischhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69587DQ sqlalchemy fixes backport (APR-130)2024-03-07T20:51:17+01:00Peter OnyisiDQ sqlalchemy fixes backport (APR-130)Backport oracle fixes from mainBackport oracle fixes from mainhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69563Fix for error "No TOBs found passing the threshold NSWMon" (ATR-28915)2024-03-06T19:09:12+01:00Francesca PastoreFix for error "No TOBs found passing the threshold NSWMon" (ATR-28915)added NSWMon as excluded L1 thresholds in HLTSeeding
@sfrancesadded NSWMon as excluded L1 thresholds in HLTSeeding
@sfranceshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69485Avoid triggering ROOT #14156 (APR-130)2024-03-06T00:27:10+01:00Peter OnyisiAvoid triggering ROOT #14156 (APR-130)Do not do str(obj) in PyROOT, this will trigger a memory exhaustion
See: https://github.com/root-project/root/issues/14156Do not do str(obj) in PyROOT, this will trigger a memory exhaustion
See: https://github.com/root-project/root/issues/14156https://gitlab.cern.ch/atlas/athena/-/merge_requests/69481fix skip test if file not present, for 24.02024-03-06T00:27:10+01:00Tadej Novaktadej.novak@cern.chfix skip test if file not present, for 24.0fix skip test if file not present
Closes ATLASRECTS-7925
See merge request atlas/athena!69446
(cherry picked from commit d6d150a8befe748bee197d6f7717d286fbe5a22e)
469fdd30 skip test if file not present
d908f92a use default test filefix skip test if file not present
Closes ATLASRECTS-7925
See merge request atlas/athena!69446
(cherry picked from commit d6d150a8befe748bee197d6f7717d286fbe5a22e)
469fdd30 skip test if file not present
d908f92a use default test file