athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-11-08T03:42:49+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/581652022-11-07: Daily sweep of 22.0 into master2022-11-08T03:42:49+01:00Tadej Novaktadej.novak@cern.ch2022-11-07: Daily sweep of 22.0 into masterConflicts:
- `Reconstruction/VKalVrt/NewVrtSecInclusiveTool/src/NewVrtSecInclusiveAlg.cxx` (took reasonable things)
- `Tools/WorkflowTestRunner/python/References.py` (took 22.0)
- `Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUt...Conflicts:
- `Reconstruction/VKalVrt/NewVrtSecInclusiveTool/src/NewVrtSecInclusiveAlg.cxx` (took reasonable things)
- `Tools/WorkflowTestRunner/python/References.py` (took 22.0)
- `Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloPprMonitoring.h` (deleted)
- `Trigger/TrigT1/TrigT1CaloCalibUtils/src/L1CaloPprMonitoring.cxx` (deleted)https://gitlab.cern.ch/atlas/athena/-/merge_requests/582572022-11-09: Daily sweep of 22.0 to master2022-11-10T03:42:22+01:00Tadej Novaktadej.novak@cern.ch2022-11-09: Daily sweep of 22.0 to masterConflicts:
- `Control/AthenaConfiguration/python/ComponentAccumulator.py` (spurious conflict, master taken)
- `Control/AthenaConfiguration/share/CARunner.py` (spurious conflict, master taken)Conflicts:
- `Control/AthenaConfiguration/python/ComponentAccumulator.py` (spurious conflict, master taken)
- `Control/AthenaConfiguration/share/CARunner.py` (spurious conflict, master taken)https://gitlab.cern.ch/atlas/athena/-/merge_requests/583812022-11-14: Daily sweep of 22.0 into master2022-11-18T18:24:26+01:00Adam Edward Barton2022-11-14: Daily sweep of 22.0 into masterNo conflicts with smart mergeNo conflicts with smart mergehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/584712022-11-17: Daily sweep of 22.0 into master2022-11-18T09:42:19+01:00Adam Edward Barton2022-11-17: Daily sweep of 22.0 into master```
Conflicts:
Event/EventPrimitives/EventPrimitives/EventPrimitivesHelpers.h - kept ours as requested in MR
InnerDetector/InDetRecAlgs/InDetV0Finder/InDetV0Finder/InDetV0FinderTool.h - integrated
MuonSpectrometer/MuonValidation/Muon...```
Conflicts:
Event/EventPrimitives/EventPrimitives/EventPrimitivesHelpers.h - kept ours as requested in MR
InnerDetector/InDetRecAlgs/InDetV0Finder/InDetV0Finder/InDetV0FinderTool.h - integrated
MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/CMakeLists.txt - integrated
Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/STEP_Propagator.cxx - kept ours as requested in MR
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/587122022-11-25: daily merge of 22.0 into master2022-11-27T21:42:28+01:00Frank Winklmeier2022-11-25: daily merge of 22.0 into masterResolved conflicts:
- ComponentAccumulator.py
- AthMonitorAlgorithm
- MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/MuonClusterOnTrackCreator.h
- PhysicsAnalysis/DerivationFramework/DerivationF...Resolved conflicts:
- ComponentAccumulator.py
- AthMonitorAlgorithm
- MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/MuonClusterOnTrackCreator.h
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/CMakeLists.txt
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py
Rejected changes:
- DataQuality/DataQualityUtils/scripts/DeMo* (see https://gitlab.cern.ch/atlas/athena/-/merge_requests/58458#note_6226268)https://gitlab.cern.ch/atlas/athena/-/merge_requests/617032023-03-21: merge 23.0 into master2023-03-21T21:42:46+01:00Frank Winklmeier2023-03-21: merge 23.0 into masterMerge 23.0 into master.
Conflicts:
Tools/PROCTools/data/q447_AOD_digest.ref (took 23.0)Merge 23.0 into master.
Conflicts:
Tools/PROCTools/data/q447_AOD_digest.ref (took 23.0)https://gitlab.cern.ch/atlas/athena/-/merge_requests/617452023-03-22: merge of 23.0 into master2023-03-22T15:43:19+01:00Frank Winklmeier2023-03-22: merge of 23.0 into masterDaily merge of 23.0 into master.Daily merge of 23.0 into master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/617822023-03-23: merge of 23.0 into master2023-03-23T21:42:36+01:00Frank Winklmeier2023-03-23: merge of 23.0 into master:wave: New experimental format for merge commit descriptions. Only few minor changes were required to `prepare_release_notes.py`.
This sweep contains the following MRs:
* !60557 Migration of muon/jet/photon TLA to CA (ATR-26947) ~Egamm...:wave: New experimental format for merge commit descriptions. Only few minor changes were required to `prepare_release_notes.py`.
This sweep contains the following MRs:
* !60557 Migration of muon/jet/photon TLA to CA (ATR-26947) ~Egamma, ~JetEtmiss, ~Trigger, ~TriggerMenu
* !61657 Idtrig ca migration trig fast track finder config ~Trigger, ~TriggerID
* !61655 update remaining xi2max settings to flags ~Trigger
* !61709 Removing nightly ITk trigger test from 23.0 ~ITk, ~Trigger [**Conflict**: keep version in master]
* !61715 PrescalingTool: clean CPS groups before starting a run ~Trigger
* !61753 Migration of legacy EM seeded items to Phase 1 eEM seeded - EGamma chains ATR-27156 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61672 InDetOverlay: Suppress cppcheck warnings. ~InnerDetector, ~Overlay
* !61644 Remove boost from ISF_Fatras ~Simulation
* !61645 Remove boost from Reconstruction/RecoTools ~Reconstruction
* !61646 Remove boost from ZDC ~ForwardDetectors
* !61647 Use standard header instead of tr1 ~Core
* !61648 Remove boost from EventUtils ~Analysis
* !61675 Fix shared hits ~BTagging, ~EDM, ~InnerDetector
* !61649 Remove boost from JetTileCorrection ~JetEtmiss, ~Reconstruction
* !61650 Removed boost from AtlasGeomentryCommon ~Geometry
* !61652 Reduced the usage of boost in ForwardDetectors/ForwardTracker ~ForwardDetectors
* !61661 TrkJetVxFitter: Fix cppcheck warnings. ~JetEtmiss, ~Tracking
* !61667 23.0-coverity-MuonSTGC_CnvTools ~MuonSpectrometer
* !61680 DerivationFrameworkBPhys: Fix cppcheck warning. ~Derivation
* !61683 AsgTesting: Suppress cppcheck warnings. ~Core
* !61687 Make remapping isDefaults possible ~Analysis, ~BTagging, ~JetEtmiss
* !61729 Fix unmerged CA in MCTBExtrapolatorCfg ~MuonSpectrometer, ~Tracking
* !61691 [ATLASRECTS-7545] avoid dividing by zero ~Analysis, ~BTagging, ~DQ, ~JetEtmiss
* !61701 TrfTestsART: Introduce test with hybrid MT/MP and CA reco ~Tools
* !61714 Simplify InDetPerfPlot_Resolution::getPlots ~InnerDetector, ~Tracking
* !61700 Updated InDet CA config for disabled TRT ~InnerDetector, ~Tracking
* !61705 23.0-coverity-MuonMM_CnvTools ~MuonSpectrometer
* !61722 Fix unmerged condition algorithm in ITkGlobalChi2FitterBaseCfg ~ITk, ~Tracking
* !61728 Fix unmerged CA in EMParticleCaloExtensionToolCfg ~Egamma, ~Reconstruction, ~Tracking
* !61692 VP1AODSystems: Fix cppcheck warning. ~EventDisplay
* !61696 TrkTrackCollectionMerger: Fix cppcheck warning. ~Tracking
* !61695 TRT_SeededSpacePointFinderTool+TRT_SeededTrackFinderTool: Fix cppcheck warning. ~InnerDetector
* !61734 Add possibility to specify NSW as-built conditions from ascii file ~MuonSpectrometer
* !61744 Remove boost from McParticleUtils ~Analysis
* !61746 Remove boost from FastCaloSim ~Simulation
* !61732 Reduce the usage of barcodes ~Derivation
* !61611 better binning for legacy and new L1Calo EM/TAU in HLTSeeding histograms (ATR-26373) ~Trigger
* !61681 runHLT_standalone: remove 25ns modifier ~Trigger
* !61669 TrigEDMChecker: configure TrigDecisionTool ~Trigger
* !61409 Interactive athena with the ComponentAccumulator ~Core
* !60256 Adding Phase1 L1TopoRawDataContainer into TriggerEDMRun3 ~DQ, ~Run3-DataReco-output-changed, ~Tau, ~Tools, ~Trigger, ~TriggerEDM, ~frozen-tier0-violatinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/618302023-03-24: merge 23.0 into master2023-03-24T21:42:34+01:00Frank Winklmeier2023-03-24: merge 23.0 into masterThis sweep contains the following MRs:
* !61580 Centralize LLP electron ID configuration ~Analysis, ~Derivation, ~Egamma, ~Reconstruction
* !61670 FastChainPileup: Save log files from ART jobs and fix regression tests ~Overlay, ~Simula...This sweep contains the following MRs:
* !61580 Centralize LLP electron ID configuration ~Analysis, ~Derivation, ~Egamma, ~Reconstruction
* !61670 FastChainPileup: Save log files from ART jobs and fix regression tests ~Overlay, ~Simulation
* !61699 add FTAG3 for g->bb calibration (AFT-637) ~BTagging, ~Derivation
* !61785 Remove online and RDOtoBS tests, which have failed regularly for many years. ~Reconstruction
* !61781 LArROD: Add std scope to fix build failure on AlmaLinux9 ~LAr
* !61756 Migrate mc18 HI test to mc21, using ttbar and removing hijing from HITtoRDO step. ~Reconstruction
* !61733 Updated pixel cluster splitting CA flags ~ITk, ~InnerDetector, ~Tracking
* !61784 ATR-27116: use the same flatindex for AlfaCtpin and LegacyTopoMerged in L1/Base/Connectors.py ~Trigger, ~TriggerMenu
* !61268 Support compilation against Geant4 11.0 and 11.1 ~Calorimeter, ~ForwardDetectors, ~InnerDetector, ~LAr, ~Simulation, ~Tracking
* !61368 Restructuring the CA MetaData Configuration ~Core, ~Database, ~Derivation, ~Digitization, ~EDM, ~Overlay, ~Reconstruction, ~Simulation
* !61571 schedule new FTAG algorithm trainings in derivations, remove outdated VR trainings ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss, ~Tools
* !61731 Minor updates in TileRawChannelBuilderFitFilter and TileAANtuple ~Tile
* !61774 Another attempt to fix beamspot decoration ~DQ, ~MuonSpectrometer, ~Reconstruction
* !61775 MuonCondTest -- Add cabling tests for Run 2 MC ~MuonSpectrometer
* !61685 Solving circular dependency and clean up ~Trigger
* !61603 Changing L2CaloEgamma to CA configuration as a pre step to even more migration ~Trigger
* !61760 Use Pixel ID Helper to decode Pixel clusters ~InnerDetector
* !61716 [ATR-24310] Adding full trigger payload to DAOD_PHYSVAL, migration to CA derivations ~Derivation
* !61751 renamed the phase-I tau TAndP chains seeded by elec ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61679 ISF_PunchThroughTools - Adjust PCA to accept splitting by pdgId and eta groupings ~Simulation
* !61771 CxxUtils: Fix bug in including features.h ~Core
* !61770 Remove unused boost string headers ~Analysis, ~Database, ~Egamma, ~Generators, ~Trigger
* !61759 Use const reference in TruthClosureCheck ~Simulation
* !61750 Removed the unused boost headers/libraries from SGTools. The tests still use boost ~Core
* !61730 Remove boost from ALPHA ~ForwardDetectors
* !61704 Fix problem in GlobalVariables - the FCAL C binning was a copy of the A-side... ~DQ, ~LAr
* !61772 Fix unmerged CA in MCTBFitterCfg ~MuonSpectrometer, ~Tracking
* !61743 Drop kwargs from Tracking CA configs: SiClusterizationTool ~ITk, ~InnerDetector, ~Tracking, ~TriggerID
* !61768 Remove unused boost/foreach.hpp header ~DQ, ~Trigger
* !61773 Trigger+Muon: fix unmerged CAs in unit tests ~MuonSpectrometer, ~Reconstruction, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/618592023-03-26: merge 23.0 into master2023-03-27T03:42:20+02:00Tadej Novaktadej.novak@cern.ch2023-03-26: merge 23.0 into masterThis sweep contains the following MRs:
* !61840 Modifying JetTriggerEfficiencyMonitoring Algorithm for Phase 1 Triggers ~DQ, ~JetEtmiss, ~Trigger
* !61682 MdtCalibSvc: Fix cppcheck warnings. ~MuonSpectrometer
* !61582 MDT Cabling - Ad...This sweep contains the following MRs:
* !61840 Modifying JetTriggerEfficiencyMonitoring Algorithm for Phase 1 Triggers ~DQ, ~JetEtmiss, ~Trigger
* !61682 MdtCalibSvc: Fix cppcheck warnings. ~MuonSpectrometer
* !61582 MDT Cabling - Add JSON loader ~MuonSpectrometer
* !61747 Use ReaderFactory for the ascii file input ~Generators
* !61786 23.0-coverity-LArROD ~LAr
* !61787 23.0-coverity-LArRawEvent ~LAr
* !61831 Use access by reference in TruthEtIsolation ~Analysis
* !61824 Muon(Combined)Config: fix unmerged CAs ~MuonSpectrometer, ~Reconstruction
* !61826 Update RIG ART Tests ~Reconstruction
* !61816 InDetRecStatistics: Clean up thread-safety annotations. ~InnerDetector
* !61814 PixelCalibAlgs: Fix clang warning. ~InnerDetector
* !61812 fix ThinCAWrapper.sh to work with absolute path to top-script ~Core
* !61806 xAODBTaggingEfficiency: Fix clang warning. ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !61805 LArCalibUtils: Fix clang warning. ~LAr
* !61803 InDetRecStatistics: Fix / suppress cppcheck warnings. ~InnerDetector
* !61802 InDetTrackClusterAssValidation: Fix cppcheck warning. ~InnerDetector
* !61801 BCM_CollisionTime: Fix cppcheck warning. ~InnerDetector
* !61799 StoreGate: Forward-declare DataStore. ~Core
* !61798 MuonNSWCommonDecode: cmake fix ~MuonSpectrometer
* !61795 CLIDComps: Deprecated boost::filesystem function. ~Core
* !61810 Including inefficiency plots and protection against precale rates ~DQ, ~Egamma, ~Trigger
* !61818 GeneratorObjects: c++20 fix ~Generators
* !61819 MuonCablingData: Fix compilation with gcc13. ~MuonSpectrometer
* !61813 AFP Webdisplay - ToF post-processed histograms ~DQ
* !61817 PixelReadoutGeometry: Suppress cppcheck warnings. ~ITk, ~InnerDetector
* !61780 LLP stau to neutralino special configuration options ~Simulation
* !61788 Define ATLAS_REFERENCE_DATA for failing DigitizationTestsMT ~Digitization, ~Simulation
* !61763 Duplicate DL1d chains in bjet slice to use GN1 tagger ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61809 TrigInDetValidation: remove tracktwoMVABDT tau chains ~Trigger
* !61800 Update dead material correction arithmetic to better match firmware implementation ~Trigger
* !61796 runHLT_standalone: remove useOnlineLumi Modifier ~Trigger
* !61793 Fix unmerged CA in ID trig configs ~InnerDetector, ~Tracking, ~TriggerID
* !61792 revisit scheduling of SiDetElementsRoadCondAlg and general cleanup ~InnerDetector, ~Trigger, ~TriggerID
* !61711 Fix LAr DP tools ~LAr, ~Trigger
* !61431 Step by step implementation of CA in photon (this one targets wrapping of precisionCalo step) ~Egamma, ~Tau, ~Trigger, ~TriggerMenu
* !61823 TrigTauHypo: add property to count tracks above pt threshold in the perf step ~Tau, ~Trigger
* !61542 Modifying JetTriggerEfficiencyMonitoring Algorithm for Phase 1 Triggers ~DQ, ~JetEtmiss, ~Trigger
* !61769 Remove unused lexical_cast headers ~ForwardDetectors, ~Generators, ~Tracking, ~Trigger
* !61493 Configuration clean-up for Frozen Showers and Woodcock tracking ~LAr, ~Run2-FullSim-output-changed, ~Simulation, ~Tools, ~frozen-tier0-violatinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/619352023-03-28: merge 23.0 into master2023-03-29T09:42:15+02:00Tadej Novaktadej.novak@cern.ch2023-03-28: merge 23.0 into masterThis sweep contains the following MRs:
* !61175 MET Handling of Low Pt Electrons ~JetEtmiss, ~Reconstruction, ~Run2-DataReco-output-changed, ~Run2-MCReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Tools...This sweep contains the following MRs:
* !61175 MET Handling of Low Pt Electrons ~JetEtmiss, ~Reconstruction, ~Run2-DataReco-output-changed, ~Run2-MCReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Tools, ~frozen-tier0-violating
* !61924 ATR-26014 Temporary fix, split paired bunches into trains ~Trigger, ~TriggerMenu
* !61920 SCTErrMonAlg: fix legacy flags usage ~DQ, ~InnerDetector
* !61921 LArCoverageAlg: fix legacy config usage ~DQ, ~LAr
* !61919 Fix legacy flags usage in RegSelToolConfig ~Geometry, ~Trigger
* !61917 EGammaCommonCfg: fix usage of legacy flags ~Derivation
* !61890 NSW pad trigger: fix bug of double assignment ~MuonSpectrometer, ~Trigger, ~frozen-tier0-violating
* !61838 Use more access by const reference in Simulation ~Simulation
* !61912 MET Reco: workaround to avoid unmerged CA ~JetEtmiss, ~Reconstruction
* !61913 DFCommonTruthClassificationToolCfg: fix unmerged CA ~Derivation
* !61777 Hopefully circumvent default Roi Z width change for the LRT lepton chains ~Egamma, ~Trigger, ~TriggerID, ~TriggerMenu, ~changes-trigger-counts
* !61875 MuonRPC_CnvTools - Simplify the internal State cache to hopefully address MT issues in the trigger ~MuonSpectrometer, ~Trigger
* !61908 Update standalone tests to run on new data22 python files. ~Reconstruction
* !61911 cleanup of MBTS streamers duplication, ATR-27207 ~Trigger, ~TriggerMenu
* !61886 EvtGen_i CMake Fix, 23.0 branch (2023.03.27.) ~Generators
* !61897 CxxUtils: Fix glibc test. ~Core
* !61898 AtlasHepMC: Missing const qualifier. ~Generators
* !61899 DerivationFrameworkMCTruth: Fix setting of decorator keys. ~Derivation
* !61900 HIEventUtils: Fix cppcheck warnings. ~Analysis, ~JetEtmiss
* !61901 MdtCalibT0: Fix cppcheck warning. ~MuonSpectrometer
* !61902 MdtCalibRt: Fix cppcheck warning. ~MuonSpectrometer
* !61903 CA-based configuration for AthenaMtesEventLoopMgr ~Core
* !61894 Do not use flags in PixelGeoDB ~Digitization, ~Geometry, ~InnerDetector, ~Trigger
* !61895 Remove more SLHC references in the config ~InnerDetector, ~Simulation, ~Tracking, ~Trigger, ~TriggerID
* !61878 [ATLSWUPGR-187] Update TriggerSlimmingHelper to ignore files with no trigger payload ~Derivation, ~Trigger
* !61884 Separate legacy and phase 1 triggers in data quality web display ~DQ
* !61893 Fix syntax error in preInclude.SleptonsLLP.py ~Simulation
* !61891 add CA based config for some NSW cluster reconstruction tools ~MuonSpectrometer
* !61904 TrigTauRec and TrigTauHypo: count tracks above 1.5 GeV in perf, adjust DeepSet ID WP ~Tau, ~Trigger, ~changes-trigger-counts
* !61879 FastCaloSimCaloExtrapolation: Update configurable property syntax ~Simulation
* !61856 migrated particleCreatorTools ~Egamma, ~InnerDetector, ~Tracking, ~Trigger, ~TriggerID, ~TriggerMenu
* !61836 Fixing jFEX input data decoder crash. ~Trigger
* !61881 ISF_ValidationMT: Switch AthenaMP simulation ART tests to use a single IoV ~Simulation
* !61533 Add flags to speed up menu generation ~JetEtmiss, ~Trigger, ~TriggerMenu
* !61626 Start of ZDC CA trf ~ForwardDetectors, ~Trigger
* !61882 Added streamers for NSW_MONITOR, ATR-27143 ~Trigger, ~TriggerMenu
* !61779 fix rare error from isolation correction when eta==2.5 ~Analysis, ~Derivation, ~Egamma
* !61726 Add configuration code to test G4Region changes discussed in ATLASSIM-6426 ~Simulation
* !61828 MET Association: workaround to avoid unmerged CA ~JetEtmiss, ~Reconstruction
* !61834 MdtCablingTest - Steer JSON file dump ~MuonSpectrometer
* !61837 Activate SimExoticsTests ART jobs for the 23.0 branch ~JetEtmiss, ~Simulation
* !61842 RecJobTransforms: Add MetaData to CA based AODMerge ~Reconstruction
* !61843 TrfTestsART: Require exactly the same branches in the AODMerge test ~Tools
* !61847 AthAllocators: gcc12 warning. ~Core
* !61848 Identifier: Suppress gcc12 false positive. ~Geometry
* !61849 CxxUtils: Clean up more cppcheck warnings. ~Core
* !61850 GeneratorObjects: Fix thread-safety checker warning. ~Generators
* !61852 RootAuxDynIO: Fix cppcheck warning. ~Database
* !61851 ZdcAnalysis: Fix thread-safety checker warnings. ~ForwardDetectors
* !61868 MuonConfig - Remove T0 warning for cosmics ~MuonSpectrometer, ~frozen-tier0-violating
* !61870 Fast Chain: Fixes for running simulation and MC overlay in a single job ~Overlay, ~Simulation, ~Toolshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/619632023-03-31: merge of 23.0 into master2023-03-31T15:43:13+02:00Tadej Novaktadej.novak@cern.ch2023-03-31: merge of 23.0 into master
This sweep contains the following MRs:
* !61964 Switch Ringer to run 3 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61977 fix a bug where the muon punch through simulation overestimate the number of punch-through particles ~Simu...
This sweep contains the following MRs:
* !61964 Switch Ringer to run 3 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61977 fix a bug where the muon punch through simulation overestimate the number of punch-through particles ~Simulation
* !61970 reduce cloneAndReplace calls and check inflags for sanity ~Trigger, ~TriggerID
* !61951 Use static empty link in the SiTotalCharge class ~Digitization, ~InnerDetector, ~Simulation
* !61969 TileMonitoring: Check if threads argument is None (default value) before using it ~DQ, ~Tile
* !61918 Migrate precision SA muon sequnce to CA ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61957 getCompatibleSurfaces : tidy up a bit the code ~Tracking
* !61959 Si combinatorial track finder xk reserve ~InnerDetector
* !61694 VP1TrackSystems: Fix cppcheck warning. ~EventDisplay
* !61721 Remove overwrite for split-level of dynamic aux store ~Database, ~Run2-DataOverlay-output-changed, ~Run2-DataReco-output-changed, ~Run2-MCOverlay-output-changed, ~Run2-MCReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCOverlay-output-changed, ~Run3-MCReco-output-changed, ~Tools
* !61966 Fix unmerged CA in TrigT1ResultByteStream + L1CaloFEX + L1Topo ~DQ, ~Trigger
* !61345 Fix Sector overlap issue in TrigL2MuonSA ~Trigger, ~changes-trigger-counts
* !61915 TrigEgammaMonitoring - Adjustments to avoid invalid arithmetic operations ~DQ, ~Egamma, ~Trigger
* !61956 Update TrigHTTSGToRawHitsTool.cxx to use the canonical form of looping over... ~Trigger
* !61946 Add CA-based version of CollectionMerger configuration tests ~Simulation
* !61952 Update SiCharge.cxx with the hope that short-circuiting will work and... ~InnerDetector, ~Simulation
* !61686 Change find to rfind starting at 0 (small optimisation) ~Core, ~Trigger
* !61948 Improving decoding logic for TP L1As ~MuonSpectrometer, ~Trigger
* !61931 Adding Perf Mon into Standalone L1Topo JO ~Trigger
* !61755 Narrowscan code urge fix ATR-19376 ~Trigger, ~changes-trigger-counts
* !61922 TrigNavSlimmingMT: fix legacy flags usage ~Trigger
* !61938 added Phase-I version of several jet chains, ATR-27206 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61923 23.0-cleanup-PixelCalibAlgs ~InnerDetector
* !61925 minor fix in variable name in TileCal calibration ntuple ~Tile
* !61950 CaloRec: Avoid using CompFactory with old style configurable sequences ~Calorimeter
* !61949 TileMonitoring: Add possibility to monitor timing with CIS events in the gap ~DQ, ~Tile
* !61937 Try to use references in the InnerDetector ~Digitization, ~InnerDetector
* !61934 Clean up of IDPVM CA configs ~InnerDetector, ~Tracking
* !61933 Update CMakeLists.txt: added missing find_package( Boost) ~Database
* !61932 TileConditions+TileConfiguration+TileRecUtils: Add possibility to ignore online channel status ~Tile
* !61928 [ATLASRECTS-7450] Cleaned up JetFitterTag code ~Analysis, ~BTagging, ~JetEtmiss
* !61926 Read and decor handles for TruthIsolationTool ~Derivation
* !61916 Fix Taus using legacy flags ~Calorimeter, ~Reconstruction, ~Tau
* !61940 ATR-27081 - fix chain merging for mu_mu_munoL1 ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/620492023-04-01: daily merge of 23.0 into master2023-04-02T15:42:00+02:00Tadej Novaktadej.novak@cern.ch2023-04-01: daily merge of 23.0 into masterThis sweep contains the following MRs:
* !62047 [ATR-26912] Updates for BKee triggers ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62006 Allow DigitizationTests to access 23.0-specific reference files (ATLASSIM-6446) ~Digitizatio...This sweep contains the following MRs:
* !62047 [ATR-26912] Updates for BKee triggers ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62006 Allow DigitizationTests to access 23.0-specific reference files (ATLASSIM-6446) ~Digitization, ~Simulation
* !62038 Duplicate DL1d chains in combined slice to use GN1 tagger ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62012 ATR-27212 - Minor Menu Fixes for Day 1 2023 Menu ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !61988 Clean up of CvtParametersBase ~BTagging, ~Tracking
* !62013 MET Trigger Monitoring updates in line with 2023 menu, ~DQ, ~Trigger
* !61983 Updated tracking CA flags: useBeamSpotInfoNN + nnCutLargeD0Threshold + useBroadClusterErrors ~ITk, ~InnerDetector, ~Tracking
* !61974 Cleanup code related to HepMC ~Analysis, ~EventDisplay, ~Generators, ~InnerDetector, ~JetEtmiss, ~MuonSpectrometer, ~Simulation
* !61991 TrkDriftCircleMath DCSLFitter cleanup (rm cout, rm un-needed virtual, reserve vector ~Tracking
* !61992 CaloIdentifier: Avoid some ExpandedIdentifier copies. ~Calorimeter
* !61997 RecExTB: Fix cppcheck warnings. ~Reconstruction
* !61998 ZdcAnalysis: Fix cppcheck warnings. ~ForwardDetectors
* !61999 AthAllocators: Use std type_traits. ~Core
* !61864 Added ToT information from pixel SPs ~Reconstruction
* !62007 ATR-27013 ~Trigger, ~TriggerMenu
* !62008 Adding monitoring groups to some Express stream chains - ATR-27208 ~Trigger, ~TriggerMenu
* !61987 ATR-27151 Fix AOD->NTUP_TRIGRATE: FPE DIVBYZERO ~Trigger
* !61976 ID Trigger monitoring in the CA ~DQ, ~Trigger
* !61958 [FTAG] add flipped GNN taggers to output and fix flipping logic ~Analysis, ~BTagging, ~Derivation, ~JetEtmisshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/624272023-04-18: Merge of 23.0 into master2023-04-19T10:50:57+02:00Frank Winklmeier2023-04-18: Merge of 23.0 into masterManually post-poned (rejected):
* !62377 JetMomentTools: Add RenounceOutput option for JetForwardJvtTool.
Cherry-picked:
* !62431 ATR-27227: update test refs and fix online monitoring test
This sweep contains the following MRs:
* ...Manually post-poned (rejected):
* !62377 JetMomentTools: Add RenounceOutput option for JetForwardJvtTool.
Cherry-picked:
* !62431 ATR-27227: update test refs and fix online monitoring test
This sweep contains the following MRs:
* !62399 Modify Jet Trigger Efficiency Algorithm for gfex trigger emulation ~DQ, ~JetEtmiss, ~Trigger
* !62324 ATR-23061, ATR-26394: Split FS tracking beamspot chains to reduce BeamSpotPEB rate ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62385 Store electron LH as float rather than double ~Derivation, ~Egamma, ~changes-derivation-output
* !62380 PixelG4_SD+SCT_G4_SD: cmake fix ~InnerDetector, ~Simulation
* !61583 Seperated logging out from `TFCSParmaterizationBase` ~Simulation
* !62360 TileTBRec+TileRecUtils: Switch off FELIX data in h1000 ntuple by default ~Tile
* !62390 Remove find_package(Boost) from packages where boost is not used ~Calorimeter, ~ForwardDetectors, ~Generators, ~InnerDetector, ~Simulation, ~Tools
* !62389 MuonGMTest - Use the IdentifierHash to loop over the readout elements ~MuonSpectrometer
* !62358 Style formatting InDet derivation configs ~Derivation, ~InnerDetector, ~Tracking
* !62381 Cleanup PrimaryDPD 3 . Followup to MR62310 ~Analysis
* !62376 AthenaServices: Clear exceptions in FPEControlSvc. ~Core
* !62388 Delete AmdcMGM package ~MuonSpectrometer
* !62400 Remove calls to find_package(Boost) in the packages which don't use boost ~DQ, ~Digitization, ~LAr, ~MuonSpectrometer, ~Simulation
* !62401 Remove calls to find_package(Boost) in the packages which don't use boost, part3 ~ACTS, ~Analysis, ~Simulation, ~Tile, ~Tracking
* !62352 AtlasSemantics: Fix VarHandleArraySemantics for default value append ~Core, ~Simulation
* !62397 filter harmonization BTagging DQ ATLAS ready ~Analysis, ~BTagging, ~DQ, ~JetEtmiss
* !62374 OptionalContainer seems to have never found its use. Archive ~Core
* !62368 Adding legacy UPC triggers, without ZDC ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62393 [ATR-27227] Add service creation to trigger xAODConfig svc when not in INFILE mode ~Trigger
* !62398 TrfTestsART: Change tests to CA and use flags.DQ.Steering.doHLTMon=False ~Tools
* !62378 JetSelectorTools: Add SuppressOutputDependnece option for EventCleaningTool. ~Analysis, ~JetEtmiss
* !62379 TrigT1CaloTools: Mark L1TriggerTowerTool as not thread-safe. ~Trigger
* !62362 ATR-23602: Add LUCID monitored items and clean up ALFA_Diff_Phys ~Trigger, ~TriggerMenu
* !62382 Pad trigger decoding: use uint32_t explicitly to avoid -Wsign-conversion ~MuonSpectrometer, ~Trigger
* !62359 ATR-27270: jet/b-jet trigger physics menu downshift ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62349 Adding ReadDecorHandleKey for ptcone20 in the electron mon algos ~DQ, ~Egamma, ~Trigger
* !62179 Delete the MuonDetector elements ~MuonSpectrometer
* !62357 Update d0/z0significance helpers to work in PHYSLITE (ATLASG-2509) ~EDM, ~Tracking
* !62373 MuonRecExample - Fix TCT tests ~MuonSpectrometer
* !62375 Fix failing ART tests after rm of legacy PrimaryDPD JO ~Toolshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/624752023-04-19: merge 23.0 into master2023-04-20T15:41:50+02:00Frank Winklmeier2023-04-19: merge 23.0 into masterFixed conflicts:
- Calorimeter/CaloTools/CMakeLists.txt
- InnerDetector/InDetConfig/python/SiClusterizationToolConfig.py
- PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
This sweep contains the followin...Fixed conflicts:
- Calorimeter/CaloTools/CMakeLists.txt
- InnerDetector/InDetConfig/python/SiClusterizationToolConfig.py
- PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
This sweep contains the following MRs:
* !61689 Make unmerged CAs to complain when deleted ~Core
* !62420 Rm some not very useful finalize methods ~Calorimeter, ~MuonSpectrometer, ~Tile
* !62448 Configure MuonIdHelperSvc correctly for legacy config HITSMerge_tf.py jobs ~Simulation
* !62444 MuonReadoutGeometry - Fix crash in Debug build ~MuonSpectrometer
* !62463 DataQualityInterfaces: Fix gcc13 compilation of uint types ~DQ
* !62460 RecExCommon: fix legacy monitoring ~Analysis, ~BTagging, ~Core, ~DQ, ~JetEtmiss, ~Reconstruction
* !62404 ATLASG-2510: allows to keep only best conversion vertex ~Derivation, ~Egamma
* !62443 JetMomentTools: Fix compilation in AnalysisBase. ~JetEtmiss, ~Reconstruction
* !62458 InDetSurveyConstraintTool: thread-checker fixes ~InnerDetector
* !62450 Enable missing AthSimulation ART jobs ~Build, ~Simulation
* !62447 Restore kwargs in CA interface for SiClusterizationTool configs ~InnerDetector, ~Tracking
* !62451 PRDtoTrackMap : Use ArenaPoolSTLAllocator ~InnerDetector, ~Tracking
* !62441 Remove legacy LLP1 config ~Derivation
* !62439 Try to return SiCharge by reference ~Digitization, ~InnerDetector
* !62433 Update BSignalFilter.cxx -- fix a 10 y.o. bug. ~Generators
* !62332 Add Micromega cabling map & alg ~MuonSpectrometer
* !62465 B-physics trigger: add new dimuon bBmux_BdmuDstarX chains for R(D*) measurement (ATR-27341) ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62440 Fix legacy configuration of MuonIdHelperSvc ~Database, ~MuonSpectrometer, ~Simulation, ~Trigger
* !62437 fixing inclusion of legacy L1 MET/sumET in AODs produced by L1TopoSimulationConfig ~Trigger
* !62141 AF3: mirror showers for positrons and negative hadrons ~Run2-AF3-output-changed, ~Simulation, ~Tools, ~frozen-tier0-violating
* !62077 Adding anti-bb tagger DL1dbb and gn1+bb test chains ~BTagging, ~Trigger, ~TriggerEDM, ~TriggerMenu, ~changes-trigger-counts
* !62432 Bug fix such that thinning does not run in reco from ESD workflows. ~JetEtmiss, ~Reconstruction
* !62425 Remove obsolete checkMetaSG in favour of meta-reader ~Core, ~Tools
* !62423 Remove some calls to find_package(CLHEP) if clhep is not used ~Calorimeter, ~Digitization, ~ForwardDetectors, ~HGTD, ~LAr, ~Overlay, ~Simulation
* !62422 Remove the unused boost subpackages from find_package(), add missing ~Analysis, ~Calorimeter, ~Core, ~Digitization, ~JetEtmiss, ~LAr, ~MuonSpectrometer, ~Reconstruction, ~Simulation, ~TestBeam, ~Tile, ~Trigger
* !62421 Isolation Truth avoid conditional decorations see ATLASG-2504 ~Derivation
* !62417 TRT_TrackSegmentsTool_xk: Thread-safety cleanup. ~InnerDetector
* !62416 PyDumper: Get MuonIdHelperSvc initialized properly. ~EDM
* !62415 AthenaKernel+CxxUtils: Mixed container trimming workaround. ~Core
* !62414 DerivationFrameworkMCTruth: Fix usage of decoration handles. ~Derivation
* !62409 Fix flake8 in VS Code ~Build
* !62413 we do not seem to really use PerfDPD_EOverP.py. Archive ~Analysis
* !62408 TrkExTools : Clang fixes for unused const variable ~Tracking
* !62369 TRTOverlay use DataPool ~InnerDetector, ~Overlay
* !62365 Add cosmic+low energy track selection for IDGlobal DQ and small bugfixes ~DQ, ~InnerDetector, ~Tracking
* !61914 Workaround jet CA reordering by flattening the accumulator and returning dependencies as is ~Analysis, ~Core, ~Derivation, ~Generators, ~JetEtmiss, ~Reconstruction
* !62424 add b+tau chains for HH->bbtautau ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62412 Remove calls to find_package(boost) in packages that don't use boost ~Trigger
* !62411 TrigP1Test: move RAWtoALL to CA for test_trigP1_v1PhysP1_T0MonTrf_run2_build ~Trigger
* !62434 fix TrigT1ResultByteStreamConfig test for legacy with missing ROBs ~Trigger
* !62418 CrestApi+TrigT1RPClogic: Fix cppcheck warnings. ~Database, ~Trigger
* !62431 ATR-27227: update test refs and fix online monitoring test ~Core, ~DQ, ~Trigger
* !62399 Modify Jet Trigger Efficiency Algorithm for gfex trigger emulation ~DQ, ~JetEtmiss, ~Trigger
* !62324 ATR-23061, ATR-26394: Split FS tracking beamspot chains to reduce BeamSpotPEB rate ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62385 Store electron LH as float rather than double ~Derivation, ~Egamma, ~changes-derivation-output
* !62380 PixelG4_SD+SCT_G4_SD: cmake fix ~InnerDetector, ~Simulation
* !61583 Seperated logging out from `TFCSParmaterizationBase` ~Simulation
* !62360 TileTBRec+TileRecUtils: Switch off FELIX data in h1000 ntuple by default ~Tile
* !62377 JetMomentTools: Add RenounceOutput option for JetForwardJvtTool. ~JetEtmiss, ~Reconstruction
* !62390 Remove find_package(Boost) from packages where boost is not used ~Calorimeter, ~ForwardDetectors, ~Generators, ~InnerDetector, ~Simulation, ~Tools
* !62389 MuonGMTest - Use the IdentifierHash to loop over the readout elements ~MuonSpectrometer
* !62358 Style formatting InDet derivation configs ~Derivation, ~InnerDetector, ~Tracking
* !62381 Cleanup PrimaryDPD 3 . Followup to MR62310 ~Analysis
* !62376 AthenaServices: Clear exceptions in FPEControlSvc. ~Core
* !62388 Delete AmdcMGM package ~MuonSpectrometer
* !62400 Remove calls to find_package(Boost) in the packages which don't use boost ~DQ, ~Digitization, ~LAr, ~MuonSpectrometer, ~Simulation
* !62401 Remove calls to find_package(Boost) in the packages which don't use boost, part3 ~ACTS, ~Analysis, ~Simulation, ~Tile, ~Tracking
* !62352 AtlasSemantics: Fix VarHandleArraySemantics for default value append ~Core, ~Simulation
* !62397 filter harmonization BTagging DQ ATLAS ready ~Analysis, ~BTagging, ~DQ, ~JetEtmiss
* !62374 OptionalContainer seems to have never found its use. Archive ~Core
* !62368 Adding legacy UPC triggers, without ZDC ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62393 [ATR-27227] Add service creation to trigger xAODConfig svc when not in INFILE mode ~Trigger
* !62398 TrfTestsART: Change tests to CA and use flags.DQ.Steering.doHLTMon=False ~Tools
* !62378 JetSelectorTools: Add SuppressOutputDependnece option for EventCleaningTool. ~Analysis, ~JetEtmiss
* !62379 TrigT1CaloTools: Mark L1TriggerTowerTool as not thread-safe. ~Trigger
* !62362 ATR-23602: Add LUCID monitored items and clean up ALFA_Diff_Phys ~Trigger, ~TriggerMenu
* !62382 Pad trigger decoding: use uint32_t explicitly to avoid -Wsign-conversion ~MuonSpectrometer, ~Trigger
* !62359 ATR-27270: jet/b-jet trigger physics menu downshift ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62349 Adding ReadDecorHandleKey for ptcone20 in the electron mon algos ~DQ, ~Egamma, ~Trigger
* !62179 Delete the MuonDetector elements ~MuonSpectrometer
* !62357 Update d0/z0significance helpers to work in PHYSLITE (ATLASG-2509) ~EDM, ~Tracking
* !62373 MuonRecExample - Fix TCT tests ~MuonSpectrometer
* !62375 Fix failing ART tests after rm of legacy PrimaryDPD JO ~Toolshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/624992023-04-20: merge 23.0 into master2023-04-20T21:42:14+02:00Frank Winklmeier2023-04-20: merge 23.0 into masterThis sweep contains the following MRs:
* !62478 ATR-27325 Menu updates for 2023 1200b ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62466 ATR-27343, ATR-27252: added tau TAndP seeded by L1MU18VFCH and two new ditau chains ~Trigger...This sweep contains the following MRs:
* !62478 ATR-27325 Menu updates for 2023 1200b ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62466 ATR-27343, ATR-27252: added tau TAndP seeded by L1MU18VFCH and two new ditau chains ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62442 added bjets and reanabled bBhv chains ~Trigger, ~TriggerMenu
* !62461 TrigValAlgs: fix trigEDMChecker ~Trigger
* !62459 TrigHTTObjects, MuonCalibIdentifier: Fix gcc13 compilation of uint types ~MuonSpectrometer, ~Trigger
* !62457 TrigL2MuonSA: thread-checker fixes ~Trigger
* !62436 Use CA to setup SP making in MinBias chains ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62438 Remove unused CXXutils from CmakeLists.txt ~ACTS, ~Analysis, ~Calorimeter, ~Database, ~Egamma, ~Geometry, ~InnerDetector, ~LAr, ~Reconstruction, ~Simulation, ~Tracking, ~Trigger
* !62455 TrigConfStorage: thread-checker cleanup ~Trigger
* !62446 Modify reference trigger naming scheme for L1Calo Jet Trigger Efficiency Monitoring framework ~DQ, ~JetEtmiss, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/625612023-04-22: merge 23.0 into master2023-04-23T21:41:55+02:00Frank Winklmeier2023-04-22: merge 23.0 into masterThis sweep contains the following MRs:
* !62430 FileMetaDataCreatorTool: use tryConstRetrieve to get input FileMetaData ~Database, ~EDM
* !62516 MuonGeoModelTest: Fix clang warning. ~MuonSpectrometer
* !62505 AthenaConfiguration: set ...This sweep contains the following MRs:
* !62430 FileMetaDataCreatorTool: use tryConstRetrieve to get input FileMetaData ~Database, ~EDM
* !62516 MuonGeoModelTest: Fix clang warning. ~MuonSpectrometer
* !62505 AthenaConfiguration: set python OutputLevel ~Core
* !62488 do not require new itkclustererror folder tag for each major geotag version ~ITk, ~InnerDetector
* !62501 conf2toConfigurable: improve warning message when merging strings ~Core
* !62520 FTagAnalysisInterfaces: Fix circular dependency with xAODBTaggingEfficiency. ~Analysis, ~BTagging, ~Derivation
* !62517 MuonTrackSteeringTools: cppcheck warnings. ~MuonSpectrometer
* !62462 Add chain count to mc_newJO tests ~ACTS, ~Build, ~Calorimeter, ~Core, ~DQ, ~Database, ~EDM, ~Generators, ~Geometry, ~ITk, ~JetEtmiss, ~Trigger
* !62503 [ATLASRECTS-7545] Avoid FPEs ~Analysis, ~BTagging, ~DQ, ~JetEtmiss
* !62496 MicroMegaBytestreamDecoding - Cabling map is optional and switch it off in trigger ~MuonSpectrometer, ~Trigger
* !62372 Clean up DetDescrSvc ~Geometry
* !62479 Clean up mdt vs raw mon alg ~DQ, ~MuonSpectrometer
* !62526 TrigHTTBankGen: fix passing of EventContext ~Trigger
* !62506 Fix unmerged ComponentAccumulator instance in HGTD_DigitizationConfig.HGTD_DigitizationToolCfg ~Digitization, ~HGTD
* !62522 AthenaKernel: Revert trimming change. ~Core
* !62523 cleanup several tools replaced by CA already ~Digitization, ~InnerDetector, ~Trigger
* !62386 MuonInterSectCondSvc - Use the IdentifierHash to retrieve the DetectorElement from the Geometry ~MuonSpectrometer
* !62497 23.0-coverity-ISF_FastCaloSimEvent ~Simulation
* !62518 InDetTrackingGeometry: Fix cppcheck warnings. ~InnerDetector
* !62515 ActsTrkSeedingTool: Suppress gcc12 warning. ~ACTS, ~Tracking
* !62529 Fix LAr DPtools ~LAr
* !62489 Updating jFEX jet Calib parameters ~Trigger, ~changes-trigger-counts
* !62470 fixing the lower value of the RMS for the MM LM2 chambers ~Digitization, ~MuonSpectrometer, ~Run3-MCReco-output-changed, ~frozen-tier0-violating
* !62487 use common sequence also in original CA config ~Trigger, ~TriggerID
* !62502 TriggerTest: cleanup newJO ART test definitions ~Trigger
* !62509 MMTrigger simulation - Add missing TString include ~Trigger
* !61457 Clean up sTGC Segments and RIO on tracks ~MuonSpectrometer, ~Reconstruction, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Tools, ~Trigger, ~changes-trigger-counts, ~frozen-tier0-violating
* !62494 B-physics trigger: fix logical bug in TrigBmumuxComboHypo (ATR-27353) ~Trigger
* !62482 MuonCabling - Clang format ~MuonSpectrometer
* !62486 RpcRawMonitoring - Clang format & minor clean-up ~DQ, ~MuonSpectrometer
* !62473 TriggerMenuMT: reduce verbosity in menu building ~Trigger, ~TriggerMenu
* !62498 ATR-27250 Duplicate multijet-seeded triggers to jFEX ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62449 BTagging: Simplify overcomplicated ESD / AOD output lister ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !62392 Various fixes to LAr tools ~DQ, ~LAr
* !62419 add Muon.DESDM_MCP.doAlignmentFormat flag to controll the output of the DESDM_MCP format ~Analysis, ~MuonSpectrometer
* !62406 Pass EventContext down, InDetConditions edition ~ACTS, ~DQ, ~Digitization, ~InnerDetector, ~Reconstruction, ~Simulation, ~Tracking
* !62467 23.0-reduce_CC-PixelDigitization ~Digitization, ~InnerDetector
* !62472 TrackingGeometryCondAlg: use configurable for EnvelopeDefinitionSvc property ~Tracking
* !62474 egammaOQFlagsBuilder: Move code to helpers, need to think if we can then unify them more ~Egamma, ~Reconstruction
* !62483 MdtRawMonitoring - Clang format & drop of chamber array ~DQ, ~MuonSpectrometer
* !62484 TRT_ElectronPidTools : reduce verbosity ~Egamma, ~InnerDetector
* !62477 Remove duplicated GenEvent vertex filling for truth pileup config ~Simulation
* !62480 MuonGeoModelTest - Check all mdt chambers ~MuonSpectrometer
* !62481 MuonHoughPatternTools - Add test JOs to run the Hough transformation for debugging ~MuonSpectrometer
* !62495 Updated MuonPhysVal CA config to avoid trigger decision tool if not used (fix ATLSWUPGR-189) ~DQ, ~MuonSpectrometer, ~Trigger
* !62471 TriggerMenuMT: further increase unit test timeout ~Trigger, ~TriggerMenu
* !62490 enlarge the range of mu_eff from 60 to 100 ~Trigger
* !62453 Migrate MuFast trigger sequences to MenuSequenceCA ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/626012023-04-24: merge 23.0 into master2023-04-25T15:42:22+02:00Edward Moyse2023-04-24: merge 23.0 into masterThis sweep contains the following MRs:
* !62546 Dropping attempted MiniVolumes property from the configuration of FCS_StepInfoSDTool ~Simulation
* !62547 Fix public tools assigned to private ToolHandles ~Reconstruction, ~Tau, ~Tracking...This sweep contains the following MRs:
* !62546 Dropping attempted MiniVolumes property from the configuration of FCS_StepInfoSDTool ~Simulation
* !62547 Fix public tools assigned to private ToolHandles ~Reconstruction, ~Tau, ~Tracking
* !62542 SimCoreTests ART: Disable test_AtlasG4_LucidSimTest.sh for AthSimulation nightlies ~Simulation
* !62541 Remove cut on max number of SP ~Reconstruction
* !62540 ISF_FatrasConfig.py: Fix for unmerged ComponentAccumulator instance ~Simulation
* !62514 JetAnalysisAlgorithms: Turn on RenounceOutputs for JetForwardJvtTool. ~Analysis, ~JetEtmiss
* !62573 V0Finder: Avoid unnecessary looping (r23) ~Derivation, ~InnerDetector
* !62550 CollectionMergerConfig.ISFCollectionMergerCfg fix incorrect case in hasFlag check ~Simulation
* !62578 ATR-27258 Duplicate P1 triggers to Phase-I: part 2 ~Trigger, ~TriggerMenu
* !62569 xAODBTaggingEfficiency: fix build failure in AnalysisBase ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !62512 ATR-27364: Triplicate preselection b85 to b82 and b80 ~JetEtmiss, ~Trigger, ~TriggerJet, ~TriggerMenu, ~changes-trigger-counts
* !62558 ATR-27373 - Duplications of eEM26 items to eEM28 ~Digitization, ~MuonSpectrometer, ~Tracking, ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62553 Update ptMinToTopo/ptMinxTOB for calibrated jJets ~Trigger, ~TriggerMenu
* !62534 RkPropagator : Fix cppcheck warning ~Tracking, ~frozen-tier0-violating
* !62527 MuonFastDigitization: pass EventContext instead of event number ~Digitization, ~MuonSpectrometer
* !61455 Add sTGC pad charge sharing ~Digitization, ~MuonSpectrometer, ~Simulation, ~Trackinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/626352023-04-25: merge 23.0 into master2023-04-25T21:42:04+02:00Edward Moyse2023-04-25: merge 23.0 into masterThis sweep contains the following MRs:
* !62589 Remove combined muon from ESD test. ~Reconstruction
* !62588 MuonCablingData - Fix compiler error in gcc12 ~MuonSpectrometer
* !62591 Remove deprecated UpgradePerformanceFunctions ~Analy...This sweep contains the following MRs:
* !62589 Remove combined muon from ESD test. ~Reconstruction
* !62588 MuonCablingData - Fix compiler error in gcc12 ~MuonSpectrometer
* !62591 Remove deprecated UpgradePerformanceFunctions ~Analysis, ~BTagging, ~Egamma, ~JetEtmiss, ~Overlay, ~Tau, ~Trigger
* !62592 LArNoiseConfig: remove CA debugMode setting ~LAr
* !62584 MM cabling access from conditions DB ~MuonSpectrometer
* !62580 digitazation some minor fixes ~Digitization, ~InnerDetector, ~Tracking
* !62568 Remove extrapolator from V0Tools and simplify ~Derivation, ~InnerDetector, ~Tracking
* !62566 EventPrimitivesHelpers : Rm seemingly unused isSymmetric ~EDM
* !62564 Derivations BPHY: Clean up code and warning in VertexTrackIsolation (r23) ~Derivation
* !62563 DataPool can accept the ctx in the ctor. Lets pass it ~InnerDetector, ~Overlay
* !62559 IDC_OverlayBase. Prepare for allowing using DataPool for SCT and Pixel ~Overlay, ~Simulation
* !62552 TileDetDescr: Add dictionary for Tile detector description mamanger ~Tile
* !62549 Clean up of InDet SecVxFinder tools ~InnerDetector, ~Tracking
* !62531 Fix redundant access to FullPhysVol and AlignableTransform in the Pixel readout ~InnerDetector
* !62565 mag() only in MatrixBasePlugin ~EDM
* !62511 updating various jobOptions in TileCalibAlgs ~Simulation, ~Tile
* !62122 MuonReadoutGeometry - Identifier clean up & AthMessaging ~MuonSpectrometer
* !62571 EventPrimitives : Add fixed capacity dynamic typedefs. Add test. Fix bug ~EDM
* !62586 MuonReadoutGeometry - Mitigate high CPU load in MuonSegmentMaker ~MuonSpectrometer
* !62605 ATR-27343: added missing new tau TAndP chain using L1MU18VFCH + added new ref files ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62599 ATR-26410: Photon+MET mT chains to Physics ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62492 ATR-21596 > Moving HT650 chain for Dark Showers from Dev to Physics, VBFDelayed Stream ~Trigger, ~TriggerMenu
* !61990 Updating Trigger Fast GN1 model and Adding New tagger to Trigger TLA ~BTagging, ~DQ, ~JetEtmiss, ~Trigger, ~TriggerEDM, ~TriggerJet, ~TriggerMenu
* !62508 Include MinBias SP counting step in pure new JO menu test ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62322 AFP+Jet chains DQ monitoring ~DQ, ~JetEtmiss, ~Trigger, ~TriggerMinBias
* !62579 Handle missing deadtime ~Trigger
* !62575 Switch muon trigger to use CA fast tracking interface ~Trigger, ~TriggerMenu
* !62554 Remove additional public tools from private ToolHandles in ID configs ~DQ, ~InnerDetector, ~Tracking, ~TriggerID
* !62548 Update DQM webdisplays to include most recent gFEX monitoring histograms ~DQ, ~Trigger
* !62538 Adding eEM1 and eEM2 into L1 menu for Heavy Ion runs ~Trigger, ~TriggerMenu
* !62535 BLS L1Topo trigger monitoring ~DQ, ~Trigger, ~TriggerMenu
* !62521 Updated tracking CA flags: tracking pass flags ~ACTS, ~Egamma, ~ITk, ~InnerDetector, ~Tau, ~Tracking, ~Trigger, ~TriggerID, ~TriggerMenu, ~TriggerMinBias
* !62574 MuonReadoutGeometry - Fix exception in MuonCombinedConfig Test ~MuonSpectrometer, ~Trigger
I had the following conflicts to resolve:
* InnerDetector/InDetConfig/python/ITkConfigFlags.py
* InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
* InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
* InnerDetector/InDetConfig/python/InDetTrackClusterAssValidationConfig.py
* InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_FTF.sh
* Trigger/TrigAlgorithms/TrigFastTrackFinder/python/ITkFastTrackFinderStandaloneConfig.py
In all cases I took the change from `23.0` i.e. from !62521.
cc @tstreblehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/627532023-04-28: merge 23.0 into master2023-04-29T09:41:53+02:00Edward Moyse2023-04-28: merge 23.0 into masterThis sweep contains the following MRs:
* !62704 AccumulatorCache: fix bug when deepCopy=False ~Core
* !62708 ATR-27293: Quick fix for misconfigured pixel info dumper ~Analysis, ~BTagging, ~JetEtmiss
* !62702 23.0-coverity-TruthRivetTo...This sweep contains the following MRs:
* !62704 AccumulatorCache: fix bug when deepCopy=False ~Core
* !62708 ATR-27293: Quick fix for misconfigured pixel info dumper ~Analysis, ~BTagging, ~JetEtmiss
* !62702 23.0-coverity-TruthRivetTools ~Generators
* !62699 AthConfigFlags: refactor fillFromArgs ~Core
* !62697 IOVDbSvcConfig: move AthenaPoolCnvSvc configuration ~Database
* !62693 Set DriftCircleCutTool as public tool for ambi track selection tool ~InnerDetector, ~Tracking
* !62671 MuonGeoModelTest - Add MdtDumping algorithm ~MuonSpectrometer
* !62643 newer global condition tag for Run2 CI tests ~Run2-DataOverlay-output-changed, ~Run2-DataReco-output-changed, ~Run2-MCOverlay-output-changed, ~Run2-MCReco-output-changed, ~Test, ~Tools
* !62363 AF3: Change logic for energy deposits outside of calorimeters ~Run2-AF3-output-changed, ~Simulation, ~frozen-tier0-violating
* !62595 TrigPartialEventBuilding+TriggerMenuMT: migrate PEB config to CA ~Trigger, ~TriggerEDM, ~TriggerMenu
* !62655 Add additional jTE, VjTE, GAP L1 items for heavy ion runs ~Trigger, ~TriggerMenu
* !62677 TrigMinBiasMonitoring: Fixes to MBTS monitoring + new histograms ~DQ, ~Trigger, ~TriggerMinBias
* !62707 ATLASRECTS-7607: fix Egamma TP thinning in EGAM and JETM derivations ~Derivation, ~Egamma, ~JetEtmiss, ~Trigger
* !62691 MUCTPI DQ fixes (veto, bins, minstats) ~DQ, ~Trigger
* !62694 add eFEX to tier-0 web display ~DQ, ~Trigger
* !62649 AthConfigFlags: fix hasCategory for dynamic flags ~Core
* !62644 split the plots into shifter and expert ~InnerDetector
* !62689 CREST data dump option added for IOVDbSvc ~Database
* !62628 AthenaPoolCnvSvc: Disable ChronoStatSvc usage in MT jobs ~Database
* !62650 Fix typo in test_MC20a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG ART job ~Simulation
* !62645 Fix zero Q/p covariance case ~Tracking, ~frozen-tier0-violating
* !62356 Adding large R jet GNN decoration ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !61867 L1Calo Phase1 Simulation and Monitoring updates ~DQ, ~Reconstruction, ~Trigger
* !62606 HLT Monitoring DB reading and access ~Trigger
* !62145 Debug stream recovery, Update to fix for duplicated Event Status word ~Trigger
* !62672 fix imports and number of args violations ~Digitization, ~Egamma, ~ForwardDetectors, ~InnerDetector, ~Tracking, ~Trigger, ~TriggerMenu
* !62674 ATR-27397: Fix missing Hypo Tool config for SP only MinBias chains ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62656 23.0-cppcheck-ISF_PunchThroughTools ~Simulation
* !62661 Pass context to ReadCondHandles in PixelRawDataByteStreamCnv ~InnerDetector
* !62665 The InDetSimDataCollection seems heavily used in Overlay. Let's try to use STLPool ~InnerDetector
* !62664 Updated tracking CA flags: final ITk flags ~ACTS, ~Egamma, ~ITk, ~InnerDetector, ~Tracking
* !62663 Fix issue with Pixel han-config due to non-supported DQ algorithms ~DQ
* !62598 first part of the migration of TRT extensions to CA ~Egamma, ~InnerDetector, ~Tracking, ~Trigger, ~TriggerID, ~TriggerMenu
* !62667 fixing import statements ~EDM
* !62659 TriggerMenuMT: remove CA config printout ~Trigger, ~TriggerMenu
* !62685 Remove redundant loops in OverlayCopyAlgsConfig.py ~Overlay, ~Simulation
* !62670 Pixel Overlay use DataPool ~InnerDetector, ~Overlay
* !62668 Avoid copy constructing BichselData ~Digitization, ~InnerDetector
* !62676 Tests for help messaging from AthConfigFlags ~Core
* !62675 23.0-coverity-TruthD3PDMaker ~Analysis, ~JetEtmiss
* !62678 23.0-coverity-TruthD3PDAnalysis ~Analysis
* !62687 jFEX SumEt algorithm now bitwise ~Trigger
* !62469 Restore RoI width to 225mm for the LRT step of the displaced jet trigger ~Trigger, ~TriggerID, ~TriggerMenu
* !62662 Restore the RPC RDO in the ESD stream ~MuonSpectrometer, ~Run2-DataReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Tools, ~frozen-tier0-violating
* !62686 ATR-22782: additional 4mu items ~Trigger, ~TriggerMenu
* !62642 Avoid currentContext call in ElementLink creation ~EDM
* !62652 Update default geometry and conditions for trigger ~Trigger, ~changes-trigger-counts
* !62633 HLT Jet: Making MC20 Prerec calibration default for HLT antiKt4 pflow jets (ATR-27270) ~Trigger, ~changes-trigger-counts
* !62669 fix typo in DESDM_MCP output container ~Analysis, ~frozen-tier0-violating
I had to resolve conflicts in the following files:
- InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
- Here I rejected the changes from the commit f9b188be, since this seems to only apply to `23.0`
- Tracking/Acts/ActsInterop/python/ActsCIFlags.py
- Tracking/TrkConfig/python/TrkTrackSummaryToolConfig.py
- For these two, I took the changes in !62664, just making sure that for `ActsCIFlags` they applied to `actsTrkValidateSpacePointsFlags` which does not exist on `23.0`