From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47384/head -> cms-sw/refs/pull/47384/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../UtilAlgos/interface/ObjectSelectorBase.h | 7 +- .../writehelpers/createExtended2021Payloads.sh | 95 +++++---- .../writehelpers/createExtended2023Payloads.sh | 95 +++++---- .../createExtended2024DD4hepPayloads.sh | 2 +- .../writehelpers/createExtended2024Payloads.sh | 95 +++++---- .../createExtended2025DD4hepPayloads.sh | 2 +- .../writehelpers/createExtended2025Payloads.sh | 95 +++++---- .../writehelpers/createExtended2026Payloads.sh | 95 +++++---- .../writehelpers/geometryExtended2021_writer.py | 71 ++++--- .../writehelpers/geometryExtended2021_xmlwriter.py | 18 +- .../writehelpers/geometryExtended2023_writer.py | 71 ++++--- .../writehelpers/geometryExtended2023_xmlwriter.py | 18 +- .../writehelpers/geometryExtended2024_writer.py | 71 ++++--- .../writehelpers/geometryExtended2024_xmlwriter.py | 18 +- .../writehelpers/geometryExtended2025_writer.py | 71 ++++--- .../writehelpers/geometryExtended2025_xmlwriter.py | 18 +- .../writehelpers/geometryExtended2026_writer.py | 71 ++++--- .../GeometryExtended2015CastorMeasured_cff.py | 4 +- .../GeometryExtended2015CastorSystMinus_cff.py | 4 +- .../GeometryExtended2015CastorSystPlus_cff.py | 4 +- .../GeometryExtended2015FlatMinus05Percent_cff.py | 4 +- .../GeometryExtended2015FlatMinus10Percent_cff.py | 4 +- .../GeometryExtended2015FlatPlus05Percent_cff.py | 4 +- .../GeometryExtended2015FlatPlus10Percent_cff.py | 4 +- .../python/GeometryExtended2015MuonGEMDev_cff.py | 2 + .../python/GeometryExtended2015ZeroMaterial_cff.py | 4 +- .../Geometry/python/GeometryExtended2015_cff.py | 4 +- .../Geometry/python/GeometryExtended2015dev_cff.py | 4 +- .../python/GeometryExtended2016_CTPPS_cff.py | 4 +- .../Geometry/python/GeometryExtended2016_cff.py | 4 +- .../Geometry/python/GeometryExtended2016dev_cff.py | 4 +- .../Geometry/python/GeometryExtended2017DDD_cff.py | 4 +- .../python/GeometryExtended2017Plan0_cff.py | 4 +- ...metryExtended2017Plan1FlatMinus05Percent_cff.py | 4 +- ...metryExtended2017Plan1FlatMinus10Percent_cff.py | 4 +- ...ometryExtended2017Plan1FlatPlus05Percent_cff.py | 5 +- ...ometryExtended2017Plan1FlatPlus10Percent_cff.py | 4 +- .../GeometryExtended2017Plan1ZeroMaterial_cff.py | 4 +- .../python/GeometryExtended2017Plan1_cff.py | 5 +- .../python/GeometryExtended2017_CTPPS_cff.py | 4 +- .../Geometry/python/GeometryExtended2017_cff.py | 4 +- .../Geometry/python/GeometryExtended2018DDD_cff.py | 4 +- .../GeometryExtended2018DetailedCavern_cff.py | 4 +- .../GeometryExtended2018FlatMinus05Percent_cff.py | 4 +- .../GeometryExtended2018FlatMinus10Percent_cff.py | 4 +- .../GeometryExtended2018FlatPlus05Percent_cff.py | 4 +- .../GeometryExtended2018FlatPlus10Percent_cff.py | 4 +- .../python/GeometryExtended2018NoSD_cff.py | 4 +- .../python/GeometryExtended2018Plan0_cff.py_cff.py | 4 +- .../python/GeometryExtended2018Plan36_cff.py | 5 +- .../python/GeometryExtended2018ZeroMaterial_cff.py | 4 +- .../python/GeometryExtended2018_CTPPS_cff.py | 4 +- .../Geometry/python/GeometryExtended2018_cff.py | 5 +- .../Geometry/python/GeometryExtended2019_cff.py | 4 +- .../GeometryExtendedCastorMeasured2015dev_cff.py | 4 +- .../GeometryExtendedCastorSystMinus2015dev_cff.py | 4 +- .../GeometryExtendedCastorSystPlus2015dev_cff.py | 4 +- .../Geometry/python/GeometryExtendedGFlash_cff.py | 4 +- .../GeometryExtendedHFLibraryNoCastor_cff.py | 4 +- .../python/GeometryExtendedTest2014_cff.py | 4 +- .../python/GeometryExtendedZeroMaterial_cff.py | 4 +- .../Geometry/python/GeometryExtended_cff.py | 5 +- .../Geometry/python/GeometryIdeal2015_cff.py | 4 +- .../Geometry/python/GeometryIdeal2015dev_cff.py | 4 +- .../Geometry/python/GeometryIdealAPD1_cff.py | 4 +- .../Geometry/python/GeometryIdealNoAPD_cff.py | 4 +- Configuration/Geometry/python/GeometryIdeal_cff.py | 4 +- .../Geometry/python/GeometryNoCastor_cff.py | 6 +- .../Geometry/python/GeometrySLHCReco_cff.py | 7 +- .../Geometry/python/GeometrySLHCSimIdeal_cff.py | 2 +- .../Geometry/python/GeometrySimAll_cff.py | 4 +- .../Geometry/python/GeometrySimIdealGFlash_cff.py | 4 +- .../Geometry/python/GeometrySimIdeal_cff.py | 4 +- .../Geometry/python/GeometrySimTracker_cff.py | 2 +- DQM/HLTEvF/plugins/TrigObjTnPHistColl.cc | 3 +- DQMOffline/RecoB/src/BTagDifferentialPlot.cc | 3 +- DQMOffline/RecoB/src/EtaPtBin.cc | 3 +- DataFormats/METReco/interface/PhiWedge.h | 65 +++++- DataFormats/METReco/src/PhiWedge.cc | 62 ------ EventFilter/Utilities/scripts/edmConfigFromDB | 223 +-------------------- .../testProducerWithPsetDesc_cfi.py | 55 ++++- .../interface/ParameterSetDescription.h | 1 + FWCore/ParameterSet/python/Config.py | 8 +- FWCore/ParameterSet/python/Mixins.py | 6 +- FWCore/ParameterSet/python/Types.py | 8 +- FWCore/ParameterSet/src/ParameterDescription.cc | 25 ++- .../test/test_catch_ParameterSetDescription.cc | 30 +++ .../Btag/python/HltBtagPostValidation_cff.py | 40 ++-- .../Btag/python/HltBtagValidation_cff.py | 63 +++--- HLTriggerOffline/Btag/test/test.py | 2 +- .../Common/python/HLTValidation_cff.py | 21 +- .../PatAlgos/plugins/PATElectronProducer.cc | 6 +- PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc | 3 +- .../src/InterestingDetIdCollectionProducer.cc | 3 +- .../InterestingDetIdFromSuperClusterProducer.cc | 3 +- .../src/ReducedRecHitCollectionProducer.cc | 3 +- .../plugins/EgammaIsoESDetIdCollectionProducer.cc | 3 +- .../EgammaIsoHcalDetIdCollectionProducer.cc | 3 +- .../plugins/PixelThresholdClusterizer.cc | 3 +- .../TimingIDTools/python/mvaTrainingNtuple_cff.py | 8 + .../test/mvaTrainingSaveNtuple_cfg.py | 9 +- .../plugins/alpaka/clusterTracksDBSCAN.h | 6 +- .../plugins/alpaka/clusterTracksIterative.h | 6 +- .../python/SelectingProcedure_cff.py | 23 ++- TauAnalysis/MCEmbeddingTools/python/customisers.py | 137 ++++++------- TauAnalysis/MCEmbeddingTools/test/BuildFile.xml | 1 + .../test/run_2022_workflow_tests.sh | 132 ++++++++++++ Validation/Configuration/python/mtdSimValid_cff.py | 2 +- .../MtdValidation/python/vertices4DValid_cff.py | 8 + Validation/MtdValidation/test/mtdValidation_cfg.py | 2 +- .../HLTPhase2TrackerValidationFirstStep_cff.py | 37 ++++ .../python/Phase2ITValidateRecHit_cff.py | 4 +- 112 files changed, 1218 insertions(+), 947 deletions(-) delete mode 100644 DataFormats/METReco/src/PhiWedge.cc create mode 100644 RecoMTD/TimingIDTools/python/mvaTrainingNtuple_cff.py create mode 100755 TauAnalysis/MCEmbeddingTools/test/run_2022_workflow_tests.sh create mode 100644 Validation/MtdValidation/python/vertices4DValid_cff.py create mode 100644 Validation/SiTrackerPhase2V/python/HLTPhase2TrackerValidationFirstStep_cff.py Switched to branch 'from-CMSSW_15_1_X_2025-02-17-2300'