2023-09-24: merge of 23.0 into main
Reverted/Removed:
- !63562 (merged) Adding cross compatability between onnx and lwtnn as a library for NNs Simulation CC @hdayhall and @tsulaia - this MR creates ctest problems in MR !65944 (closed)
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)) -
Simulation/G4Extensions/RHadrons/src/CustomParticleFactory.cxx
Kept the 23.0 version. CC @jchapman (!65834 (merged))
This sweep contains the following MRs:
- !66006 (merged) fixing bug in electron triggers for Pb+Pb run Egamma, Trigger, TriggerMenu, changes-trigger-counts
- !65946 (merged) Update the trigger HI references DQ, Egamma, Trigger
- !65954 (merged) copy collisions_run.config to other config files DQ, MuonSpectrometer
- !65955 (merged) automating choice of best chain for tag and probe for HLT muon efficiency monitoring DQ, Trigger
- !65795 (merged) Add UPC pflow jet chains to HI Menu DQ, JetEtmiss, Reconstruction, Trigger, TriggerJet, TriggerMenu, changes-trigger-counts
- !65951 (merged) TrigMinBiasMonitoring: Add few missing chains to monitoring DQ, Trigger, TriggerMinBias
- !65958 (merged) Update heavyions_run.config with new DQ references for the express, physics_Main and UPC streams DQ
-
!65950 (merged) Add
pixCLnoToT
toHLT_SpacePointCounts
container Trigger, TriggerEDM - !65834 (merged) Getting RHadrons Simulation working in ComponentAccumulator-based jobs Core, ForwardDetectors, InnerDetector, Simulation
- !65945 (merged) Adding HLT_AntiKt4EMPFlowJets_jes_ftf jets to the EDM (ATR-22067) Trigger, TriggerEDM
- !65943 (merged) Update IDGlobal Monitoring axis ranges and several plots for HI config DQ, InnerDetector
- !65947 (merged) Further tune electron selection for UPC Egamma, Reconstruction
- !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
- !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 Johannes Elmsheuser