2023-10-02: merge of 23.0 into main
Conflicts:
DataQuality/DataQualityConfigurations/config/Jets/heavyions_minutes10.config
DataQuality/DataQualityConfigurations/config/Jets/heavyions_run.config
This sweep contains the following MRs:
- !66158 (merged) JiveXML config migration to CA EventDisplay
- !66175 (merged) Accelerate HIJetDRAssociationTool by shortening the loop over constituents JetEtmiss, Reconstruction, Trigger, TriggerJet
- !66141 (merged) Retry - Adding PFlow jets to heavy ion jet monitoring DQ, JetEtmiss
- !66160 (merged) Merge branch 'will-main-patch-45318' into '23.0' Core, DQ
- !66157 (merged) Trigger test wiht new HI data and menu Trigger
Edited by Adam Edward Barton
Merge request reports
Activity
This merge request affects 5 packages:
- DataQuality/DataQualityConfigurations
- Reconstruction/HeavyIonRec/HIJetRec
- Trigger/TrigValidation/TrigP1Test
- Trigger/TrigValidation/TrigValTools
- graphics/JiveXML
Affected files list will not be printed in this case
Adding @goetz ,@martindl ,@fpastore ,@salderwe ,@vmartin ,@okumura ,@rbianchi as watchers
added DQ EventDisplay JetEtmiss Reconstruction Trigger main review-pending-level-1 labels
CI Result SUCCESS (hash 460258d2)Athena 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
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 78778]FYI @sawyer about conflict in sweep
added review-approved label and removed review-pending-level-1 label
mentioned in commit 0f1ecfbc
added sweep:ignore label
Please register or sign in to reply