From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47859/head -> cms-sw/refs/pull/47859/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../python/CloseByPGun_Barrel_Front_cfi.py | 14 + .../ProcessModifiers/python/ticl_barrel_cff.py | 3 + .../python/upgradeWorkflowComponents.py | 45 + DataFormats/CaloRecHit/interface/CaloCluster.h | 4 +- DataFormats/HGCalReco/interface/Common.h | 10 + DataFormats/HGCalReco/interface/TICLLayerTile.h | 17 +- DataFormats/HGCalReco/src/classes_def.xml | 14 + .../hltBarrelLayerClustersEBL1Seeded_cfi.py | 14 + .../modules/hltBarrelLayerClustersEB_cfi.py | 14 + .../modules/hltBarrelLayerClustersHB_cfi.py | 14 + .../modules/hltEgammaHGCALIDVarsL1Seeded_cfi.py | 2 +- .../modules/hltEgammaHGCALIDVarsUnseeded_cfi.py | 2 +- .../hltEgammaHGCalLayerClusterIsoL1Seeded_cfi.py | 2 +- .../hltEgammaHGCalLayerClusterIsoUnseeded_cfi.py | 2 +- ...tFilteredLayerClustersCLUE3DHighL1Seeded_cfi.py | 4 +- .../hltFilteredLayerClustersCLUE3DHigh_cfi.py | 4 +- ...hltFilteredLayerClustersRecoveryL1Seeded_cfi.py | 2 +- .../hltFilteredLayerClustersRecovery_cfi.py | 2 +- .../hltHgcalMergeLayerClustersL1Seeded_cfi.py | 12 - .../modules/hltHgcalMergeLayerClusters_cfi.py | 12 - .../modules/hltMergeLayerClustersL1Seeded_cfi.py | 12 + .../HLT_75e33/modules/hltMergeLayerClusters_cfi.py | 12 + ...ParticleFlowClusterHGCalFromTICLL1Seeded_cfi.py | 2 +- ...ParticleFlowClusterHGCalFromTICLUnseeded_cfi.py | 2 +- .../modules/hltParticleFlowClusterHGCal_cfi.py | 2 +- ...EM0p00dRVetoHad0p02minEEM0p00minEHad0p00_cfi.py | 2 +- .../HLT_75e33/modules/hltTiclCandidate_cfi.py | 6 +- .../hltTiclLayerTileProducerL1Seeded_cfi.py | 2 +- .../modules/hltTiclLayerTileProducer_cfi.py | 2 +- .../modules/hltTiclTracksterLinksL1Seeded_cfi.py | 6 +- .../HLT_75e33/modules/hltTiclTracksterLinks_cfi.py | 6 +- .../hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py | 6 +- .../modules/hltTiclTrackstersCLUE3DHigh_cfi.py | 6 +- .../modules/hltTiclTrackstersMerge_cfi.py | 4 +- .../hltTiclTrackstersRecoveryL1Seeded_cfi.py | 4 +- .../modules/hltTiclTrackstersRecovery_cfi.py | 4 +- .../python/HLT_75e33/paths/DST_PFScouting_cfi.py | 4 +- .../HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py | 4 +- ..._DoubleMediumChargedIsoPFTauHPS40_eta2p1_cfi.py | 4 +- ...HLT_DoubleMediumDeepTauPFTauHPS35_eta2p1_cfi.py | 4 +- ...uppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py | 4 +- ...Jets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py | 4 +- ...ed_LooseDeepTauPFTauHPS30_eta2p1_CrossL1_cfi.py | 4 +- ...p1_LooseDeepTauPFTauHPS27_eta2p1_CrossL1_cfi.py | 4 +- .../paths/HLT_IsoMu24_FromL1TkMuon_cfi.py | 6 +- ...70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py | 4 +- ...0_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py | 4 +- ...75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py | 4 +- ...0_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py | 4 +- .../HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py | 4 +- .../HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py | 4 +- .../python/HLT_75e33/paths/MC_BTV_cfi.py | 4 +- .../python/HLT_75e33/paths/MC_JME_cfi.py | 4 +- .../sequences/HLTHgcalLocalRecoSequence_cfi.py | 38 - ...iclPFClusteringForEgammaL1SeededSequence_cfi.py | 26 +- ...iclPFClusteringForEgammaUnseededSequence_cfi.py | 32 +- .../HLTHgcalTiclPFClusteringForEgamma_cfi.py | 27 +- ...HLTPFClusteringForEgammaUnseededSequence_cfi.py | 3 +- .../HLTParticleFlowClusterSequence_cfi.py | 6 +- .../sequences/HLTParticleFlowSequence_cfi.py | 3 +- .../sequences/HLTPfClusteringECALSequence_cfi.py | 3 +- .../sequences/HLTPfClusteringHBHEHFSequence_cfi.py | 3 +- .../sequences/HLTPfRecHitUnseededSequence_cfi.py | 6 + .../sequences/HLTPhoton187UnseededSequence_cfi.py | 1 + .../sequences/HLTTICLLocalRecoSequence_cfi.py | 86 ++ HLTrigger/Configuration/python/HLT_75e33_cff.py | 2 +- .../Configuration/python/HLT_75e33_timing_cff.py | 2 +- RecoHGCal/TICL/plugins/TICLLayerTileProducer.cc | 23 +- RecoHGCal/TICL/plugins/TracksterInferenceByDNN.cc | 2 + .../HGCalRecAlgos/interface/RecHitTools.h | 12 +- RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc | 41 +- .../interface/BarrelTilesConstants.h | 39 + .../interface/HGCalClusteringAlgoBase.h | 9 + .../HGCalRecProducers/interface/HGCalImagingAlgo.h | 2 + .../HGCalRecProducers/interface/HGCalLayerTiles.h | 4 + .../HGCalRecProducers/plugins/HGCalCLUEAlgo.h | 3 +- .../plugins/MergeClusterProducer.cc | 102 +- .../HGCalRecProducers/plugins/RecHitMapProducer.cc | 28 +- .../python/hgcalLayerClusters_cff.py | 4 + .../PFClusterProducer/plugins/BarrelCLUEAlgo.cc | 399 ++++++ .../PFClusterProducer/plugins/BarrelCLUEAlgo.h | 191 +++ .../plugins/BarrelLayerClusterPluginFactory.cc | 9 + .../plugins/BarrelLayerClusterProducer.cc | 193 +++ .../PFClusterProducer/plugins/BuildFile.xml | 1 + .../plugins/PFClusterFromHGCalTrackster.cc | 5 +- .../python/barrelLayerClusters_cff.py | 29 + .../python/particleFlowCluster_cff.py | 11 + .../plugins/LCToCPAssociatorByEnergyScoreImpl.cc | 30 +- .../LCToCPAssociatorByEnergyScoreProducer.cc | 6 +- .../plugins/LCToSCAssociatorByEnergyScoreImpl.cc | 44 +- .../LCToSCAssociatorByEnergyScoreProducer.cc | 6 +- .../python/LCToCPAssociation_cfi.py | 6 + .../python/LCToSCAssociation_cfi.py | 6 + .../CaloAnalysis/plugins/CaloTruthAccumulator.cc | 3 +- Validation/Configuration/python/autoValidation.py | 5 +- .../Configuration/python/barrelSimValid_cff.py | 17 + .../Configuration/python/globalValidation_cff.py | 13 + .../Configuration/python/postValidation_cff.py | 6 + .../interface/BarrelVHistoProducerAlgo.h | 403 ++++++ .../HGCalValidation/interface/BarrelValidator.h | 112 ++ .../HGCalValidation/plugins/BarrelValidator.cc | 563 ++++++++ Validation/HGCalValidation/plugins/SealModule.cc | 2 + .../python/BarrelPostProcessor_cff.py | 10 + .../HGCalValidation/python/BarrelValidator_cff.py | 6 + .../python/HGCalPostProcessor_cff.py | 1 + .../python/PostProcessorBarrel_cfi.py | 27 + .../src/BarrelVHistoProducerAlgo.cc | 1433 ++++++++++++++++++++ .../HGCalValidation/src/HGVHistoProducerAlgo.cc | 29 +- 108 files changed, 4140 insertions(+), 274 deletions(-) create mode 100644 Configuration/Generator/python/CloseByPGun_Barrel_Front_cfi.py create mode 100644 Configuration/ProcessModifiers/python/ticl_barrel_cff.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltBarrelLayerClustersEBL1Seeded_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltBarrelLayerClustersEB_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltBarrelLayerClustersHB_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClustersL1Seeded_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClusters_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltMergeLayerClustersL1Seeded_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltMergeLayerClusters_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalLocalRecoSequence_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfRecHitUnseededSequence_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTICLLocalRecoSequence_cfi.py create mode 100644 RecoLocalCalo/HGCalRecProducers/interface/BarrelTilesConstants.h create mode 100644 RecoParticleFlow/PFClusterProducer/plugins/BarrelCLUEAlgo.cc create mode 100644 RecoParticleFlow/PFClusterProducer/plugins/BarrelCLUEAlgo.h create mode 100644 RecoParticleFlow/PFClusterProducer/plugins/BarrelLayerClusterPluginFactory.cc create mode 100644 RecoParticleFlow/PFClusterProducer/plugins/BarrelLayerClusterProducer.cc create mode 100644 RecoParticleFlow/PFClusterProducer/python/barrelLayerClusters_cff.py create mode 100644 Validation/Configuration/python/barrelSimValid_cff.py create mode 100644 Validation/HGCalValidation/interface/BarrelVHistoProducerAlgo.h create mode 100644 Validation/HGCalValidation/interface/BarrelValidator.h create mode 100644 Validation/HGCalValidation/plugins/BarrelValidator.cc create mode 100644 Validation/HGCalValidation/python/BarrelPostProcessor_cff.py create mode 100644 Validation/HGCalValidation/python/BarrelValidator_cff.py create mode 100644 Validation/HGCalValidation/python/PostProcessorBarrel_cfi.py create mode 100644 Validation/HGCalValidation/src/BarrelVHistoProducerAlgo.cc Switched to branch 'from-CMSSW_15_1_X_2025-04-16-1100'