From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48408/head -> cms-sw/refs/pull/48408/head Switched to branch 'merge-attempt' Auto-merging Configuration/Applications/python/ConfigBuilder.py Auto-merging Configuration/EventContent/python/EventContent_cff.py Auto-merging Configuration/PyReleaseValidation/python/relval_standard.py Auto-merging Configuration/PyReleaseValidation/python/relval_steps.py Auto-merging TauAnalysis/MCEmbeddingTools/plugins/EmbeddingLHEProducer.cc Merge made by the 'ort' strategy. Configuration/Applications/python/ConfigBuilder.py | 6 + .../EventContent/python/EventContent_cff.py | 32 + .../python/tau_embedding_emu_cff.py | 4 + .../python/tau_embedding_etauh_cff.py | 4 + .../python/tau_embedding_mu_to_e_cff.py | 4 + .../python/tau_embedding_mu_to_mu_cff.py | 4 + .../python/tau_embedding_mutauh_cff.py | 4 + .../python/tau_embedding_tauhtauh_cff.py | 4 + .../PyReleaseValidation/python/relval_standard.py | 8 +- .../PyReleaseValidation/python/relval_steps.py | 58 +- TauAnalysis/MCEmbeddingTools/docs/README | 30 - TauAnalysis/MCEmbeddingTools/docs/README.md | 159 +++ .../docs/cmsDriver_cmds_DATA_RUN3.sh | 160 +++ .../{plugins => interface}/CaloCleaner.h | 0 .../{plugins => interface}/CollectionMerger.h | 0 .../DoubleCollectionMerger.h | 0 .../EmbeddingBeamSpotOnlineProducer.h | 0 .../{plugins => interface}/MuonDetCleaner.h | 0 .../{plugins => interface}/TrackMergeremb.h | 0 .../{plugins => interface}/TrackerCleaner.h | 0 .../MCEmbeddingTools/plugins/CaloCleaner.cc | 2 +- .../MCEmbeddingTools/plugins/CollectionMerger.cc | 2 +- .../plugins/DoubleCollectionMerger.cc | 2 +- .../plugins/EmbeddingBeamSpotOnlineProducer.cc | 2 +- .../plugins/EmbeddingLHEProducer.cc | 129 +-- .../plugins/MuMuForEmbeddingSelector.cc | 91 +- .../MCEmbeddingTools/plugins/MuonDetCleaner.cc | 2 +- .../MCEmbeddingTools/plugins/TrackMergeremb.cc | 2 +- .../MCEmbeddingTools/plugins/TrackerCleaner.cc | 2 +- .../MCEmbeddingTools/python/Cleaning_RECO_cff.py | 160 +++ .../python/EmbeddingBeamSpotOnline_cfi.py | 6 - .../EmbeddingHltPixelVerticesProducer_cfi.py | 4 - .../python/EmbeddingLHEProducer_cfi.py | 14 - .../python/EmbeddingPythia8Hadronizer_cfi.py | 47 - .../python/EmbeddingVertexCorrector_cfi.py | 6 - .../python/Embedding_EventContent_cff.py | 206 ++++ .../MCEmbeddingTools/python/LHE_USER_cff.py | 50 + .../MCEmbeddingTools/python/Merging_USER_cff.py | 347 ++++++ TauAnalysis/MCEmbeddingTools/python/Nano_cff.py | 178 +++ ...ingProcedure_cff.py => Selection_FILTER_cff.py} | 65 +- .../MCEmbeddingTools/python/Simulation_GEN_cfi.py | 201 ++++ .../python/Simulation_HLT_customiser_cff.py | 47 + .../MCEmbeddingTools/python/Simulation_RECO_cff.py | 24 + TauAnalysis/MCEmbeddingTools/python/customisers.py | 1145 -------------------- .../test/run_2016postVFPUL_workflow_tests.sh | 65 +- .../test/run_2016preVFPUL_workflow_tests.sh | 65 +- .../test/run_2017UL_workflow_tests.sh | 65 +- .../test/run_2018UL_workflow_tests.sh | 65 +- .../test/run_2022_workflow_tests.sh | 65 +- 49 files changed, 1894 insertions(+), 1642 deletions(-) create mode 100644 Configuration/ProcessModifiers/python/tau_embedding_emu_cff.py create mode 100644 Configuration/ProcessModifiers/python/tau_embedding_etauh_cff.py create mode 100644 Configuration/ProcessModifiers/python/tau_embedding_mu_to_e_cff.py create mode 100644 Configuration/ProcessModifiers/python/tau_embedding_mu_to_mu_cff.py create mode 100644 Configuration/ProcessModifiers/python/tau_embedding_mutauh_cff.py create mode 100644 Configuration/ProcessModifiers/python/tau_embedding_tauhtauh_cff.py delete mode 100644 TauAnalysis/MCEmbeddingTools/docs/README create mode 100644 TauAnalysis/MCEmbeddingTools/docs/README.md create mode 100644 TauAnalysis/MCEmbeddingTools/docs/cmsDriver_cmds_DATA_RUN3.sh rename TauAnalysis/MCEmbeddingTools/{plugins => interface}/CaloCleaner.h (100%) rename TauAnalysis/MCEmbeddingTools/{plugins => interface}/CollectionMerger.h (100%) rename TauAnalysis/MCEmbeddingTools/{plugins => interface}/DoubleCollectionMerger.h (100%) rename TauAnalysis/MCEmbeddingTools/{plugins => interface}/EmbeddingBeamSpotOnlineProducer.h (100%) rename TauAnalysis/MCEmbeddingTools/{plugins => interface}/MuonDetCleaner.h (100%) rename TauAnalysis/MCEmbeddingTools/{plugins => interface}/TrackMergeremb.h (100%) rename TauAnalysis/MCEmbeddingTools/{plugins => interface}/TrackerCleaner.h (100%) create mode 100644 TauAnalysis/MCEmbeddingTools/python/Cleaning_RECO_cff.py delete mode 100644 TauAnalysis/MCEmbeddingTools/python/EmbeddingBeamSpotOnline_cfi.py delete mode 100644 TauAnalysis/MCEmbeddingTools/python/EmbeddingHltPixelVerticesProducer_cfi.py delete mode 100644 TauAnalysis/MCEmbeddingTools/python/EmbeddingLHEProducer_cfi.py delete mode 100644 TauAnalysis/MCEmbeddingTools/python/EmbeddingPythia8Hadronizer_cfi.py delete mode 100644 TauAnalysis/MCEmbeddingTools/python/EmbeddingVertexCorrector_cfi.py create mode 100644 TauAnalysis/MCEmbeddingTools/python/Embedding_EventContent_cff.py create mode 100644 TauAnalysis/MCEmbeddingTools/python/LHE_USER_cff.py create mode 100644 TauAnalysis/MCEmbeddingTools/python/Merging_USER_cff.py create mode 100644 TauAnalysis/MCEmbeddingTools/python/Nano_cff.py rename TauAnalysis/MCEmbeddingTools/python/{SelectingProcedure_cff.py => Selection_FILTER_cff.py} (70%) create mode 100644 TauAnalysis/MCEmbeddingTools/python/Simulation_GEN_cfi.py create mode 100644 TauAnalysis/MCEmbeddingTools/python/Simulation_HLT_customiser_cff.py create mode 100644 TauAnalysis/MCEmbeddingTools/python/Simulation_RECO_cff.py delete mode 100644 TauAnalysis/MCEmbeddingTools/python/customisers.py Switched to branch 'from-CMSSW_15_1_X_2025-07-02-1100'