Daily merge of 23.0 into master
Conflicts:
-
InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/ITkStripClusterOnTrackTool.cxx
. Kept the master version as discussed with @ncalace and @christos - Three scripts in
Simulation/G4Atlas/G4AtlasApps/test
:test_AtlasG4_cosmics_configuration.py
,test_AtlasG4_tf_configuration.py
,test_TestBeam_tf_configuration.py
coming from conflicting changes intest___G4AtlasAlg_ListOfSetProperties
functions from 23.0 and the master. Conflicts resolved manually. CC @jchapman. Hopefully, I got it right -
Tools/WorkflowTestRunner/python/References.py
. As always, this will require updating refs after the first CI run fails ...
This sweep contains the following MRs:
- !63731 (merged) Use isGenStable from TruthUtils inside the TruthParticle class EDM, Generators
- !63556 (merged) Muon inside -> chain.. Do not use the NSW for seeding Reconstruction, Run3-DataReco-output-changed, Tools, frozen-tier0-violating
- !63895 (merged) Remove the use of TDirectory::TContext when opening a container Database
- !63894 (merged) pip8 and flake fixes for python scripts in DerivationFrameworkEGamma Derivation, Egamma
- !63890 (merged) idalconv2_jo rm commented code InnerDetector
- !63891 (merged) Update FastShowerCellBuilderTool_test.py -- use only status=2 for particles Simulation
- !63889 (merged) TrfTestsART: Start using CA based merging and tighten the diff-root check in test_trf_q445_aodmerge.sh Tools
- !63886 (merged) Fix for .gitconfig in dev containers Build
- !63877 (merged) DerivationFrameworkL1Calo: add objects for phase 1 topo simple cone studies Derivation
- !63879 (merged) Update html link for output of ttbarPU40 IDPVM test InnerDetector, Tracking
- !63884 (merged) Fix DQ steering in HI Core, DQ
- !63861 (merged) Update tracking flags for PrimaryPassConfig ITk, InnerDetector, Tracking
- !63832 (merged) Updated the WebDisplay configuration for the ID DQ Alignment Plots DQ
- !63059 (merged) Avoid removing particles from the GenEvent after SimHit creation has started Generators, Simulation
- !63743 (merged) allow brem specific settings in FTF InnerDetector, Trigger, TriggerID
- !63846 (merged) ATR-27780, added two g5_nopid photon triggers in the MC Menu Trigger, TriggerMenu, changes-trigger-counts
- !63701 (merged) L1Topo enabling LateMuon reading through RoI Container Trigger
- !63883 (merged) end_with forgotten inline Core
- !63750 (merged) ATR-27757: VBF test chains to check downshift impact Trigger, TriggerMenu, changes-trigger-counts
- !63852 (merged) TileSimAlgs: Fix multiple hits for the same channel (ATLASSIM-6608) Digitization, Tile
- !63872 (merged) Drop boost::is_same and BOOST_STATIC_ASSERT in favor of std:: versions Core, Trigger
- !63869 (merged) Only make vector of DetectorElements if needed (i.e. for Run 4) (23.0 edition) InnerDetector
- !63868 (merged) PixelOnCluster add move ctors , clean up. Use them in SiClusterOnTrackTool InnerDetector
- !63842 (merged) FTF: HitDV optimisation + timers fix Trigger, TriggerID
- !63801 (merged) TriggerEgamma : Fixing TrigPhotonIsolationBuilder issue mentioned in ATR-27767 Trigger, TriggerMenu
- !63817 (merged) Add monGroups for ID trigger in cosmic menu Trigger, TriggerMenu
- !63793 (merged) Use CxxUtils:: instead of boost for starts_with in TrigCompositeUtils Trigger
- !63802 (merged) ALFA_EINE with and without TRT fast-OR, TRT streamers ALFA (ATR-23602) Trigger, TriggerMenu
- !63396 (merged) Make FlowElement container name adjustments more generalised. JetEtmiss, Reconstruction
- !63680 (merged) skip unnecessary extrapolation steps Trigger
- !63780 (merged) TrigL2MuonSA: Fix test. Trigger
- !63783 (merged) TrigMuonToolInterfaces+TrigMuonEF: Fix cppcheck warning. Trigger
- !63753 (merged) 23.0-coverity-TrigT1TGC Trigger
- !63270 (merged) fix phiBE/etaBE for clusters in crack with negative energy in some samples Calorimeter, EDM, Egamma, Reconstruction, Run2-DataReco-output-changed, Run2-MCReco-output-changed, Run3-DataReco-output-changed, Run3-MCReco-output-changed, Tools, frozen-tier0-violating
- !63831 (merged) Protection against invalid btaggingLinkInfo DQ, Trigger
- !63729 (merged) Allow only comparing branches of interest in WorkflowTests Tools
- !63867 (merged) LArRawChannel: Does not seem to inherit or be inherited. rm virtual and add all ctors LAr
- !63850 (merged) skip NSMM or stgc A and B lines if they are not included in the geometry MuonSpectrometer
- !63785 (merged) Drop special condition for Herwig++ particle status codes Analysis, Tau
- !63755 (merged) Updating jFEX monitoring with updated information DQ, Trigger