2023-09-20: merge of 23.0 into main
Conflicts:
-
DataQuality/dqm_algorithms/src/TRTWeightedAverage.cxx
Kept the main version -
Reconstruction/Jet/JetMonitoring/python/JetMonitoringStandard.py
Kept the 23.0 version. CC @cdelitzs (!65911 (merged)) -
Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
Manual merge. Combined lambda with the help message for theTrigger.Jet.pflowCalibKey
flag. CC @cantel (!65831 (merged))
This sweep contains the following MRs:
- !65938 (merged) TRT config updates are merged from 'main' into '23.0' (resubmission of 65926) DQ
- !65931 (merged) ZDC: implement EventInfo flags in case of LUCROD decoding failure, and update to ZdcRecConfig ForwardDetectors
- !63562 (merged) Adding cross compatability between onnx and lwtnn as a library for NNs Simulation
- !65752 (merged) Updates to RPD/Centroid Analysis and ZdcNtuple for Heavy Ions ForwardDetectors
- !65925 (merged) merging new Algo for TRT (and few changes on config) from 'main' into '23.0' DQ
- !65911 (merged) Configure correct jet collections for monitoring in HI and UPC mode Core, DQ, JetEtmiss, Reconstruction, Tile
- !65831 (merged) Trigger Jet: Add HI UPC pflow calibration configs (ATR-22067) JetEtmiss, Reconstruction, Trigger, TriggerMenu, changes-trigger-counts
- !65881 (merged) Heavy Ion : Disable out-of-time pileup topo cluster cut Reconstruction
Edited by Vakhtang Tsulaia