2025-02-26: merge of 24.0 into main
This sweep contains the following MRs:
- !78036 (merged) Fix rewriteLVL1 result - only working with RoIBResult Trigger
- !78077 (merged) add a new eEM algoVersion (not activated until update to L1Menu) that uses a new definition of rhad isolation sum and reduced contribution of PS in ET sum L1Calo, Trigger
- !78105 (merged) Use default Run conditions tag more widely #4 Simulation
- !78106 (merged) Introduce InDetStandaloneTrackFitterCfg InnerDetector, Tracking
- !78065 (merged) Updating HLT electron isolation cuts, improving online/offline egamma monitoring DQ, Egamma, Trigger
- !78079 (merged) HLTCaloCellSumMaker: code cleanup Trigger
- !78075 (merged) TrigT1TGC: avoid ReadHandleKey copies and pass EventContext Trigger
- !78074 (merged) Fix han config warning in Jet trigger monitoring DQ
- !78072 (merged) TrigBphysMonitoring: use ReadHandleKeyArray as property DQ, Trigger
Conflicts, resolved by hand:
- InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py (InDetStandaloneTrackFitter, cc @tstreble)
- Simulation/SimuJobTransforms/test/test_pileup.sh
Merge request reports
Activity
This merge request affects 13 packages:
- DataQuality/DataQualityConfigurations
- HLT/Trigger/TrigControl/TrigServices
- InnerDetector/InDetAlignment/InDetAlignConfig
- InnerDetector/InDetCalibAlgs/TRT_CalibAlgs
- Simulation/SimuJobTransforms
- Simulation/Tests/ISF_Validation
- Tracking/TrkConfig
- Trigger/TrigAlgorithms/TrigCaloRec
- Trigger/TrigHypothesis/TrigEgammaHypo
- Trigger/TrigMonitoring/TrigBphysMonitoring
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim
- Trigger/TrigT1/TrigT1TGC
Affected files list will not be printed in this case
Adding @tstreble ,@serodrig ,@wiedenma ,@damazio ,@mverissi ,@jodafons ,@fpastore ,@dossantn ,@goetz ,@efurtado ,@eegidiop ,@thompson ,@ooncel ,@will ,@fwinkl ,@cgrefe ,@jajimene ,@jlieberm ,@dbakshig ,@martis ,@calfayan ,@stelzer ,@sroe ,@ebergeas ,@junpei ,@jchapman ,@tursom ,@fernando ,@kburka as watchers
added DQ Egamma InnerDetector L1Calo Simulation Tracking Trigger main review-pending-level-1 labels
CI Result SUCCESS (hash bdc80f58)Athena AthSimulation externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
For experts only: Jenkins output (remote access info)added review-approved label and removed review-pending-level-1 label
mentioned in commit 8dd15039