2023-10-11: merge of 23.0 into main
This sweep contains the following MRs:
- !66392 (merged) HIJetRec: Fix clang warnings. JetEtmiss, Reconstruction
- !66394 (merged) ZDC: change RPD centroid enums from private to public ForwardDetectors
- !66350 (merged) Clean up of KalmanVertexOnJetAxisUpdator (ATLASRECTS-7768) JetEtmiss, Tracking
- !66334 (merged) Fix to ZDC reproducibility problem ForwardDetectors
- !66314 (merged) fix misleading warning about CaloClusterContainer/CombinedTower JetEtmiss, Reconstruction
- !66289 (merged) ATLHI-501: try to fix calo isolation for egamma and muon in HI Egamma, Reconstruction, frozen-tier0-violating
- !66269 (merged) Added general procedure of hist containing subdirs of Result/Config. DQ
- !66306 (merged) Adding UPC jet j10a chains with correct HT veto Trigger, TriggerMenu, changes-trigger-counts
- !66288 (merged) Fixes to address ZDC non-reproducibility ForwardDetectors
- !66085 (merged) Auto-config various HI-Rec modes (HI, HIP, UPC) Calorimeter, Core, DQ, Egamma, JetEtmiss, Reconstruction, Tools, Tracking
- !66291 (merged) [TriggerMenu] Added L1_gLJ80p0ETA25 and L1_gXEJWOJ100 to the HI menu CTP monitoring Trigger, TriggerMenu
I had one clash with !66085 (merged) appearing again (even though I'd swept it before, so I'm very confused) and also with ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCFitWrapper.cxx
. Here I am afraid I made have made a mistake since there are two MRs addressing similar problems:
Can you please check @steinber? Or if you can confirm that everything that goes into 23.0
is safe to sweep to main
? i.e. for ZDC main should be identical to 23.0?
Merge request reports
Activity
Hi @emoyse - main already seems to have !66288 (merged) so the changes I see here are just from !66334 (merged). In general, we are planning to have these changes swept from 23.0 to main so they can be included in AnalysisBase releases. Thus, I see no reason not to go ahead - thanks for checking.
This merge request affects 3 packages:
- ForwardDetectors/ZDC/ZdcAnalysis
- Reconstruction/HeavyIonRec/HIJetRec
- Tracking/TrkVertexFitter/TrkJetVxFitter
Affected files list will not be printed in this case
Adding @goetz as watcher
CI Result SUCCESS (hash 9168d1d2)Athena AnalysisBase AthAnalysis 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
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 79274]mentioned in commit befe908f
removed review-pending-level-1 label
added review-approved review-pending-level-1 labels
removed review-pending-level-1 label
added sweep:ignore label