sweep of infrastructure and CP algorithm updates from master to 21.2
This should hopefully bring 21.2 in line with master.
List of commits swept:
- d8e73fd2 track systematics through the SystematicsSvc
- b2647bf9 switch SysCopyHandle to SysReadHandle when used with Sys*DecorHandle
- c1f27376 SysListDumperAlg, fix clang compilation error: decltype(auto) cannot be combined with other type specifiers
- 79002160 switch to using SysListHandle::systematicsVector() instead of for-each
- 59672b20 fix dictionary warnings in EventLoop CP algorithm jobs
- 0d906745 add AnaAlgorithm::endInputFile()
- d63a10df AsgMessaging: add missing ATH_MSG macro
- 315163bf fix for python3 print command
I also removed some tests that were removed in master already and are no longer needed.
Merge request reports
Activity
This merge request affects 16 packages:
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SelectionHelpers
- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoopGrid
Affected files list will not be printed in this case
Adding @zmarshal ,@fsforza ,@duperrin ,@mleblanc ,@krumnack ,@oducu ,@maklein ,@pagessin ,@szambito ,@stavrop ,@jojungge ,@mvanadia ,@gartoni ,@dguest ,@tadej ,@yoyamagu ,@ssnyder ,@lidiaz as watchers
CI Result FAILURE (hash c4fe41de)AthDerivation externals cmake make required tests optional tests Full details available on this CI monitor view
AthDerivation: number of compilation errors 2, warnings 186
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 1071]added 9 commits
- fcd596d3 - track systematics through the SystematicsSvc
- 869a1af1 - switch SysCopyHandle to SysReadHandle when used with Sys*DecorHandle
- 2ec7b18f - SysListDumperAlg, fix clang compilation error: decltype(auto) cannot be...
- b62f2674 - switch to using SysListHandle::systematicsVector() instead of for-each
- 687bf5ac - fix dictionary warnings in EventLoop CP algorithm jobs
- 19553248 - add AnaAlgorithm::endInputFile()
- f3622915 - AsgMessaging: add missing ATH_MSG macro
- b3929dbb - fix for python3 print command
- e76d98a1 - remove out-dated systematics handle tests
Toggle commit listThis merge request affects 16 packages:
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SelectionHelpers
- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoopGrid
Affected files list will not be printed in this case
Adding @zmarshal ,@fsforza ,@duperrin ,@mleblanc ,@krumnack ,@oducu ,@maklein ,@pagessin ,@szambito ,@stavrop ,@jojungge ,@mvanadia ,@gartoni ,@dguest ,@tadej ,@yoyamagu ,@ssnyder ,@lidiaz as watchers
This merge request affects 16 packages:
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SelectionHelpers
- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoopGrid
Affected files list will not be printed in this case
Adding @zmarshal ,@fsforza ,@duperrin ,@mleblanc ,@krumnack ,@oducu ,@maklein ,@pagessin ,@szambito ,@stavrop ,@jojungge ,@mvanadia ,@gartoni ,@dguest ,@tadej ,@yoyamagu ,@ssnyder ,@lidiaz as watchers
This merge request affects 16 packages:
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SelectionHelpers
- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoopGrid
Affected files list will not be printed in this case
Adding @zmarshal ,@fsforza ,@duperrin ,@mleblanc ,@krumnack ,@oducu ,@maklein ,@pagessin ,@szambito ,@stavrop ,@jojungge ,@mvanadia ,@gartoni ,@dguest ,@tadej ,@yoyamagu ,@ssnyder ,@lidiaz as watchers
CI Result FAILURE (hash e76d98a1)AnalysisBase AthAnalysis externals cmake make required tests optional tests Full details available on this CI monitor view
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39838] CI Result FAILURE (hash e76d98a1)AthDerivation externals cmake make required tests optional tests Full details available on this CI monitor view
AthDerivation: number of compilation errors 1, warnings 159
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 1075] CI Result FAILURE (hash e76d98a1)AnalysisBase AthAnalysis externals cmake make required tests optional tests Full details available on this CI monitor view
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39856] CI Result FAILURE (hash e76d98a1)AthDerivation externals cmake make required tests optional tests Full details available on this CI monitor view
AthDerivation: number of compilation errors 1, warnings 157
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 1076]This merge request affects 16 packages:
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SelectionHelpers
- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoopGrid
Affected files list will not be printed in this case
Adding @zmarshal ,@fsforza ,@duperrin ,@mleblanc ,@krumnack ,@oducu ,@maklein ,@pagessin ,@szambito ,@stavrop ,@jojungge ,@mvanadia ,@gartoni ,@dguest ,@tadej ,@yoyamagu ,@ssnyder ,@lidiaz as watchers
CI Result SUCCESS (hash e76d98a1)AnalysisBase AthAnalysis externals cmake make required tests optional tests Full details available on this CI monitor view
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39878]added 9 commits
- e3f9ef9e - remove out-dated systematics handle tests
- e7e87ac0 - track systematics through the SystematicsSvc
- 13fb76bd - switch SysCopyHandle to SysReadHandle when used with Sys*DecorHandle
- 82ac5393 - SysListDumperAlg, fix clang compilation error: decltype(auto) cannot be...
- 4c9379d1 - switch to using SysListHandle::systematicsVector() instead of for-each
- 8476fca7 - fix dictionary warnings in EventLoop CP algorithm jobs
- 63e70b94 - add AnaAlgorithm::endInputFile()
- 7f870db5 - AsgMessaging: add missing ATH_MSG macro
- 12769b9d - fix for python3 print command
Toggle commit listThis merge request affects 16 packages:
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SelectionHelpers
- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoopGrid
Affected files list will not be printed in this case
Adding @zmarshal ,@fsforza ,@duperrin ,@mleblanc ,@krumnack ,@oducu ,@maklein ,@pagessin ,@szambito ,@stavrop ,@jojungge ,@mvanadia ,@gartoni ,@dguest ,@tadej ,@yoyamagu ,@ssnyder ,@lidiaz as watchers
CI Result SUCCESS (hash 12769b9d)AthDerivation externals cmake make required tests optional tests Full details available on this CI monitor view
AthDerivation: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 1078] CI Result SUCCESS (hash 12769b9d)AnalysisBase AthAnalysis externals cmake make required tests optional tests Full details available on this CI monitor view
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39891]This merge request affects 16 packages:
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SelectionHelpers
- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoopGrid
Affected files list will not be printed in this case
Adding @zmarshal ,@fsforza ,@duperrin ,@mleblanc ,@krumnack ,@oducu ,@maklein ,@pagessin ,@szambito ,@stavrop ,@jojungge ,@mvanadia ,@gartoni ,@dguest ,@tadej ,@yoyamagu ,@ssnyder ,@lidiaz as watchers
CI Result SUCCESS (hash 12769b9d)AnalysisBase AthAnalysis externals cmake make required tests optional tests Full details available on this CI monitor view
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39922] CI Result SUCCESS (hash 12769b9d)AthDerivation externals cmake make required tests optional tests Full details available on this CI monitor view
AthDerivation: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 1079]Hi @krumnack, I guess you'll have to check if your changes affect derivations locally as the test is not that verbose...
added review-user-action-required label and removed review-pending-level-1 label
It looks like it is just the optional test that fails. If we happen to have an older file to compare with at the time you run the CI test and some variables were removed/added, this test will fail.
WARNING the following variables exist only in the old file !
- thus some variables *TrackJetsAuxDyn, *TrackAuxDyn, *JetsAux *TopoAux and so on have been removed - but I am not sure if those are used in derivations anywhere. Perhaps @calpigia knows more about these?
Hi!
I haven't checked all variables, but for sure some are certainly used (e.g. "GhostHBosons", see here https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT4ContentList.py), but the container is "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903" rather than "AntiKtVR30Rmax4Rmin02TrackJets", which is causing the diff error. The same for another random variable I picked up, "Split23", and the container is not "AntiKt4TruthJets" but rather "AntiKt10TruthJets" (see https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent.py)
Cristiano
added review-pending-level-1 label and removed review-user-action-required label
added review-approved label and removed review-pending-level-1 label
Hi All,
Cristiano has run the optional test localy today and it was successful. We also got an updated DAOD_PHYSVAL.pool.root file under /eos/atlas/atlascerngroupdisk/data-art/grid-input/DerivationFrameworkART/ci-reference-files/mc/ this morning since we had a build of 21.2 last night, thus I think we can proceed to put this MR in.
@krumnack do you want to merge it or should I? I see a merge error occured... not sure if you tried yesterday to add it or not?
mentioned in commit 6b724d6a
added sweep:ignore label