diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index cd5cb40268b60..1d87fe0c1011d 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -48,13 +48,20 @@ def customiseForOffline(process): return process -def customiseForXXXX(process): +def customiseHLTFor46647(process): for prod in producers_by_type(process, 'CtfSpecialSeedGenerator'): if hasattr(prod, "DontCountDetsAboveNClusters"): value = prod.DontCountDetsAboveNClusters.value() delattr(prod, "DontCountDetsAboveNClusters") # Replace it with cms.uint32 prod.DontCountDetsAboveNClusters = cms.uint32(value) + + for prod in producers_by_type(process, 'SeedCombiner'): + if hasattr(prod, "PairCollection"): + delattr(prod, "PairCollection") + if hasattr(prod, "TripletCollection"): + delattr(prod, "TripletCollection") + return process # CMSSW version specific customizations @@ -65,6 +72,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) - process = customiseForXXXX(process) + process = customiseHLTFor46647(process) return process diff --git a/RecoTracker/Configuration/python/RecoTrackerP5_cff.py b/RecoTracker/Configuration/python/RecoTrackerP5_cff.py index 81b08a72720be..0521d02a773ff 100644 --- a/RecoTracker/Configuration/python/RecoTrackerP5_cff.py +++ b/RecoTracker/Configuration/python/RecoTrackerP5_cff.py @@ -20,10 +20,7 @@ from RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cff import * combinedP5SeedsForCTF = RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cfi.globalCombinedSeeds.clone( seedCollections = ['combinatorialcosmicseedfinderP5', - 'simpleCosmicBONSeeds'], - #backward compatibility 2.2/3.1 - PairCollection = cms.InputTag('combinatorialcosmicseedfinderP5'), - TripletCollection = cms.InputTag('simpleCosmicBONSeeds') + 'simpleCosmicBONSeeds'] ) from RecoTracker.CkfPattern.CkfTrackCandidatesP5_cff import * diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.cc b/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.cc index 29ae13d181762..eb7d187c4bb25 100644 --- a/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.cc +++ b/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.cc @@ -43,8 +43,6 @@ SeedCombiner::SeedCombiner(const edm::ParameterSet& cfg) { } } -SeedCombiner::~SeedCombiner() {} - void SeedCombiner::produce(edm::Event& ev, const edm::EventSetup& es) { // Read inputs, and count total seeds size_t ninputs = inputCollections_.size(); @@ -85,3 +83,10 @@ void SeedCombiner::produce(edm::Event& ev, const edm::EventSetup& es) { // Save result into the event ev.put(std::move(result)); } + +void SeedCombiner::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add >("seedCollections", {}); + desc.addOptional >("clusterRemovalInfos", {}); + descriptions.addWithDefaultLabel(desc); +} diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h b/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h index 280fa6a2a6598..7410b1128628b 100644 --- a/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h +++ b/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h @@ -2,9 +2,11 @@ #define RecoTracker_TkSeedGenerator_SeedCombiner_H #include -#include "FWCore/Framework/interface/stream/EDProducer.h" -#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" #include "DataFormats/TrackerRecHit2D/interface/ClusterRemovalInfo.h" +#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/Visibility.h" @@ -17,7 +19,9 @@ namespace edm { class dso_hidden SeedCombiner : public edm::stream::EDProducer<> { public: SeedCombiner(const edm::ParameterSet& cfg); - ~SeedCombiner() override; + ~SeedCombiner() override = default; + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); void produce(edm::Event& ev, const edm::EventSetup& es) override;