sweep updates to central AnalysisBase packages from master to 21.2
This collects a variety of updates from master and applies them to 21.2. It should hopefully just update the central packages, and I had to make a couple of changes to work in 21.2. I did not apply the updates to AnaToolHandle
that would require all tools to have dictionaries defined. I should probably be better at doing regular sweeps in order to avoid these giant sweeps.
The main point of this update is that it replaces SysListLoaderAlg
with SystematicsSvc
, so that this change can be used in the upcoming tutorial. This is a non-backwards compatible change, and all users of the common CP algorithms will have to update their job options/steering files accordingly.
- 70b45f15 AsgServices add ATLAS_CHECK_THREAD_SAFETY. 1st it passes it . 2nd we inherit now from it for code to be used in Athena production
- c10a469c change handling of sub-tools, allow configuring ToolHandleArray properties
- 77631e7b introduce StandaloneToolHandle
- 287b745e fix AnalysisBase grid submission problems introduced with !42411 (merged)
- d6b07dae add a addPrivateToolInArray function to DualUseConfig.py
- 208eec50 fix the "inline" constructor for ServiceHandle
- 189ba67e add missing dictionary for AsgComponentConfig
- 4b738d43 switch unit test to using LocalDriver
- 33aa9723 introduce PythonConfig and EL::PythonConfigBase
- 2776170c introduce AsgToolConfig::makePrivateTool()
- f951bf0e Jet reco and config in analysis base
- 10772750 AsgTools: Fix cppcheck warnings.
- 80c83d6d fix compilation error in AnaAlgorithm package
- fa9ea29b rework AsgService interface declarations and configuration
- f812fc18 remake SysListLoaderAlg into SystematicsSvc
- 9593dacd rework subtools in AsgComponentConfig (was wrap AnaToolHandle around AsgToolConfig)
- 3e89c615 allow python configurables to add themselves to EventLoop job objects
Merge request reports
Activity
This merge request affects 15 packages:
- Control/AthToolSupport/AsgExampleTools
- Control/AthToolSupport/AsgServices
- Control/AthToolSupport/AsgTools
- Control/xAODRootAccess
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
Affected files list will not be printed in this case
Adding @akraszna ,@mhodgkin ,@krumnack ,@tadej ,@ssnyder ,@pagessin as watchers
CI Result SUCCESS (hash dbd77f95)AthDerivation externals cmake make required tests optional tests Full details available on this CI monitor view
AthDerivation: number of compilation errors 0, warnings 1
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 922] CI Result SUCCESS (hash dbd77f95)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 35694]added review-approved label and removed review-pending-level-1 label
removed review-approved label
added review-user-action-required label
I guess this is a question for @aundrus or @akraszna then:
The CI test gives the warning:
/var/lib/jenkins/workspace/CI-MERGE-REQUEST-GCC62-CC7/21.2/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaReentrantAlgorithm.cxx:30:56: warning: 'maybe_unused' attribute directive ignored [-Wattributes] [[maybe_unused]] ISvcLocator *pSvcLocator) ^~~~~~~~~~~
That is fine and easy enough to fix, but I'm a little puzzled as to why this didn't show up in the nightly build. There are some minor changes in that file, but the line in question was not changed. There is an include line that got removed, but I checked that doesn't contain any
pragma
or similar that would explain this.Is there a difference in the settings between CI and nightly builds that would explain this?
added full-unit-tests label
Hi @krumnack ,
The last nightly release was build on the 19th: https://bigpanda.cern.ch/nview/?nightly=21.2_AthDerivation_x86_64-centos7-gcc62-opt and the line "
ISvcLocator *pSvcLocator
" was not present in that file yet (you can check it at /cvmfs/atlas-nightlies.cern.ch/repo/sw/21.2_AthDerivation_x86_64-centos7-gcc62-opt/2021-06-19T0020/AthDerivation/21.2.126.0/InstallArea/x86_64-centos7-gcc62-opt/src/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithmWrapper.cxx)Alex
This merge request affects 14 packages:
- Control/AthToolSupport/AsgExampleTools
- Control/AthToolSupport/AsgServices
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/SystematicsHandles
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
Affected files list will not be printed in this case
Adding @mhodgkin ,@krumnack ,@tadej ,@ssnyder ,@pagessin as watchers
added review-pending-level-1 label and removed review-user-action-required label
Hi @gmarchio,
Sorry, I was struggling with resolving some dictionary loading issues, after we found in master that what I had put into
xAOD::Init
was not ideal. Unfortunately the fix we had in master didn't work here.I put in a fix now, and asked for all unit tests to be run, let's see how it goes.
Regards, Nils