2023-10-06: merge of 23.0 into main
@wlampl please check merge resolutions
Conflicts:
Calorimeter/CaloRec/python/CaloConfigFlags.py
Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
This sweep contains the following MRs:
- !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
Merge request reports
Activity
This merge request affects 12 packages:
- Calorimeter/CaloRec
- Control/AthenaConfiguration
- Control/AthenaMonitoring
- ForwardDetectors/ZDC/ZdcAnalysis
- Reconstruction/HeavyIonRec/HIRecConfig
- Reconstruction/Jet/JetRecConfig
- Reconstruction/MET/METReconstruction
- Reconstruction/RecJobTransforms
- Reconstruction/egamma/egammaConfig
- Tools/PyJobTransforms
- Tracking/TrkConfig
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @goetz ,@sutt ,@maszyman ,@miochoa ,@pavol ,@tstreble ,@gemmeren ,@dossantn ,@lidiaz ,@ssnyder ,@cantel as watchers
CI Result FAILURE (hash 8a4cd758) Athena AthSimulation AthGeneration 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
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: 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 79022] @wlampl sorry my merge resolutions seems to be wrong.
removed analysis-review-required label
added analysis-review-approved label
47 48 ccf.addFlag("Calo.TopoCluster.doCalibHitMoments",False) 48 49 ccf.addFlag("Calo.TopoCluster.writeCalibHitClusterMoments",False) 49 50 ccf.addFlag("Calo.TopoCluster.doCellWeightCalib", False) 50 ccf.addFlag("Calo.TopoCluster.addCPData",False) I'll take care of this in !66339 (merged)
mentioned in merge request !66339 (merged)