Minor conflict in HIGG1D1.py
This sweep contains the following MRs:
- !62850 (merged) Try to fix issues when we have just solenoid map Magnets
- !62848 (merged) AthConfigFlags.getArgumentParser: Use choices for appropriate arguments Core
- !62847 (merged) Add --interactive and --skipEvents option to CARunner.py Core
- !62843 (merged) ComponentAccumulator: remove private member access and add getCondAlgos Calorimeter, Core, DQ, LAr, Reconstruction, Simulation
- !62842 (merged) Digitization: delete unused/broken testing script Digitization, Simulation
- !62838 (merged) Save SiSP track clusters when requested InnerDetector
- !61980 (merged) Modularise in-file metadata configuration Analysis, BTagging, Core, Database, Derivation, Digitization, EDM, JetEtmiss, Overlay, Reconstruction, Simulation, Trigger
- !62836 (merged) Added Zprime extended dsid for PhysVal Analysis, BTagging, JetEtmiss
- !62826 (merged) L2SA resolution modeling and L2SA pT extrapolation to IP for muComb Trigger, changes-trigger-counts
- !62820 (merged) AthenaKernel: Dump empty tsmaps. Core
- !62318 (merged) Add linear extrapolation in RUN1/2 data/mc Digitization, InnerDetector, Run2-DataOverlay-output-changed, Run2-DataReco-output-changed, Run2-MCOverlay-output-changed, Run2-MCReco-output-changed, Test, Tools, Trigger, frozen-tier0-violating
- !62824 (merged) Clean up unused properties for secondary vertex tools BTagging, InnerDetector, JetEtmiss, Tracking
- !62821 (merged) CxxUtils: Clean up temporary declaration. Core
- !62805 (merged) FCS memory leak fix Simulation
- !62815 (merged) MuonReadoutGeometry: Fix compilation in dbg build. MuonSpectrometer
- !62799 (merged) remove MM hits from channels that are not connected to the detector MuonSpectrometer
- !62813 (merged) CxxUtils: Fix potential problem with inserting into an empty container. Core
- !62828 (merged) Adding TruthPileupEvents to variables stored in DAOD_PHYSVAL Derivation
- !62830 (merged) Update input ESD file for MET reco test. Reconstruction
- !62833 (merged) Update conditions tag for test_RUN3_AF3InputParamFiles.sh ART build test (ATLASSIM-6547) Simulation
- !62834 (merged) Adding jFEX 6b error into the monitoring Trigger
- !62831 (merged) TrigHLTJetHypo: remove unnecessary deep-copies JetEtmiss, Trigger, TriggerJet
- !62803 (merged) Adding UPC and jet triggers with jTE in HI dev menu Trigger, TriggerMenu
- !60675 (merged) athenaHLT: add support for CA modules Trigger
- !62791 (merged) moving forward fast electrons to CA Trigger, TriggerMenu
- !62809 (merged) Muctpi DQ fixes DQ, Trigger
- !62804 (merged) Add b-jet preselction and tau tag and probe chains to the tier0 monitoring DQ, Trigger
- !62818 (merged) MuonCompetingClustersOnTrackCreator: Fix cppcheck warning. MuonSpectrometer, Trigger