diff --git a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc
index 3fe42c886bba6..91b307a3f3b3d 100644
--- a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc
+++ b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc
@@ -41,7 +41,12 @@ DTuROSRawToDigi::DTuROSRawToDigi(const edm::ParameterSet& pset) {
   mapping_token_ = esConsumes<DTReadOutMapping, DTReadOutMappingRcd>();
 }
 
-DTuROSRawToDigi::~DTuROSRawToDigi() {}
+void DTuROSRawToDigi::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("inputLabel", edm::InputTag("rawDataCollector"));
+  desc.addUntracked<bool>("debug", false);
+  descriptions.addWithDefaultLabel(desc);
+}
 
 void DTuROSRawToDigi::produce(edm::Event& e, const edm::EventSetup& c) {
   DTDigiCollection digis;
diff --git a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.h b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.h
index 54d42c906a7d7..9ed3feb6eae07 100644
--- a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.h
+++ b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.h
@@ -14,22 +14,23 @@
 #ifndef DTRawToDigi_DTuROSRawToDigi_h
 #define DTRawToDigi_DTuROSRawToDigi_h
 
-#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "CondFormats/DTObjects/interface/DTReadOutMapping.h"
+#include "CondFormats/DataRecord/interface/DTReadOutMappingRcd.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/DTDigi/interface/DTDigiCollection.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
+#include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-#include "DataFormats/MuonDetId/interface/DTLayerId.h"
-#include "CondFormats/DTObjects/interface/DTReadOutMapping.h"
-#include "CondFormats/DataRecord/interface/DTReadOutMappingRcd.h"
-
-#include <DataFormats/FEDRawData/interface/FEDRawDataCollection.h>
-#include <DataFormats/FEDRawData/interface/FEDNumbering.h>
-#include <FWCore/Framework/interface/stream/EDProducer.h>
-#include <FWCore/ParameterSet/interface/ParameterSet.h>
-#include <FWCore/Utilities/interface/InputTag.h>
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include <string>
 
@@ -42,7 +43,7 @@ class DTuROSRawToDigi : public edm::stream::EDProducer<> {
   DTuROSRawToDigi(const edm::ParameterSet& pset);
 
   /// Destructor
-  ~DTuROSRawToDigi() override;
+  ~DTuROSRawToDigi() override = default;
 
   /// Produce digis out of raw data
   void produce(edm::Event& e, const edm::EventSetup& c) override;
@@ -50,6 +51,8 @@ class DTuROSRawToDigi : public edm::stream::EDProducer<> {
   /// Generate and fill FED raw data for a full event
   bool fillRawData(edm::Event& e, const edm::EventSetup& c, DTDigiCollection& digis, std::vector<DTuROSFEDData>& words);
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
 private:
   edm::InputTag DTuROSInputTag_;
 
diff --git a/EventFilter/DTRawToDigi/python/dturosunpacker_cfi.py b/EventFilter/DTRawToDigi/python/dturosunpacker_cfi.py
index c15e27cf86fdc..dc19ddbdc306d 100644
--- a/EventFilter/DTRawToDigi/python/dturosunpacker_cfi.py
+++ b/EventFilter/DTRawToDigi/python/dturosunpacker_cfi.py
@@ -1,6 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-dturosunpacker = cms.EDProducer("DTuROSRawToDigi",
-                                  inputLabel = cms.InputTag("rawDataCollector"),
-                                  debug = cms.untracked.bool(False),
-                               )
+from EventFilter.DTRawToDigi.dTuROSRawToDigi_cfi import dTuROSRawToDigi as _dTuROSRawToDigi
+dturosunpacker = _dTuROSRawToDigi.clone()
diff --git a/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py b/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py
index 324fdc42a802c..33f51acd14d26 100644
--- a/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py
+++ b/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py
@@ -1,11 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-rawDataCollector = cms.EDProducer("RawDataCollectorByLabel",
-    verbose = cms.untracked.int32(1),     # 0 = quiet, 1 = collection list, 2 = FED list
-    RawCollectionList = cms.VInputTag( cms.InputTag('SiStripDigiToZSRaw'),
-                                       cms.InputTag('rawDataCollector'))
-)
-
+from EventFilter.RawDataCollector.default_rawDataCollectorByLabel_cfi import default_rawDataCollectorByLabel as _rawDataCollectorByLabel
+rawDataCollector = _rawDataCollectorByLabel.clone()
 #
 # Make changes if using the Stage 1 trigger
 #
diff --git a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc b/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc
index 657e25ee7a7d6..b8ced3f48f225 100644
--- a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc
+++ b/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc
@@ -3,18 +3,19 @@
  *
  */
 
-#include "EventFilter/RawDataCollector/src/RawDataCollectorByLabel.h"
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
-
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/Event.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawData.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/Provenance/interface/ProcessHistory.h"
+#include "EventFilter/RawDataCollector/src/RawDataCollectorByLabel.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 #include <iostream>
 
@@ -31,7 +32,13 @@ RawDataCollectorByLabel::RawDataCollectorByLabel(const edm::ParameterSet &pset)
   produces<FEDRawDataCollection>();
 }
 
-RawDataCollectorByLabel::~RawDataCollectorByLabel() {}
+void RawDataCollectorByLabel::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<std::vector<InputTag> >("RawCollectionList",
+                                   {edm::InputTag("SiStripDigiToZSRaw"), edm::InputTag("rawDataCollector")});
+  desc.addUntracked<int>("verbose", 0)->setComment("0 = quiet, 1 = collection list, 2 = FED list");
+  descriptions.add("default_rawDataCollectorByLabel", desc);
+}
 
 void RawDataCollectorByLabel::produce(Event &e, const EventSetup &c) {
   /// Get Data from all FEDs
diff --git a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.h b/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.h
index 87aa5f242be51..e748b2b884fe5 100644
--- a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.h
+++ b/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.h
@@ -17,10 +17,12 @@ class RawDataCollectorByLabel : public edm::stream::EDProducer<> {
   RawDataCollectorByLabel(const edm::ParameterSet& pset);
 
   ///Destructor
-  ~RawDataCollectorByLabel() override;
+  ~RawDataCollectorByLabel() override = default;
 
   void produce(edm::Event& e, const edm::EventSetup& c) override;
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
 private:
   typedef std::vector<edm::InputTag>::const_iterator tag_iterator_t;
   typedef std::vector<edm::EDGetTokenT<FEDRawDataCollection> >::const_iterator tok_iterator_t;
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py
index 4c21c9e410770..ec464e133b5c1 100644
--- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py
+++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py
@@ -1,7 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent = cms.EDProducer("MaskedMeasurementTrackerEventProducer",
-    OnDemand = cms.bool(False),
     phase2clustersToSkip = cms.InputTag("hltIter2Phase2L3FromL1TkMuonClustersRefRemoval"),
     src = cms.InputTag("hltMeasurementTrackerEvent")
 )
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelRecHits_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelRecHits_cfi.py
index 98e1ba1899408..f0248206f35a6 100644
--- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelRecHits_cfi.py
+++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelRecHits_cfi.py
@@ -2,7 +2,6 @@
 
 hltSiPixelRecHits = cms.EDProducer("SiPixelRecHitConverter",
     CPE = cms.string('PixelCPEGeneric'),
-    VerboseLevel = cms.untracked.int32(0),
     src = cms.InputTag("hltSiPixelClusters")
 )
 
diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
index 3d37a07194f46..044f25fb963ef 100644
--- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
+++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -65,6 +65,25 @@ def customizeHLTfor46935(process):
             delattr(prod, 'recHitsLabelCPUEE')
     return process
 
+
+def customizeHLTfor47017(process):
+    """Remove unneeded parameters from the HLT menu"""
+    for prod in producers_by_type(process, 'MaskedMeasurementTrackerEventProducer'):
+        if hasattr(prod, 'OnDemand'):
+            delattr(prod, 'OnDemand')
+
+    for prod in producers_by_type(process, 'HcalHaloDataProducer'):
+        if hasattr(prod, 'HcalMaxMatchingRadiusParam'):
+            delattr(prod, 'HcalMaxMatchingRadiusParam')
+        if hasattr(prod, 'HcalMinMatchingRadiusParam'):
+            delattr(prod, 'HcalMinMatchingRadiusParam')
+
+    for prod in producers_by_type(process, 'SiPixelRecHitConverter'):
+        if hasattr(prod, 'VerboseLevel'):
+            delattr(prod, 'VerboseLevel')
+
+    return process
+
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):
 
@@ -74,5 +93,7 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
     # process = customiseFor12718(process)
 
     process = customizeHLTfor46935(process)
+    process = customizeHLTfor47017(process)
     
     return process
+
diff --git a/RecoLocalMuon/CSCSegment/python/cscSegments_cfi.py b/RecoLocalMuon/CSCSegment/python/cscSegments_cfi.py
index b42fcc812201c..9a8f280739435 100644
--- a/RecoLocalMuon/CSCSegment/python/cscSegments_cfi.py
+++ b/RecoLocalMuon/CSCSegment/python/cscSegments_cfi.py
@@ -6,7 +6,8 @@
 from RecoLocalMuon.CSCSegment.CSCSegmentAlgorithmST_cfi import *
 from RecoLocalMuon.CSCSegment.CSCSegmentAlgorithmRU_cfi import *
 
-cscSegments = cms.EDProducer("CSCSegmentProducer",
+from RecoLocalMuon.CSCSegment.cscSegmentProducer_cfi import cscSegmentProducer as _cscSegmentProducer
+cscSegments = _cscSegmentProducer.clone(
     # Define input
     inputObjects = cms.InputTag("csc2DRecHits"),
     # Choice of the building algo: 1 SK, 2 TC, 3 DF, 4 ST, 5 RU, ...
diff --git a/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.cc b/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.cc
index 1aa82c2383975..7caf67e2cadc2 100644
--- a/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.cc
+++ b/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.cc
@@ -23,7 +23,7 @@ CSCSegmentBuilder::CSCSegmentBuilder(const edm::ParameterSet& ps) : geom_(nullpt
   int chosenAlgo = ps.getParameter<int>("algo_type") - 1;
 
   // Find appropriate ParameterSets for each algo type
-  std::vector<edm::ParameterSet> algoPSets = ps.getParameter<std::vector<edm::ParameterSet> >("algo_psets");
+  std::vector<edm::ParameterSet> algoPSets = ps.getParameter<std::vector<edm::ParameterSet>>("algo_psets");
 
   // Now load the right parameter set
   // Algo name
@@ -33,14 +33,14 @@ CSCSegmentBuilder::CSCSegmentBuilder(const edm::ParameterSet& ps) : geom_(nullpt
 
   // SegAlgo parameter set
   std::vector<edm::ParameterSet> segAlgoPSet =
-      algoPSets[chosenAlgo].getParameter<std::vector<edm::ParameterSet> >("algo_psets");
+      algoPSets[chosenAlgo].getParameter<std::vector<edm::ParameterSet>>("algo_psets");
 
   // Chamber types to handle
-  std::vector<std::string> chType = algoPSets[chosenAlgo].getParameter<std::vector<std::string> >("chamber_types");
+  std::vector<std::string> chType = algoPSets[chosenAlgo].getParameter<std::vector<std::string>>("chamber_types");
   LogDebug("CSCSegment|CSC") << "No. of chamber types to handle: " << chType.size();
 
   // Algo to chamber type
-  std::vector<int> algoToType = algoPSets[chosenAlgo].getParameter<std::vector<int> >("parameters_per_chamber_type");
+  std::vector<int> algoToType = algoPSets[chosenAlgo].getParameter<std::vector<int>>("parameters_per_chamber_type");
 
   // Trap if we don't have enough parameter sets or haven't assigned an algo to every type
   if (algoToType.size() != chType.size()) {
@@ -101,3 +101,30 @@ void CSCSegmentBuilder::build(const CSCRecHit2DCollection* recHits, CSCSegmentCo
 }
 
 void CSCSegmentBuilder::setGeometry(const CSCGeometry* geom) { geom_ = geom; }
+
+void CSCSegmentBuilder::fillPSetDescription(edm::ParameterSetDescription& desc) {
+  /// Top-level parameters
+  desc.add<int>("algo_type", 5)->setComment("Choice of the building algo: 1 SK, 2 TC, 3 DF, 4 ST, 5 RU, ...");
+
+  // Define the nested PSet for individual configurations
+  edm::ParameterSetDescription algoPSet;
+  algoPSet.add<std::vector<int>>("parameters_per_chamber_type", {1, 2, 3, 4, 5, 6, 5, 6, 5, 6});
+
+  // Define the VPSet inside algo_psets
+  edm::ParameterSetDescription innerPSet;
+  // Allow any parameter in the innerPSet
+  innerPSet.setAllowAnything();
+
+  // Fill the VPSet for algo_psets
+  edm::ParameterSetDescription innerAlgoPSet;
+  innerAlgoPSet.addVPSet("algo_psets", innerPSet);
+
+  // Additional top-level keys
+  algoPSet.addVPSet("algo_psets", innerPSet);
+  algoPSet.add<std::string>("algo_name", "CSCSegAlgoRU");
+  algoPSet.add<std::vector<std::string>>(
+      "chamber_types", {"ME1/a", "ME1/b", "ME1/2", "ME1/3", "ME2/1", "ME2/2", "ME3/1", "ME3/2", "ME4/1", "ME4/2"});
+
+  // Add to the top-level VPSet
+  desc.addVPSet("algo_psets", algoPSet);
+}
diff --git a/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.h b/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.h
index 938554ca37393..478b364524f14 100644
--- a/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.h
+++ b/RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.h
@@ -14,10 +14,10 @@
  *
  */
 
-#include <DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h>
-#include <DataFormats/CSCRecHit/interface/CSCSegmentCollection.h>
-
-#include <FWCore/ParameterSet/interface/ParameterSet.h>
+#include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h"
+#include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 class CSCGeometry;
 class CSCSegmentAlgorithm;
@@ -32,6 +32,8 @@ class CSCSegmentBuilder {
   /// Destructor
   ~CSCSegmentBuilder();
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
   /** Find rechits in each CSCChamber, build CSCSegment's in each chamber,
      *  and fill into output collection.
      */
diff --git a/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.cc b/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.cc
index 310ced6db7122..b45b0b02ba2b8 100644
--- a/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.cc
+++ b/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.cc
@@ -2,16 +2,16 @@
  *
  */
 
-#include <RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.h>
-#include <RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.h>
+#include "RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.h"
+#include "RecoLocalMuon/CSCSegment/src/CSCSegmentBuilder.h"
 
-#include <DataFormats/Common/interface/Handle.h>
-#include <FWCore/Framework/interface/ESHandle.h>
-#include <FWCore/Utilities/interface/InputTag.h>
-#include <FWCore/MessageLogger/interface/MessageLogger.h>
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include <DataFormats/CSCRecHit/interface/CSCSegmentCollection.h>
-#include <DataFormats/CSCRecHit/interface/CSCSegment.h>
+#include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
+#include "DataFormats/CSCRecHit/interface/CSCSegment.h"
 
 CSCSegmentProducer::CSCSegmentProducer(const edm::ParameterSet& pas) : iev(0) {
   m_token = consumes<CSCRecHit2DCollection>(pas.getParameter<edm::InputTag>("inputObjects"));
@@ -22,6 +22,13 @@ CSCSegmentProducer::CSCSegmentProducer(const edm::ParameterSet& pas) : iev(0) {
   produces<CSCSegmentCollection>();
 }
 
+void CSCSegmentProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("inputObjects", edm::InputTag("csc2DRecHits"))->setComment("define input");
+  CSCSegmentBuilder::fillPSetDescription(desc);
+  descriptions.addWithDefaultLabel(desc);
+}
+
 CSCSegmentProducer::~CSCSegmentProducer() {
   LogDebug("CSCSegment|CSC") << "deleting CSCSegmentBuilder after " << iev << " events w/csc data.";
   delete segmentBuilder_;
diff --git a/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.h b/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.h
index e98c668f58546..b1ad175c46c8b 100644
--- a/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.h
+++ b/RecoLocalMuon/CSCSegment/src/CSCSegmentProducer.h
@@ -16,6 +16,9 @@
 #include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 class CSCSegmentBuilder;
 
@@ -28,6 +31,8 @@ class CSCSegmentProducer : public edm::stream::EDProducer<> {
   /// Produce the CSCSegment collection
   void produce(edm::Event&, const edm::EventSetup&) override;
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
 private:
   int iev;  // events through
   CSCSegmentBuilder* segmentBuilder_;
diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc
index 2c9c773598b62..e63d44763b9e7 100644
--- a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc
+++ b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc
@@ -56,7 +56,9 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDPutToken.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
@@ -95,6 +97,8 @@ namespace cms {
     explicit SiPixelRecHitConverter(const edm::ParameterSet& conf);
     ~SiPixelRecHitConverter() override;
 
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
     //--- Factory method to make CPE's depending on the ParameterSet
     //--- Not sure if we need to make more than one CPE to run concurrently
     //--- on different parts of the detector (e.g., one for the barrel and the
@@ -258,4 +262,11 @@ namespace cms {
 
 using cms::SiPixelRecHitConverter;
 
+void SiPixelRecHitConverter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("src", edm::InputTag("siPixelClusters"));
+  desc.add<std::string>("CPE", "PixelCPEGeneric");
+  descriptions.addWithDefaultLabel(desc);
+}
+
 DEFINE_FWK_MODULE(SiPixelRecHitConverter);
diff --git a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py
index cb539a2b1c6e4..4234a821f4dd9 100644
--- a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py
+++ b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py
@@ -5,11 +5,8 @@
 from Configuration.ProcessModifiers.alpaka_cff import alpaka
 
 # legacy pixel rechit producer
-siPixelRecHits = cms.EDProducer("SiPixelRecHitConverter",
-    src = cms.InputTag("siPixelClusters"),
-    CPE = cms.string('PixelCPEGeneric'),
-    VerboseLevel = cms.untracked.int32(0)
-)
+from RecoLocalTracker.SiPixelRecHits.siPixelRecHitConverter_cfi import siPixelRecHitConverter as _siPixelRecHitConverter
+siPixelRecHits = _siPixelRecHitConverter.clone()
 
 # SwitchProducer wrapping the legacy pixel rechit producer
 siPixelRecHitsPreSplitting = SwitchProducerCUDA(
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.cc b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.cc
index 200085bbfafba..cd05ca4b43a62 100644
--- a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.cc
+++ b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.cc
@@ -36,6 +36,23 @@ void SiStripClusterizer::produce(edm::Event& event, const edm::EventSetup& es) {
   event.put(std::move(output));
 }
 
+void SiStripClusterizer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<std::vector<edm::InputTag>>("DigiProducersList",
+                                       {edm::InputTag("siStripDigis", "ZeroSuppressed"),
+                                        edm::InputTag("siStripZeroSuppression", "VirginRaw"),
+                                        edm::InputTag("siStripZeroSuppression", "ProcessedRaw"),
+                                        edm::InputTag("siStripZeroSuppression", "ScopeMode")});
+
+  {
+    edm::ParameterSetDescription ClusterizerPSet;
+    StripClusterizerAlgorithmFactory::fillDescriptions(ClusterizerPSet);
+    desc.add<edm::ParameterSetDescription>("Clusterizer", ClusterizerPSet);
+  }
+
+  descriptions.addWithDefaultLabel(desc);
+}
+
 template <class T>
 inline bool SiStripClusterizer::findInput(const edm::EDGetTokenT<T>& tag, edm::Handle<T>& handle, const edm::Event& e) {
   e.getByToken(tag, handle);
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.h b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.h
index e1a52fb78c2b1..87c198209fe83 100644
--- a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.h
+++ b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.h
@@ -4,7 +4,9 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "RecoLocalTracker/SiStripClusterizer/interface/StripClusterizerAlgorithm.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include <vector>
@@ -14,6 +16,7 @@ class SiStripClusterizer : public edm::stream::EDProducer<> {
 public:
   explicit SiStripClusterizer(const edm::ParameterSet& conf);
   void produce(edm::Event&, const edm::EventSetup&) override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
   template <class T>
diff --git a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py
index 82b8e07527547..3a63fd2e78585 100644
--- a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py
+++ b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py
@@ -2,14 +2,8 @@
 
 from RecoLocalTracker.SiStripClusterizer.DefaultClusterizer_cff import *
 
-siStripClusters = cms.EDProducer("SiStripClusterizer",
-                               Clusterizer = DefaultClusterizer,
-                               DigiProducersList = cms.VInputTag(
-    cms.InputTag('siStripDigis','ZeroSuppressed'),
-    cms.InputTag('siStripZeroSuppression','VirginRaw'),
-    cms.InputTag('siStripZeroSuppression','ProcessedRaw'),
-    cms.InputTag('siStripZeroSuppression','ScopeMode')),
-                               )
+from RecoLocalTracker.SiStripClusterizer.siStripClusterizer_cfi import siStripClusterizer as _siStripClusterizer
+siStripClusters = _siStripClusterizer.clone()
 
 from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
 from RecoLocalTracker.SiStripClusterizer.SiStripApprox2Clusters_cfi import SiStripApprox2Clusters
diff --git a/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc b/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc
index 6730c8946c49e..03329eb0258b0 100644
--- a/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc
+++ b/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc
@@ -1,14 +1,14 @@
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 
+#include "DataFormats/Common/interface/DetSetVectorNew.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
-#include "DataFormats/Common/interface/DetSetVectorNew.h"
 
 #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h"
 #include "RecoLocalTracker/Records/interface/TkPixelCPERecord.h"
@@ -30,11 +30,12 @@
 
 class JetCoreClusterSplitter : public edm::stream::EDProducer<> {
 public:
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
   JetCoreClusterSplitter(const edm::ParameterSet& iConfig);
-  ~JetCoreClusterSplitter() override;
+  ~JetCoreClusterSplitter() override = default;
   void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
 private:
   bool split(const SiPixelCluster& aCluster,
              edmNew::DetSetVector<SiPixelCluster>::FastFiller& filler,
@@ -129,8 +130,6 @@ JetCoreClusterSplitter::JetCoreClusterSplitter(const edm::ParameterSet& iConfig)
   produces<edmNew::DetSetVector<SiPixelCluster>>();
 }
 
-JetCoreClusterSplitter::~JetCoreClusterSplitter() {}
-
 bool SortPixels(const SiPixelCluster::Pixel& i, const SiPixelCluster::Pixel& j) { return (i.adc > j.adc); }
 
 void JetCoreClusterSplitter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
diff --git a/RecoMET/METProducers/interface/CSCHaloDataProducer.h b/RecoMET/METProducers/interface/CSCHaloDataProducer.h
index 50385a4d2b1b5..e054e40b65468 100644
--- a/RecoMET/METProducers/interface/CSCHaloDataProducer.h
+++ b/RecoMET/METProducers/interface/CSCHaloDataProducer.h
@@ -96,6 +96,8 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
@@ -130,7 +132,9 @@ namespace reco {
   class CSCHaloDataProducer : public edm::stream::EDProducer<> {
   public:
     explicit CSCHaloDataProducer(const edm::ParameterSet &);
-    ~CSCHaloDataProducer() override;
+    ~CSCHaloDataProducer() override = default;
+
+    static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
   private:
     void produce(edm::Event &, const edm::EventSetup &) override;
diff --git a/RecoMET/METProducers/interface/EcalHaloDataProducer.h b/RecoMET/METProducers/interface/EcalHaloDataProducer.h
index a81cea5230a98..c884163aff402 100644
--- a/RecoMET/METProducers/interface/EcalHaloDataProducer.h
+++ b/RecoMET/METProducers/interface/EcalHaloDataProducer.h
@@ -76,6 +76,8 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -94,7 +96,9 @@ namespace reco {
   class EcalHaloDataProducer : public edm::stream::EDProducer<> {
   public:
     explicit EcalHaloDataProducer(const edm::ParameterSet&);
-    ~EcalHaloDataProducer() override;
+    ~EcalHaloDataProducer() override = default;
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   private:
     void produce(edm::Event&, const edm::EventSetup&) override;
diff --git a/RecoMET/METProducers/interface/GlobalHaloDataProducer.h b/RecoMET/METProducers/interface/GlobalHaloDataProducer.h
index d2622f09b815f..9ad745c1485b5 100644
--- a/RecoMET/METProducers/interface/GlobalHaloDataProducer.h
+++ b/RecoMET/METProducers/interface/GlobalHaloDataProducer.h
@@ -129,7 +129,9 @@
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -182,6 +184,8 @@ namespace reco {
     explicit GlobalHaloDataProducer(const edm::ParameterSet&);
     ~GlobalHaloDataProducer() override;
 
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   private:
     void produce(edm::Event&, const edm::EventSetup&) override;
 
diff --git a/RecoMET/METProducers/interface/HcalHaloDataProducer.h b/RecoMET/METProducers/interface/HcalHaloDataProducer.h
index f719cd54a9425..ee3c2274fd020 100644
--- a/RecoMET/METProducers/interface/HcalHaloDataProducer.h
+++ b/RecoMET/METProducers/interface/HcalHaloDataProducer.h
@@ -68,6 +68,8 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -86,7 +88,9 @@ namespace reco {
   class HcalHaloDataProducer : public edm::stream::EDProducer<> {
   public:
     explicit HcalHaloDataProducer(const edm::ParameterSet&);
-    ~HcalHaloDataProducer() override;
+    ~HcalHaloDataProducer() override = default;
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   private:
     void produce(edm::Event&, const edm::EventSetup&) override;
diff --git a/RecoMET/METProducers/python/CSCHaloData_cfi.py b/RecoMET/METProducers/python/CSCHaloData_cfi.py
index e5a48b2528010..a6be49cb8a4f7 100644
--- a/RecoMET/METProducers/python/CSCHaloData_cfi.py
+++ b/RecoMET/METProducers/python/CSCHaloData_cfi.py
@@ -5,79 +5,5 @@
 # Description: Module to build CSCHaloData and put into the event
 # Date: Oct. 15, 2009
 
-CSCHaloData = cms.EDProducer("CSCHaloDataProducer",
-                          
-                             # Digi Level
-                             L1MuGMTReadoutLabel = cms.InputTag("gtDigis"),
-                             
-                             # HLT
-                             HLTResultLabel = cms.InputTag("TriggerResults::HLT"),
-                             HLTBitLabel = cms.VInputTag(    cms.InputTag("HLT_CSCBeamHalo"),
-                                                             cms.InputTag("HLT_CSCBeamHaloOverlapRing1"),
-                                                             cms.InputTag("HLT_CSCBeamHaloOverlapRing2"),
-                                                             cms.InputTag("HLT_CSCBeamHaloRing2or3")
-                                                             ),
-                             
-                             # Chamber Level Trigger Primitive                             
-                             ALCTDigiLabel = cms.InputTag("muonCSCDigis","MuonCSCALCTDigi"),
-
-                             # RecHit Level
-                             CSCRecHitLabel = cms.InputTag("csc2DRecHits"),
-                             
-                             # Calo rec hits
-                             HBHErhLabel = cms.InputTag("hbhereco"),
-                             ECALBrhLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB"),
-                             ECALErhLabel = cms.InputTag("ecalRecHit","EcalRecHitsEE"),
-                             
-                             # Higher Level Reco
-                             CSCSegmentLabel= cms.InputTag("cscSegments"),
-                             CosmicMuonLabel= cms.InputTag("muonsFromCosmics"),
-                             MuonLabel = cms.InputTag("muons"),
-                             SALabel  =  cms.InputTag("standAloneMuons"),
-
-                             # Muon-Segment matching
-                             MatchParameters = cms.PSet(
-                                    CSCsegments = cms.InputTag("cscSegments"),
-                                    DTradius = cms.double(0.01),
-                                    DTsegments = cms.InputTag("dt4DSegments"),
-			            RPChits = cms.InputTag("rpcRecHits"),
-                                    TightMatchDT = cms.bool(False),
-                                    TightMatchCSC = cms.bool(True)
-                                    ),
-                             
-                             DetaParam = cms.double(0.1),
-                             DphiParam = cms.double(1.00),
-                             NormChi2Param = cms.double(8.),
-                             InnerRMinParam = cms.double(0.),
-                             OuterRMinParam = cms.double(0.),
-                             InnerRMaxParam = cms.double(99999.),
-                             OuterRMaxParam = cms.double(99999.),
-
-                             MinOuterMomentumTheta = cms.double(.10),
-                             MaxOuterMomentumTheta = cms.double(3.0),
-                             MatchingDPhiThreshold = cms.double(0.18),
-                             MatchingDEtaThreshold = cms.double(0.4),
-                             MatchingDWireThreshold = cms.int32(5),
-                             # The expected time of a collision recHit will be t = time_0 + time-of-flight
-                             # A recHit more than +/- time_window from collision timing will be declared "out-of-time"                      
-                             # recHit times are in [ns]
-                             RecHitTime0 = cms.double(0.), 
-                             RecHitTimeWindow = cms.double(25.),
-
-                             # If this is Data, the expected collision bx will be 3 instead of 6
-                             #ExpectedBX = cms.int32(3),   # if Data
-                             ExpectedBX = cms.int32(6),   # if MC
-
-                             # If this is halo we expect free inverse beta to be less than MaxFreeInverseBeta
-                             MaxFreeInverseBeta = cms.double(0.0),
-                             
-                             # If this is halo we expect ( T_outer_segment - T_inner_segment) to be less than MaxDtMuonSegment
-                             MaxDtMuonSegment = cms.double(-10.0),
-
-                             # MLR
-                             # Default values for identifying CSCSegments that are halo-like
-                             MaxSegmentRDiff = cms.double(10.0),
-                             MaxSegmentPhiDiff = cms.double(0.1),
-                             MaxSegmentTheta = cms.double(0.7)
-                             # End MLR
-                             )
+from RecoMET.METProducers.cscHaloDataProducer_cfi import cscHaloDataProducer as _cscHaloDataProducer
+CSCHaloData = _cscHaloDataProducer.clone()
diff --git a/RecoMET/METProducers/python/EcalHaloData_cfi.py b/RecoMET/METProducers/python/EcalHaloData_cfi.py
index aed45dee32e9e..6f709967104df 100644
--- a/RecoMET/METProducers/python/EcalHaloData_cfi.py
+++ b/RecoMET/METProducers/python/EcalHaloData_cfi.py
@@ -4,27 +4,7 @@
 # Description: Module to build EcalHaloData Object and put into the event
 # Date: Oct. 15, 2009
 
-EcalHaloData= cms.EDProducer("EcalHaloDataProducer",
-                             # RecHit Level
-                             EBRecHitLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB"),
-                             EERecHitLabel = cms.InputTag("ecalRecHit", "EcalRecHitsEE"),
-                             ESRecHitLabel = cms.InputTag("ecalPreshowerRecHit","EcalRecHitsES"),
-                             HBHERecHitLabel = cms.InputTag("hbhereco"),
-                             # Higher Level Reco
-                             SuperClusterLabel = cms.InputTag("correctedHybridSuperClusters"),
-#                             SuperClusterLabel = cms.InputTag("cosmicSuperClusters","CosmicBarrelSuperClusters"),
-                             PhotonLabel = cms.InputTag(""),
-                             
-                             EBRecHitEnergyThresholdParam = cms.double(0.3),
-                             EERecHitEnergyThresholdParam = cms.double(0.3),
-                             ESRecHitEnergyThresholdParam = cms.double(0.3),
-                             SumEcalEnergyThresholdParam = cms.double(10.),
-                             NHitsEcalThresholdParam = cms.int32(4),
-
-                             # Shower Shape cut parameters (defaults need to be optimized)
-                             RoundnessCutParam  = cms.double(0.41),
-                             AngleCutParam      = cms.double(0.51),
-                             
-                             )
+from RecoMET.METProducers.ecalHaloDataProducer_cfi import ecalHaloDataProducer as _ecalHaloDataProducer
+EcalHaloData = _ecalHaloDataProducer.clone()
 
 
diff --git a/RecoMET/METProducers/python/GlobalHaloData_cfi.py b/RecoMET/METProducers/python/GlobalHaloData_cfi.py
index 21444d0d2c3b1..64784580126f7 100644
--- a/RecoMET/METProducers/python/GlobalHaloData_cfi.py
+++ b/RecoMET/METProducers/python/GlobalHaloData_cfi.py
@@ -4,54 +4,7 @@
 # Description: Module to build GlobalHaloData Object and put into the event
 # Date: Oct. 15, 2009
 
-GlobalHaloData = cms.EDProducer("GlobalHaloDataProducer",                         
-                                # Higher Level Reco
-                                metLabel = cms.InputTag("caloMet"),
-                                calotowerLabel = cms.InputTag("towerMaker"),
-                                CSCSegmentLabel = cms.InputTag("cscSegments"),
-                                CSCRecHitLabel = cms.InputTag("csc2DRecHits"),
-                                MuonLabel = cms.InputTag("muons"),
-                                EcalMinMatchingRadiusParam = cms.double(110.),
-                                EcalMaxMatchingRadiusParam  = cms.double(330.),
-                                
-                                HcalMinMatchingRadiusParam = cms.double(110.),
-                                HcalMaxMatchingRadiusParam = cms.double(490.),
-
-                                CSCHaloDataLabel = cms.InputTag("CSCHaloData"),
-                                EcalHaloDataLabel = cms.InputTag("EcalHaloData"),
-                                HcalHaloDataLabel = cms.InputTag("HcalHaloData"),
-
-                                CaloTowerEtThresholdParam = cms.double(0.3),
-
-                                #Parameters for CSC-calo matching
-                                MaxSegmentTheta = cms.double(0.7),
-
-                                rh_et_threshforcscmatching_eb = cms.double(10.),
-                                rcalominrsegm_lowthresh_eb = cms.double(-30.),
-                                rcalominrsegm_highthresh_eb = cms.double(15.),
-                                dtcalosegm_thresh_eb = cms.double(15.),
-                                dphicalosegm_thresh_eb = cms.double(0.04),
-                                
-                                rh_et_threshforcscmatching_ee = cms.double(10.),
-                                rcalominrsegm_lowthresh_ee = cms.double(-30.),
-                                rcalominrsegm_highthresh_ee = cms.double(30.),
-                                dtcalosegm_thresh_ee = cms.double(15.),
-                                dphicalosegm_thresh_ee = cms.double(0.04),
-                                
-                                rh_et_threshforcscmatching_hb = cms.double(20.),
-                                rcalominrsegm_lowthresh_hb = cms.double(-100.),
-                                rcalominrsegm_highthresh_hb = cms.double(20.),
-                                dtcalosegm_thresh_hb = cms.double(15.),
-                                dphicalosegm_thresh_hb = cms.double(0.15),
-                                
-                                rh_et_threshforcscmatching_he = cms.double(20.),
-                                rcalominrsegm_lowthresh_he = cms.double(-30.),
-                                rcalominrsegm_highthresh_he = cms.double(30.),
-                                dtcalosegm_thresh_he = cms.double(15.),
-                                dphicalosegm_thresh_he = cms.double(0.1),
-                                IsHLT = cms.bool(False)
-                                
-                                                                
-                                )
+from RecoMET.METProducers.globalHaloDataProducer_cfi import globalHaloDataProducer as _globalHaloDataProducer
+GlobalHaloData = _globalHaloDataProducer.clone()
 
 
diff --git a/RecoMET/METProducers/python/HcalHaloData_cfi.py b/RecoMET/METProducers/python/HcalHaloData_cfi.py
index 03873bc90330e..b286738636cc6 100644
--- a/RecoMET/METProducers/python/HcalHaloData_cfi.py
+++ b/RecoMET/METProducers/python/HcalHaloData_cfi.py
@@ -4,23 +4,7 @@
 # Description: Module to build HcalHaloData Object and put into the event
 # Date: Oct. 15, 2009
 
-HcalHaloData = cms.EDProducer("HcalHaloDataProducer",
-                              # RecHit Level
-                              EBRecHitLabel = cms.InputTag("ecalRecHit","EcalRecHitsEB"),
-                              EERecHitLabel = cms.InputTag("ecalRecHit", "EcalRecHitsEE"),
-                              HBHERecHitLabel = cms.InputTag("hbhereco"),
-                              HORecHitLabel  = cms.InputTag("horeco"),
-                              HFRecHitLabel = cms.InputTag("hfreco"),
-
-                              caloTowerCollName = cms.InputTag('towerMaker'),
-                              
-                              HcalMinMatchingRadiusParam = cms.double(110.),
-                              HcalMaxMatchingRadiusParam = cms.double(490.),
-                              HBRecHitEnergyThresholdParam = cms.double(0.5),
-                              HERecHitEnergyThresholdParam = cms.double(0.5),
-                              SumHcalEnergyThresholdParam = cms.double(18),
-                              NHitsHcalThresholdParam = cms.int32(4),
-                              
-                              )
+from RecoMET.METProducers.hcalHaloDataProducer_cfi import hcalHaloDataProducer as _hcalHaloDataProducer
+HcalHaloData = _hcalHaloDataProducer.clone()
 
 
diff --git a/RecoMET/METProducers/src/CSCHaloDataProducer.cc b/RecoMET/METProducers/src/CSCHaloDataProducer.cc
index d89ab6efcf155..7c734138bc54f 100644
--- a/RecoMET/METProducers/src/CSCHaloDataProducer.cc
+++ b/RecoMET/METProducers/src/CSCHaloDataProducer.cc
@@ -82,6 +82,75 @@ CSCHaloDataProducer::CSCHaloDataProducer(const edm::ParameterSet& iConfig) : CSC
   produces<CSCHaloData>();
 }
 
+void CSCHaloDataProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+
+  //Digi Level
+  desc.add<edm::InputTag>("L1MuGMTReadoutLabel", edm::InputTag("gtDigis"));
+
+  // HLT
+  desc.add<edm::InputTag>("HLTResultLabel", edm::InputTag("TriggerResults::HLT"));
+  desc.add<std::vector<edm::InputTag> >("HLTBitLabel",
+                                        {edm::InputTag("HLT_CSCBeamHalo"),
+                                         edm::InputTag("HLT_CSCBeamHaloOverlapRing1"),
+                                         edm::InputTag("HLT_CSCBeamHaloOverlapRing2"),
+                                         edm::InputTag("HLT_CSCBeamHaloRing2or3")});
+
+  // RecHit Level
+  desc.add<edm::InputTag>("CSCRecHitLabel", edm::InputTag("csc2DRecHits"));
+  desc.add<edm::InputTag>("HBHErhLabel", edm::InputTag("hbhereco"));
+  desc.add<edm::InputTag>("ECALBrhLabel", edm::InputTag("ecalRecHit", "EcalRecHitsEB"));
+  desc.add<edm::InputTag>("ECALErhLabel", edm::InputTag("ecalRecHit", "EcalRecHitsEE"));
+
+  //Higher Level Reco
+  desc.add<edm::InputTag>("CSCSegmentLabel", edm::InputTag("cscSegments"));
+  desc.add<edm::InputTag>("CosmicMuonLabel", edm::InputTag("muonsFromCosmics"));
+  desc.add<edm::InputTag>("MuonLabel", edm::InputTag("muons"));
+  desc.add<edm::InputTag>("SALabel", edm::InputTag("standAloneMuons"));
+  desc.add<edm::InputTag>("ALCTDigiLabel", edm::InputTag("muonCSCDigis", "MuonCSCALCTDigi"))
+      ->setComment("Chamber Level Trigger Primitive");
+
+  {
+    // Muon-Segment matching
+    edm::ParameterSetDescription matchParametersPSet;
+    MuonSegmentMatcher::fillPSetDescription(matchParametersPSet);
+    desc.add<edm::ParameterSetDescription>("MatchParameters", matchParametersPSet);
+  }
+
+  desc.add<double>("DetaParam", 0.1);
+  desc.add<double>("DphiParam", 1.00);
+  desc.add<double>("InnerRMinParam", 0.);
+  desc.add<double>("InnerRMaxParam", 99999.);
+  desc.add<double>("OuterRMinParam", 0.);
+  desc.add<double>("OuterRMaxParam", 99999.);
+  desc.add<double>("NormChi2Param", 8.);
+
+  // MLR
+  // Default values for identifying CSCSegments that are halo-like
+  desc.add<double>("MaxSegmentRDiff", 10.0);
+  desc.add<double>("MaxSegmentPhiDiff", 0.1);
+  desc.add<double>("MaxSegmentTheta", 0.7);
+  // end MLR
+
+  desc.add<double>("MaxDtMuonSegment", -10.0)
+      ->setComment("if this is halo we expect ( T_outer_segment - T_inner_segment) to be less than MaxDtMuonSegment");
+  desc.add<double>("MaxFreeInverseBeta", 0.0)
+      ->setComment("if this is halo we expect free inverse beta to be less than MaxFreeInverseBeta");
+  desc.add<int>("ExpectedBX", 6)->setComment("if this is Data, the expected collision bx will be 3 instead of 6");
+
+  // The expected time of a collision recHit will be t = time_0 + time-of-flight
+  // A recHit more than +/- time_window from collision timing will be declared "out-of-time"
+  // recHit times are in [ns]
+  desc.add<double>("RecHitTime0", 0.)->setComment("rechit time in ns");
+  desc.add<double>("RecHitTimeWindow", 25.)->setComment("rechit time in ns");
+  desc.add<double>("MinOuterMomentumTheta", .10);
+  desc.add<double>("MaxOuterMomentumTheta", 3.0);
+  desc.add<double>("MatchingDPhiThreshold", 0.18);
+  desc.add<double>("MatchingDEtaThreshold", 0.4);
+  desc.add<int>("MatchingDWireThreshold", 5);
+  descriptions.addWithDefaultLabel(desc);
+}
+
 void CSCHaloDataProducer::produce(Event& iEvent, const EventSetup& iSetup) {
   //Get CSC Geometry
   edm::ESHandle<CSCGeometry> TheCSCGeometry = iSetup.getHandle(cscGeometry_token);
@@ -158,5 +227,3 @@ void CSCHaloDataProducer::produce(Event& iEvent, const EventSetup& iSetup) {
                                                              iSetup)));
   return;
 }
-
-CSCHaloDataProducer::~CSCHaloDataProducer() {}
diff --git a/RecoMET/METProducers/src/EcalHaloDataProducer.cc b/RecoMET/METProducers/src/EcalHaloDataProducer.cc
index 29e8f5d63371c..07c69242e374b 100644
--- a/RecoMET/METProducers/src/EcalHaloDataProducer.cc
+++ b/RecoMET/METProducers/src/EcalHaloDataProducer.cc
@@ -34,9 +34,6 @@ EcalHaloDataProducer::EcalHaloDataProducer(const edm::ParameterSet& iConfig) : E
   SumEcalEnergyThreshold = (float)iConfig.getParameter<double>("SumEcalEnergyThresholdParam");
   NHitsEcalThreshold = iConfig.getParameter<int>("NHitsEcalThresholdParam");
 
-  RoundnessCut = iConfig.getParameter<double>("RoundnessCutParam");
-  AngleCut = iConfig.getParameter<double>("AngleCutParam");
-
   ebrechit_token_ = consumes<EBRecHitCollection>(IT_EBRecHit);
   eerechit_token_ = consumes<EERecHitCollection>(IT_EERecHit);
   esrechit_token_ = consumes<ESRecHitCollection>(IT_ESRecHit);
@@ -93,4 +90,23 @@ void EcalHaloDataProducer::produce(Event& iEvent, const EventSetup& iSetup) {
   return;
 }
 
-EcalHaloDataProducer::~EcalHaloDataProducer() {}
+void EcalHaloDataProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  // RecHit level
+  desc.add<edm::InputTag>("EBRecHitLabel", edm::InputTag("ecalRecHit", "EcalRecHitsEB"));
+  desc.add<edm::InputTag>("EERecHitLabel", edm::InputTag("ecalRecHit", "EcalRecHitsEE"));
+  desc.add<edm::InputTag>("ESRecHitLabel", edm::InputTag("ecalPreshowerRecHit", "EcalRecHitsES"));
+  // Higher level Reco
+  desc.add<edm::InputTag>("HBHERecHitLabel", edm::InputTag("hbhereco"));
+  desc.add<edm::InputTag>("SuperClusterLabel", edm::InputTag("correctedHybridSuperClusters"));
+  desc.add<edm::InputTag>("PhotonLabel", edm::InputTag(""));
+  desc.add<double>("EBRecHitEnergyThresholdParam", 0.3);
+  desc.add<double>("EERecHitEnergyThresholdParam", 0.3);
+  desc.add<double>("ESRecHitEnergyThresholdParam", 0.3);
+  desc.add<double>("SumEcalEnergyThresholdParam", 10);
+  desc.add<int>("NHitsEcalThresholdParam", 4);
+  // Shower Shape cut parameters (defaults need to be optimized)
+  desc.add<double>("RoundnessCutParam", 0.41);
+  desc.add<double>("AngleCutParam", 0.51);
+  descriptions.addWithDefaultLabel(desc);
+}
diff --git a/RecoMET/METProducers/src/GlobalHaloDataProducer.cc b/RecoMET/METProducers/src/GlobalHaloDataProducer.cc
index 389ca0613834d..fbef27d3a14bd 100644
--- a/RecoMET/METProducers/src/GlobalHaloDataProducer.cc
+++ b/RecoMET/METProducers/src/GlobalHaloDataProducer.cc
@@ -12,6 +12,50 @@ using namespace edm;
 using namespace std;
 using namespace reco;
 
+void GlobalHaloDataProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<bool>("IsHLT", false);
+
+  // Higher Level Reco
+  desc.add<edm::InputTag>("metLabel", edm::InputTag("caloMet"));
+  desc.add<edm::InputTag>("calotowerLabel", edm::InputTag("towerMaker"));
+  desc.add<edm::InputTag>("CSCSegmentLabel", edm::InputTag("cscSegments"));
+  desc.add<edm::InputTag>("CSCRecHitLabel", edm::InputTag("csc2DRecHits"));
+  desc.add<edm::InputTag>("MuonLabel", edm::InputTag("muons"));
+  desc.add<edm::InputTag>("CSCHaloDataLabel", edm::InputTag("CSCHaloData"));
+  desc.add<edm::InputTag>("EcalHaloDataLabel", edm::InputTag("EcalHaloData"));
+  desc.add<edm::InputTag>("HcalHaloDataLabel", edm::InputTag("HcalHaloData"));
+  desc.add<double>("EcalMinMatchingRadiusParam", 110.);
+  desc.add<double>("EcalMaxMatchingRadiusParam", 330.);
+  desc.add<double>("HcalMinMatchingRadiusParam", 110.);
+  desc.add<double>("HcalMaxMatchingRadiusParam", 490.);
+  desc.add<double>("CaloTowerEtThresholdParam", 0.3);
+
+  // Parameters for CSC-calo matching
+  desc.add<double>("MaxSegmentTheta", 0.7);
+  desc.add<double>("rh_et_threshforcscmatching_eb", 10.);
+  desc.add<double>("rcalominrsegm_lowthresh_eb", -30.);
+  desc.add<double>("rcalominrsegm_highthresh_eb", 15.);
+  desc.add<double>("dtcalosegm_thresh_eb", 15.);
+  desc.add<double>("dphicalosegm_thresh_eb", 0.04);
+  desc.add<double>("rh_et_threshforcscmatching_ee", 10.);
+  desc.add<double>("rcalominrsegm_lowthresh_ee", -30.);
+  desc.add<double>("rcalominrsegm_highthresh_ee", 30.);
+  desc.add<double>("dtcalosegm_thresh_ee", 15.);
+  desc.add<double>("dphicalosegm_thresh_ee", 0.04);
+  desc.add<double>("rh_et_threshforcscmatching_hb", 20.);
+  desc.add<double>("rcalominrsegm_lowthresh_hb", -100.);
+  desc.add<double>("rcalominrsegm_highthresh_hb", 20.);
+  desc.add<double>("dtcalosegm_thresh_hb", 15.);
+  desc.add<double>("dphicalosegm_thresh_hb", 0.15);
+  desc.add<double>("rh_et_threshforcscmatching_he", 20.);
+  desc.add<double>("rcalominrsegm_lowthresh_he", -30.);
+  desc.add<double>("rcalominrsegm_highthresh_he", 30.);
+  desc.add<double>("dtcalosegm_thresh_he", 15.);
+  desc.add<double>("dphicalosegm_thresh_he", 0.1);
+  descriptions.addWithDefaultLabel(desc);
+}
+
 GlobalHaloDataProducer::GlobalHaloDataProducer(const edm::ParameterSet& iConfig) {
   ishlt = iConfig.getParameter<bool>("IsHLT");
 
diff --git a/RecoMET/METProducers/src/HcalHaloDataProducer.cc b/RecoMET/METProducers/src/HcalHaloDataProducer.cc
index 4b25f906038f6..09e3d2ff7d46e 100644
--- a/RecoMET/METProducers/src/HcalHaloDataProducer.cc
+++ b/RecoMET/METProducers/src/HcalHaloDataProducer.cc
@@ -71,4 +71,18 @@ void HcalHaloDataProducer::produce(Event& iEvent, const EventSetup& iSetup) {
   return;
 }
 
-HcalHaloDataProducer::~HcalHaloDataProducer() {}
+void HcalHaloDataProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  // RecHit Level
+  desc.add<edm::InputTag>("EBRecHitLabel", edm::InputTag("ecalRecHit", "EcalRecHitsEB"));
+  desc.add<edm::InputTag>("EERecHitLabel", edm::InputTag("ecalRecHit", "EcalRecHitsEE"));
+  desc.add<edm::InputTag>("HBHERecHitLabel", edm::InputTag("hbhereco"));
+  desc.add<edm::InputTag>("HFRecHitLabel", edm::InputTag("horeco"));
+  desc.add<edm::InputTag>("HORecHitLabel", edm::InputTag("hfreco"));
+  desc.add<edm::InputTag>("caloTowerCollName", edm::InputTag("towerMaker"));
+  desc.add<double>("HBRecHitEnergyThresholdParam", 0.5);
+  desc.add<double>("HERecHitEnergyThresholdParam", 0.5);
+  desc.add<double>("SumHcalEnergyThresholdParam", 18);
+  desc.add<int>("NHitsHcalThresholdParam", 4);
+  descriptions.addWithDefaultLabel(desc);
+}
diff --git a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc
index 73b54d3ff0b49..101ad60791508 100644
--- a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc
+++ b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc
@@ -540,3 +540,16 @@ TrajectorySeed CosmicMuonSeedGenerator::tsosToSeed(const TrajectoryStateOnSurfac
   TrajectorySeed seed(seedTSOS, container, alongMomentum);
   return seed;
 }
+
+void CosmicMuonSeedGenerator::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<bool>("EnableDTMeasurement", true);
+  desc.add<bool>("EnableCSCMeasurement", true);
+  desc.add<InputTag>("DTRecSegmentLabel", edm::InputTag("dt4DSegments"));
+  desc.add<InputTag>("CSCRecSegmentLabel", edm::InputTag("cscSegments"));
+  desc.add<int>("MaxSeeds", 1000);
+  desc.add<double>("MaxDTChi2", 300.0);
+  desc.add<double>("MaxCSCChi2", 300.0);
+  desc.add<bool>("ForcePointDown", true);
+  descriptions.addWithDefaultLabel(desc);
+}
diff --git a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.h b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.h
index f7f4d307f9f9d..d08779c6a9fbc 100644
--- a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.h
+++ b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.h
@@ -11,6 +11,8 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h"
@@ -40,6 +42,9 @@ class CosmicMuonSeedGenerator : public edm::stream::EDProducer<> {
   /// Destructor
   ~CosmicMuonSeedGenerator() override;
 
+  /// fillDescriptions
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   // Operations
 
   /// reconstruct muon's seeds
diff --git a/RecoMuon/MuonSeedGenerator/python/CosmicMuonSeedProducer_cfi.py b/RecoMuon/MuonSeedGenerator/python/CosmicMuonSeedProducer_cfi.py
index bc442d5f0b719..dcfd189326ceb 100644
--- a/RecoMuon/MuonSeedGenerator/python/CosmicMuonSeedProducer_cfi.py
+++ b/RecoMuon/MuonSeedGenerator/python/CosmicMuonSeedProducer_cfi.py
@@ -1,15 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-CosmicMuonSeed = cms.EDProducer("CosmicMuonSeedGenerator",
-    MaxSeeds = cms.int32(1000),
-    CSCRecSegmentLabel = cms.InputTag("cscSegments"),
-    EnableDTMeasurement = cms.bool(True),
-    MaxCSCChi2 = cms.double(300.0),
-    MaxDTChi2 = cms.double(300.0),
-    DTRecSegmentLabel = cms.InputTag("dt4DSegments"),
-    EnableCSCMeasurement = cms.bool(True),
-    ForcePointDown = cms.bool(True)
-)
-
+from RecoMuon.MuonSeedGenerator.cosmicMuonSeedGenerator_cfi import cosmicMuonSeedGenerator as _cosmicMuonSeedGenerator
+CosmicMuonSeed = _cosmicMuonSeedGenerator.clone()
 
 
diff --git a/RecoMuon/TrackingTools/interface/MuonSegmentMatcher.h b/RecoMuon/TrackingTools/interface/MuonSegmentMatcher.h
index 6c29e3db45d0d..a918ab2b9b25e 100644
--- a/RecoMuon/TrackingTools/interface/MuonSegmentMatcher.h
+++ b/RecoMuon/TrackingTools/interface/MuonSegmentMatcher.h
@@ -7,6 +7,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 #include "DataFormats/DTRecHit/interface/DTRecSegment2D.h"
 #include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
@@ -41,6 +42,8 @@ class MuonSegmentMatcher {
 
   std::vector<const RPCRecHit*> matchRPC(const reco::Track& muon, const edm::Event& event);
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 protected:
 private:
   const MuonServiceProxy* theService;
diff --git a/RecoMuon/TrackingTools/src/MuonSegmentMatcher.cc b/RecoMuon/TrackingTools/src/MuonSegmentMatcher.cc
index 7b4a143642812..072af8d7f02ff 100644
--- a/RecoMuon/TrackingTools/src/MuonSegmentMatcher.cc
+++ b/RecoMuon/TrackingTools/src/MuonSegmentMatcher.cc
@@ -54,6 +54,15 @@ MuonSegmentMatcher::MuonSegmentMatcher(const edm::ParameterSet& matchParameters,
   rpcRecHitsToken = iC.consumes<RPCRecHitCollection>(RPCHitTags_);
 }
 
+void MuonSegmentMatcher::fillPSetDescription(edm::ParameterSetDescription& desc) {
+  desc.add<edm::InputTag>("DTsegments", edm::InputTag("dt4DSegments"));
+  desc.add<edm::InputTag>("CSCsegments", edm::InputTag("cscSegments"));
+  desc.add<double>("DTradius", 0.01);
+  desc.add<bool>("TightMatchDT", false);
+  desc.add<bool>("TightMatchCSC", false);
+  desc.add<edm::InputTag>("RPChits", edm::InputTag("rpcRecHits"));
+}
+
 MuonSegmentMatcher::~MuonSegmentMatcher() {}
 
 // member functions
diff --git a/RecoParticleFlow/PFTracking/plugins/LightPFTrackProducer.cc b/RecoParticleFlow/PFTracking/plugins/LightPFTrackProducer.cc
index a3f7c905184c5..1e128b2a7a280 100644
--- a/RecoParticleFlow/PFTracking/plugins/LightPFTrackProducer.cc
+++ b/RecoParticleFlow/PFTracking/plugins/LightPFTrackProducer.cc
@@ -3,7 +3,9 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "RecoParticleFlow/PFTracking/interface/PFTrackTransformer.h"
diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc
index b0cafe7ac08e8..8f567c3c5a404 100644
--- a/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc
+++ b/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc
@@ -20,10 +20,12 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
-#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "RecoTracker/FinalTrackSelectors/interface/TrackAlgoPriorityOrder.h"
 #include "RecoTracker/Record/interface/CkfComponentsRecord.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
@@ -37,6 +39,8 @@ class dso_hidden TrackListMerger : public edm::stream::EDProducer<> {
 
   void produce(edm::Event& e, const edm::EventSetup& c) override;
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
 private:
   void returnEmptyCollections(edm::Event& e);
 
@@ -224,7 +228,7 @@ TrackListMerger::TrackListMerger(edm::ParameterSet const& conf) {
   priorityToken = esConsumes<TrackAlgoPriorityOrder, CkfComponentsRecord>(edm::ESInputTag("", priorityName_));
 
   if (!qualityStr.empty()) {
-    qualityToSet_ = reco::TrackBase::qualityByName(conf.getParameter<std::string>("newQuality"));
+    qualityToSet_ = reco::TrackBase::qualityByName(qualityStr);
   } else
     qualityToSet_ = reco::TrackBase::undefQuality;
 
@@ -306,6 +310,41 @@ TrackListMerger::TrackListMerger(edm::ParameterSet const& conf) {
   }
 }
 
+void TrackListMerger::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.addUntracked<bool>("copyExtras", true);
+  desc.add<bool>("copyMVA", true);
+  desc.add<std::string>("trackAlgoPriorityOrder");
+  desc.add<std::vector<edm::InputTag>>("TrackProducers", {edm::InputTag(""), edm::InputTag("")});
+  desc.add<double>("MaxNormalizedChisq", 1000.0)->setComment("maximum chisq/dof");
+  desc.add<double>("MinPT", 0.05)->setComment("in GeV/c");
+  desc.add<int>("MinFound", 3)->setComment("minimum number of RecHits used in fit");
+  desc.add<double>("Epsilon", -0.001)
+      ->setComment(" minimum difference in rechit position in cm. Negative Epsilon uses sharedInput for comparison");
+  desc.add<double>("ShareFrac", 0.19)
+      ->setComment("minimum shared fraction to be called duplicate for tracks between collections");
+  desc.add<bool>("allowFirstHitShare", true)
+      ->setComment("set new quality for confirmed tracks for each merged pair and then for the final pair");
+  desc.add<double>("FoundHitBonus", 5.0)->setComment("best track chosen by chi2 modified by parameters below");
+  desc.add<double>("LostHitPenalty", 5.0);
+  desc.add<std::vector<double>>("indivShareFrac", {1.0, 1.0})
+      ->setComment("minimum shared fraction to be called duplicate");
+  desc.add<std::string>("newQuality", "confirmed");
+
+  // Correctly define the structure of the VPSet
+  edm::ParameterSetDescription descSetToMerge;
+  descSetToMerge.add<std::vector<int>>("tLists", {});
+  descSetToMerge.add<bool>("pQual", false);
+  desc.addVPSet("setsToMerge", descSetToMerge, {});
+
+  desc.add<std::vector<int>>("hasSelector", {0, 0});
+  desc.add<std::vector<edm::InputTag>>("selectedTrackQuals", {edm::InputTag(""), edm::InputTag("")});
+  desc.addOptional<std::vector<edm::InputTag>>("mvaValueTags");
+  desc.add<bool>("writeOnlyTrkQuals", false);
+  desc.addUntracked<bool>("makeReKeyedSeeds", false);
+  descriptions.add("default_trackListMerger", desc);
+}
+
 // Functions that gets called by framework every event
 void TrackListMerger::produce(edm::Event& e, const edm::EventSetup& es) {
   // extract tracker geometry
diff --git a/RecoTracker/FinalTrackSelectors/python/trackListMerger_cfi.py b/RecoTracker/FinalTrackSelectors/python/trackListMerger_cfi.py
index e2e2fd8f394c1..9f4d11a92f543 100644
--- a/RecoTracker/FinalTrackSelectors/python/trackListMerger_cfi.py
+++ b/RecoTracker/FinalTrackSelectors/python/trackListMerger_cfi.py
@@ -16,7 +16,8 @@
 #
 # cleans and merges ctf and rs Track lists and put new list back in Event
 
-trackListMerger = cms.EDProducer("TrackListMerger",
+from RecoTracker.FinalTrackSelectors.default_trackListMerger_cfi import default_trackListMerger as _trackListMerger
+trackListMerger = _trackListMerger.clone(
     # minimum shared fraction to be called duplicate for tracks between collections
     ShareFrac = cms.double(0.19),
     # best track chosen by chi2 modified by parameters below:
diff --git a/RecoTracker/MeasurementDet/plugins/MaskedMeasurementTrackerEventProducer.cc b/RecoTracker/MeasurementDet/plugins/MaskedMeasurementTrackerEventProducer.cc
index f66eabd4424c0..2017b8508f877 100644
--- a/RecoTracker/MeasurementDet/plugins/MaskedMeasurementTrackerEventProducer.cc
+++ b/RecoTracker/MeasurementDet/plugins/MaskedMeasurementTrackerEventProducer.cc
@@ -2,12 +2,15 @@
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h"
 
 class dso_hidden MaskedMeasurementTrackerEventProducer final : public edm::stream::EDProducer<> {
 public:
   explicit MaskedMeasurementTrackerEventProducer(const edm::ParameterSet &iConfig);
-  ~MaskedMeasurementTrackerEventProducer() override {}
+  ~MaskedMeasurementTrackerEventProducer() override = default;
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
   void produce(edm::Event &, const edm::EventSetup &) override;
@@ -16,33 +19,40 @@ class dso_hidden MaskedMeasurementTrackerEventProducer final : public edm::strea
   typedef edm::ContainerMask<edmNew::DetSetVector<SiPixelCluster> > PixelMask;
   typedef edm::ContainerMask<edmNew::DetSetVector<Phase2TrackerCluster1D> > Phase2OTMask;
 
-  edm::EDGetTokenT<MeasurementTrackerEvent> src_;
+  const edm::EDGetTokenT<MeasurementTrackerEvent> src_;
 
-  bool skipClusters_;
-  bool phase2skipClusters_;
+  const bool skipClusters_;
+  const bool phase2skipClusters_;
 
   edm::EDGetTokenT<StripMask> maskStrips_;
   edm::EDGetTokenT<PixelMask> maskPixels_;
   edm::EDGetTokenT<Phase2OTMask> maskPhase2OTs_;
 };
 
+void MaskedMeasurementTrackerEventProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("src", edm::InputTag("MeasurementTrackerEvent"));
+  desc.add<edm::InputTag>("clustersToSkip", edm::InputTag(""))->setComment("keep empty string for Phase2");
+  desc.add<edm::InputTag>("phase2clustersToSkip", edm::InputTag(""))->setComment("keep empty string for Phase1");
+  descriptions.addWithDefaultLabel(desc);
+}
+
 MaskedMeasurementTrackerEventProducer::MaskedMeasurementTrackerEventProducer(const edm::ParameterSet &iConfig)
     : src_(consumes<MeasurementTrackerEvent>(iConfig.getParameter<edm::InputTag>("src"))),
-      skipClusters_(false),
-      phase2skipClusters_(false) {
-  //FIXME:temporary solution in order to use this class for both phase0/1 and phase2
-  if (iConfig.existsAs<edm::InputTag>("clustersToSkip")) {
-    skipClusters_ = true;
+      skipClusters_(!iConfig.getParameter<edm::InputTag>("clustersToSkip").label().empty()),
+      phase2skipClusters_(!iConfig.getParameter<edm::InputTag>("phase2clustersToSkip").label().empty()) {
+  if (skipClusters_) {
     edm::InputTag clustersToSkip = iConfig.getParameter<edm::InputTag>("clustersToSkip");
     maskPixels_ = consumes<PixelMask>(clustersToSkip);
     maskStrips_ = consumes<StripMask>(clustersToSkip);
   }
-  if (iConfig.existsAs<edm::InputTag>("phase2clustersToSkip")) {
-    phase2skipClusters_ = true;
+
+  if (phase2skipClusters_) {
     edm::InputTag phase2clustersToSkip = iConfig.getParameter<edm::InputTag>("phase2clustersToSkip");
     maskPixels_ = consumes<PixelMask>(phase2clustersToSkip);
     maskPhase2OTs_ = consumes<Phase2OTMask>(phase2clustersToSkip);
   }
+
   produces<MeasurementTrackerEvent>();
 }
 
diff --git a/RecoTracker/MeasurementDet/python/MaskedMeasurementTrackerEventProducer_cfi.py b/RecoTracker/MeasurementDet/python/MaskedMeasurementTrackerEventProducer_cfi.py
index c25a6ea0cc8eb..946ee16b9184c 100644
--- a/RecoTracker/MeasurementDet/python/MaskedMeasurementTrackerEventProducer_cfi.py
+++ b/RecoTracker/MeasurementDet/python/MaskedMeasurementTrackerEventProducer_cfi.py
@@ -1,7 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-MaskedMeasurementTrackerEvent = cms.EDProducer("MaskedMeasurementTrackerEventProducer",
-    src = cms.InputTag("MeasurementTrackerEvent"),
-    OnDemand = cms.bool(False),
-    clustersToSkip = cms.InputTag(""),
-)
+from RecoTracker.MeasurementDet.maskedMeasurementTrackerEventProducer_cfi import maskedMeasurementTrackerEventProducer as _maskedMeasurementTrackerEventProducer
+MaskedMeasurementTrackerEvent = _maskedMeasurementTrackerEvent.clone()
diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h b/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h
index 7410b1128628b..f7f9c7890e935 100644
--- a/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h
+++ b/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.h
@@ -9,6 +9,9 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/Visibility.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
   class Event;
@@ -21,9 +24,8 @@ class dso_hidden SeedCombiner : public edm::stream::EDProducer<> {
   SeedCombiner(const edm::ParameterSet& cfg);
   ~SeedCombiner() override = default;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
   void produce(edm::Event& ev, const edm::EventSetup& es) override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
   std::vector<edm::EDGetTokenT<TrajectorySeedCollection>> inputCollections_;
diff --git a/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducer.cc b/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducer.cc
index 6735519b118ea..608d13853c334 100644
--- a/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducer.cc
+++ b/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducer.cc
@@ -20,20 +20,24 @@
 //         Created:  Thu May 25 10:17:32 CDT 2006
 //
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/BeamSpot/interface/BeamSpot.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
 #include "RecoVertex/PixelVertexFinding/interface/DivisiveVertexFinder.h"
+
 #include <memory>
 #include <string>
 #include <cmath>
@@ -42,6 +46,7 @@ class PixelVertexProducer : public edm::stream::EDProducer<> {
 public:
   explicit PixelVertexProducer(const edm::ParameterSet&);
   ~PixelVertexProducer() override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   void produce(edm::Event&, const edm::EventSetup&) override;
 
@@ -59,6 +64,32 @@ class PixelVertexProducer : public edm::stream::EDProducer<> {
   DivisiveVertexFinder* dvf_;
 };
 
+void PixelVertexProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<int>("Verbosity", 0);
+  desc.add<double>("PtMin", 1.0);
+  desc.add<bool>("Method2", true);
+  desc.add<edm::InputTag>("TrackCollection", edm::InputTag("pixelTracks"));
+  desc.add<edm::InputTag>("beamSpot", edm::InputTag("offlineBeamSpot"));
+  desc.add<std::string>("Finder", "DivisiveVertexFinder");
+  desc.add<bool>("UseError", true);
+  desc.add<bool>("WtAverage", true);
+  desc.add<double>("ZOffset", 5.0);
+  desc.add<double>("ZSeparation", 0.05);
+  desc.add<int>("NTrkMin", 2);
+
+  {
+    edm::ParameterSetDescription PVComparerPSet;
+    PVComparerPSet.add<double>("track_pt_min", 1.0);
+    PVComparerPSet.add<double>("track_pt_max", 10.0);
+    PVComparerPSet.add<double>("track_chi2_max", 999999.);
+    PVComparerPSet.add<double>("track_prob_min", -1.);
+    desc.addOptional<edm::ParameterSetDescription>("PVcomparer", PVComparerPSet);
+  }
+
+  descriptions.addWithDefaultLabel(desc);
+}
+
 PixelVertexProducer::PixelVertexProducer(const edm::ParameterSet& conf)
     // 0 silent, 1 chatty, 2 loud
     : verbose_(conf.getParameter<int>("Verbosity")),
diff --git a/RecoVertex/PixelVertexFinding/python/PixelVertices_cfi.py b/RecoVertex/PixelVertexFinding/python/PixelVertices_cfi.py
index 2c83cb92f3775..9c78be3632edc 100644
--- a/RecoVertex/PixelVertexFinding/python/PixelVertices_cfi.py
+++ b/RecoVertex/PixelVertexFinding/python/PixelVertices_cfi.py
@@ -1,20 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoVertex.PixelVertexFinding.PVClusterComparer_cfi import *
-
-pixelVertices = cms.EDProducer("PixelVertexProducer",
-    WtAverage = cms.bool(True),
-    ZOffset = cms.double(5.0),
-    beamSpot = cms.InputTag("offlineBeamSpot"),
-    Verbosity = cms.int32(0),
-    UseError = cms.bool(True),
-    TrackCollection = cms.InputTag("pixelTracks"),
-    ZSeparation = cms.double(0.05),
-    NTrkMin = cms.int32(2),
-    Method2 = cms.bool(True),
-    Finder = cms.string('DivisiveVertexFinder'),
-    PtMin = cms.double(1.0),
-    PVcomparer = cms.PSet(
-       refToPSet_ = cms.string('pvClusterComparer')
-    )
-)
+from RecoVertex.PixelVertexFinding.pixelVertexProducer_cfi import pixelVertexProducer as _pixelVertexProducer
+pixelVertices = _pixelVertexProducer.clone()