From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/46821/head -> cms-sw/refs/pull/46821/head Switched to branch 'merge-attempt' Auto-merging FWCore/Integration/plugins/BuildFile.xml Merge made by the 'ort' strategy. DataFormats/Common/interface/Wrapper.h | 29 +++- DataFormats/Common/interface/WrapperBase.h | 3 +- DataFormats/METReco/interface/PhiWedge.h | 65 ++++++-- DataFormats/METReco/src/PhiWedge.cc | 62 ------- DataFormats/Provenance/interface/BranchPattern.h | 66 ++++++++ DataFormats/Provenance/src/BranchPattern.cc | 97 +++++++++++ .../TestObjects/interface/ThingWithDoNotSort.h | 27 ++++ .../TestObjects/interface/ThingWithPostInsert.h | 26 +++ DataFormats/TestObjects/src/classes.h | 2 + DataFormats/TestObjects/src/classes_def.xml | 10 ++ FWCore/Framework/interface/GenericProduct.h | 103 ++++++++++++ FWCore/Integration/plugins/BuildFile.xml | 12 +- .../Integration/plugins/GenericProductProducer.cc | 148 +++++++++++++++++ FWCore/Integration/plugins/PostInsertProducer.cc | 87 ++++++++++ FWCore/Integration/test/BuildFile.xml | 1 + .../test/testGenericProductProducer_cg.py | 15 ++ .../Integration/test/testPostInsertProducer_cfg.py | 15 ++ FWCore/Modules/src/GenericConsumer.cc | 92 ++--------- FWCore/Reflection/interface/ObjectWithDict.h | 10 +- FWCore/TestModules/README.md | 11 ++ FWCore/TestModules/plugins/GenericCloner.cc | 179 +++++++++++++++++++++ FWCore/TestModules/test/BuildFile.xml | 2 + FWCore/TestModules/test/testGenericCloner_cfg.py | 36 +++++ 23 files changed, 937 insertions(+), 161 deletions(-) delete mode 100644 DataFormats/METReco/src/PhiWedge.cc create mode 100644 DataFormats/Provenance/interface/BranchPattern.h create mode 100644 DataFormats/Provenance/src/BranchPattern.cc create mode 100644 DataFormats/TestObjects/interface/ThingWithDoNotSort.h create mode 100644 DataFormats/TestObjects/interface/ThingWithPostInsert.h create mode 100644 FWCore/Framework/interface/GenericProduct.h create mode 100644 FWCore/Integration/plugins/GenericProductProducer.cc create mode 100644 FWCore/Integration/plugins/PostInsertProducer.cc create mode 100644 FWCore/Integration/test/testGenericProductProducer_cg.py create mode 100644 FWCore/Integration/test/testPostInsertProducer_cfg.py create mode 100644 FWCore/TestModules/plugins/GenericCloner.cc create mode 100644 FWCore/TestModules/test/testGenericCloner_cfg.py Switched to branch 'from-CMSSW_15_1_X_2025-02-16-2300'