diff --git a/RecoBTag/BTagTools/BuildFile.xml b/RecoBTag/BTagTools/BuildFile.xml
index 66dc77c0369b0..25b415d9e452a 100644
--- a/RecoBTag/BTagTools/BuildFile.xml
+++ b/RecoBTag/BTagTools/BuildFile.xml
@@ -5,6 +5,7 @@
 <use name="TrackingTools/GeomPropagators"/>
 <use name="TrackingTools/PatternTools"/>
 <use name="TrackingTools/TrajectoryState"/>
+<use name="FWCore/ParameterSet"/>
 <use name="clhep"/>
 <export>
   <lib name="1"/>
diff --git a/RecoBTag/BTagTools/interface/SignedDecayLength3D.h b/RecoBTag/BTagTools/interface/SignedDecayLength3D.h
index 91f4df71fe9f1..2540e1e615456 100644
--- a/RecoBTag/BTagTools/interface/SignedDecayLength3D.h
+++ b/RecoBTag/BTagTools/interface/SignedDecayLength3D.h
@@ -5,6 +5,8 @@
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include <utility>
 
 /** Threedimensional track decay length (minimum distance of the closest 
@@ -23,6 +25,7 @@ class SignedDecayLength3D {
                                               const reco::Vertex &vertex);
 
   int id() const { return 3; }
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
   static TrajectoryStateOnSurface closestApproachToJet(const FreeTrajectoryState &,
diff --git a/RecoBTag/BTagTools/interface/SignedImpactParameter3D.h b/RecoBTag/BTagTools/interface/SignedImpactParameter3D.h
index a38f3c28aaba3..1efe235b8c1c1 100644
--- a/RecoBTag/BTagTools/interface/SignedImpactParameter3D.h
+++ b/RecoBTag/BTagTools/interface/SignedImpactParameter3D.h
@@ -5,6 +5,8 @@
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include <utility>
 /** Threedimensional track impact parameter signed according to the jet 
    *  direction
@@ -31,6 +33,8 @@ class SignedImpactParameter3D {
                                                               const GlobalVector &direction,
                                                               const reco::Vertex &vertex);
 
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
 private:
   static GlobalVector distance(const TrajectoryStateOnSurface &, const reco::Vertex &, const GlobalVector &);
 
diff --git a/RecoBTag/BTagTools/interface/SignedTransverseImpactParameter.h b/RecoBTag/BTagTools/interface/SignedTransverseImpactParameter.h
index 09f018ee7bc34..bc32aca792245 100644
--- a/RecoBTag/BTagTools/interface/SignedTransverseImpactParameter.h
+++ b/RecoBTag/BTagTools/interface/SignedTransverseImpactParameter.h
@@ -6,6 +6,9 @@
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+
 #include <utility>
 
 /** Transverse track impact parameter signed according to the jet 
@@ -23,6 +26,8 @@ class SignedTransverseImpactParameter {
   std::pair<bool, Measurement1D> zImpactParameter(const reco::TransientTrack &,
                                                   const GlobalVector &,
                                                   const reco::Vertex &) const;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 };
 
 #endif
diff --git a/RecoBTag/BTagTools/src/SignedDecayLength3D.cc b/RecoBTag/BTagTools/src/SignedDecayLength3D.cc
index 4d73565978eeb..766d021a56ef6 100644
--- a/RecoBTag/BTagTools/src/SignedDecayLength3D.cc
+++ b/RecoBTag/BTagTools/src/SignedDecayLength3D.cc
@@ -15,6 +15,7 @@
 
 using namespace std;
 using namespace reco;
+using namespace edm;
 
 pair<bool, Measurement1D> SignedDecayLength3D::apply(const TransientTrack& transientTrack,
                                                      const GlobalVector& direction,
@@ -76,3 +77,8 @@ TrajectoryStateOnSurface SignedDecayLength3D::closestApproachToJet(const FreeTra
 
   return TETL.extrapolate(aFTS, Jet);
 }
+
+void SignedDecayLength3D::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  descriptions.addWithDefaultLabel(desc);
+}
diff --git a/RecoBTag/BTagTools/src/SignedImpactParameter3D.cc b/RecoBTag/BTagTools/src/SignedImpactParameter3D.cc
index f20fc6751b4ff..a4dd6291fe1a9 100644
--- a/RecoBTag/BTagTools/src/SignedImpactParameter3D.cc
+++ b/RecoBTag/BTagTools/src/SignedImpactParameter3D.cc
@@ -13,6 +13,7 @@
 
 using namespace std;
 using namespace reco;
+using namespace edm;
 
 pair<bool, Measurement1D> SignedImpactParameter3D::apply(const TransientTrack& transientTrack,
                                                          const GlobalVector& direction,
@@ -189,3 +190,8 @@ pair<double, Measurement1D> SignedImpactParameter3D::distanceWithJetAxis(const T
 
   return pair<double, Measurement1D>(theDistanceAlongJetAxis, DTJA);
 }
+
+void SignedImpactParameter3D::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  descriptions.addWithDefaultLabel(desc);
+}
diff --git a/RecoBTag/BTagTools/src/SignedTransverseImpactParameter.cc b/RecoBTag/BTagTools/src/SignedTransverseImpactParameter.cc
index 9bc4b763e48b6..14e544fdd5b2f 100644
--- a/RecoBTag/BTagTools/src/SignedTransverseImpactParameter.cc
+++ b/RecoBTag/BTagTools/src/SignedTransverseImpactParameter.cc
@@ -16,6 +16,7 @@
 
 using namespace std;
 using namespace reco;
+using namespace edm;
 
 pair<bool, Measurement1D> SignedTransverseImpactParameter::apply(const TransientTrack& track,
                                                                  const GlobalVector& direction,
@@ -117,3 +118,8 @@ pair<bool, Measurement1D> SignedTransverseImpactParameter::zImpactParameter(cons
 
   return pair<bool, Measurement1D>(true, Measurement1D(deltaZ, errZ));
 }
+
+void SignedTransverseImpactParameter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  descriptions.addWithDefaultLabel(desc);
+}
diff --git a/RecoBTag/Skimming/interface/BTagSkimLeptonJet.h b/RecoBTag/Skimming/interface/BTagSkimLeptonJet.h
index 9cf386361d507..1662ca03122a1 100644
--- a/RecoBTag/Skimming/interface/BTagSkimLeptonJet.h
+++ b/RecoBTag/Skimming/interface/BTagSkimLeptonJet.h
@@ -17,11 +17,15 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+
 class BTagSkimLeptonJet : public edm::one::EDFilter<> {
 public:
   explicit BTagSkimLeptonJet(const edm::ParameterSet&);
   ~BTagSkimLeptonJet() override;
   bool filter(edm::Event&, const edm::EventSetup&) override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
   void endJob() override;
 
 private:
diff --git a/RecoBTag/Skimming/interface/BTagSkimMC.h b/RecoBTag/Skimming/interface/BTagSkimMC.h
index 17e5607bdd421..2ed844506b969 100644
--- a/RecoBTag/Skimming/interface/BTagSkimMC.h
+++ b/RecoBTag/Skimming/interface/BTagSkimMC.h
@@ -1,5 +1,7 @@
 #include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace BTagSkimMCCount {
   struct Counters {
@@ -20,6 +22,7 @@ class BTagSkimMC : public edm::stream::EDFilter<edm::GlobalCache<BTagSkimMCCount
   bool filter(edm::Event& evt, const edm::EventSetup& es) override;
   void endStream() override;
   static void globalEndJob(const BTagSkimMCCount::Counters* counters);
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
   bool verbose;
diff --git a/RecoBTag/Skimming/python/btagElecInJet_cfi.py b/RecoBTag/Skimming/python/btagElecInJet_cfi.py
index 40deb918007f0..9f187a2d80f32 100644
--- a/RecoBTag/Skimming/python/btagElecInJet_cfi.py
+++ b/RecoBTag/Skimming/python/btagElecInJet_cfi.py
@@ -2,15 +2,15 @@
 
 btagElecInJet = cms.EDFilter("BTagSkimLeptonJet",
     CaloJet = cms.InputTag("iterativeCone5CaloJets"),
-    MinimumCaloJetPt = cms.double(20.0),
-    MinimumPtRel = cms.double(0.0),
-    LeptonType = cms.string('electron'),
+    MinimumCaloJetPt = cms.untracked.double(20.0),
+    MinimumPtRel = cms.untracked.double(0.0),
+    LeptonType = cms.untracked.string('electron'),
     Lepton = cms.InputTag("pixelMatchGsfElectrons"),
-    MinimumNLeptonJet = cms.int32(1),
-    MaximumDeltaR = cms.double(0.4),
-    MaximumLeptonEta = cms.double(2.5),
-    MinimumLeptonPt = cms.double(6.0),
-    MaximumCaloJetEta = cms.double(3.0)
+    MinimumNLeptonJet = cms.untracked.int32(1),
+    MaximumDeltaR = cms.untracked.double(0.4),
+    MaximumLeptonEta = cms.untracked.double(2.5),
+    MinimumLeptonPt = cms.untracked.double(6.0),
+    MaximumCaloJetEta = cms.untracked.double(3.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_QCD_120_170_cfi.py b/RecoBTag/Skimming/python/btagMC_QCD_120_170_cfi.py
index 13017d570d882..fed50e89c60b1 100644
--- a/RecoBTag/Skimming/python/btagMC_QCD_120_170_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_QCD_120_170_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_QCD_120_170 = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('QCD'),
-    pthat_min = cms.double(120.0),
+    mcProcess = cms.untracked.string('QCD'),
+    pthat_min = cms.untracked.double(120.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(170.0)
+    pthat_max = cms.untracked.double(170.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_QCD_200_300_cfi.py b/RecoBTag/Skimming/python/btagMC_QCD_200_300_cfi.py
index 261f5ea40027a..13710b695f0c5 100644
--- a/RecoBTag/Skimming/python/btagMC_QCD_200_300_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_QCD_200_300_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_QCD_200_300 = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('QCD'),
-    pthat_min = cms.double(200.0),
+    mcProcess = cms.untracked.string('QCD'),
+    pthat_min = cms.untracked.double(200.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(300.0)
+    pthat_max = cms.untracked.double(300.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_QCD_20_50_cfi.py b/RecoBTag/Skimming/python/btagMC_QCD_20_50_cfi.py
index 2b2673ee46e8f..3afa94147712a 100644
--- a/RecoBTag/Skimming/python/btagMC_QCD_20_50_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_QCD_20_50_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_QCD_20_50 = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('QCD'),
-    pthat_min = cms.double(20.0),
+    mcProcess = cms.untracked.string('QCD'),
+    pthat_min = cms.untracked.double(20.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(50.0)
+    pthat_max = cms.untracked.double(50.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_QCD_380_470_cfi.py b/RecoBTag/Skimming/python/btagMC_QCD_380_470_cfi.py
index 9580424aac3cf..2a572840651bb 100644
--- a/RecoBTag/Skimming/python/btagMC_QCD_380_470_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_QCD_380_470_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_QCD_380_470 = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('QCD'),
-    pthat_min = cms.double(380.0),
+    mcProcess = cms.untracked.string('QCD'),
+    pthat_min = cms.untracked.double(380.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(470.0)
+    pthat_max = cms.untracked.double(470.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_QCD_50_80_cfi.py b/RecoBTag/Skimming/python/btagMC_QCD_50_80_cfi.py
index 921f8c38330fa..1ac82dcb8b4ff 100644
--- a/RecoBTag/Skimming/python/btagMC_QCD_50_80_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_QCD_50_80_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_QCD_50_80 = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('QCD'),
-    pthat_min = cms.double(50.0),
+    mcProcess = cms.untracked.string('QCD'),
+    pthat_min = cms.untracked.double(50.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(80.0)
+    pthat_max = cms.untracked.double(80.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_QCD_800_1000_cfi.py b/RecoBTag/Skimming/python/btagMC_QCD_800_1000_cfi.py
index 0966ebe00a88a..cc62074cd0ea0 100644
--- a/RecoBTag/Skimming/python/btagMC_QCD_800_1000_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_QCD_800_1000_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_QCD_800_1000 = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('QCD'),
-    pthat_min = cms.double(800.0),
+    mcProcess = cms.untracked.string('QCD'),
+    pthat_min = cms.untracked.double(800.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(1000.0)
+    pthat_max = cms.untracked.double(1000.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_QCD_80_120_cfi.py b/RecoBTag/Skimming/python/btagMC_QCD_80_120_cfi.py
index 20f92dbab17f7..195a4ce549686 100644
--- a/RecoBTag/Skimming/python/btagMC_QCD_80_120_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_QCD_80_120_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_QCD_80_120 = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('QCD'),
-    pthat_min = cms.double(80.0),
+    mcProcess = cms.untracked.string('QCD'),
+    pthat_min = cms.untracked.double(80.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(120.0)
+    pthat_max = cms.untracked.double(120.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMC_ttbar_cfi.py b/RecoBTag/Skimming/python/btagMC_ttbar_cfi.py
index af58599106b2a..bcc2877d3f69c 100644
--- a/RecoBTag/Skimming/python/btagMC_ttbar_cfi.py
+++ b/RecoBTag/Skimming/python/btagMC_ttbar_cfi.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 btagMC_ttbar = cms.EDFilter("BTagSkimMC",
-    mcProcess = cms.string('ttbar'),
-    pthat_min = cms.double(50.0),
+    mcProcess = cms.untracked.string('ttbar'),
+    pthat_min = cms.untracked.double(50.0),
     verbose = cms.untracked.bool(False),
-    pthat_max = cms.double(80.0)
+    pthat_max = cms.untracked.double(80.0)
 )
 
 
diff --git a/RecoBTag/Skimming/python/btagMuonInJet_cfi.py b/RecoBTag/Skimming/python/btagMuonInJet_cfi.py
index 5573c65502510..ba8657e47fa8d 100644
--- a/RecoBTag/Skimming/python/btagMuonInJet_cfi.py
+++ b/RecoBTag/Skimming/python/btagMuonInJet_cfi.py
@@ -2,15 +2,15 @@
 
 btagMuonInJet = cms.EDFilter("BTagSkimLeptonJet",
     CaloJet = cms.InputTag("iterativeCone5CaloJets"),
-    MinimumCaloJetPt = cms.double(20.0),
-    MinimumPtRel = cms.double(0.0),
-    LeptonType = cms.string('muon'),
+    MinimumCaloJetPt = cms.untracked.double(20.0),
+    MinimumPtRel = cms.untracked.double(0.0),
+    LeptonType = cms.untracked.string('muon'),
     Lepton = cms.InputTag("muons"),
-    MinimumNLeptonJet = cms.int32(1),
-    MaximumDeltaR = cms.double(0.4),
-    MaximumLeptonEta = cms.double(2.5),
-    MinimumLeptonPt = cms.double(6.0),
-    MaximumCaloJetEta = cms.double(3.0)
+    MinimumNLeptonJet = cms.untracked.int32(1),
+    MaximumDeltaR = cms.untracked.double(0.4),
+    MaximumLeptonEta = cms.untracked.double(2.5),
+    MinimumLeptonPt = cms.untracked.double(6.0),
+    MaximumCaloJetEta = cms.untracked.double(3.0)
 )
 
 
diff --git a/RecoBTag/Skimming/src/BTagSkimLeptonJet.cc b/RecoBTag/Skimming/src/BTagSkimLeptonJet.cc
index 98a373ec57628..305c47ea03b3e 100644
--- a/RecoBTag/Skimming/src/BTagSkimLeptonJet.cc
+++ b/RecoBTag/Skimming/src/BTagSkimLeptonJet.cc
@@ -33,24 +33,23 @@ using namespace reco;
 
 BTagSkimLeptonJet::BTagSkimLeptonJet(const edm::ParameterSet& iConfig) : nEvents_(0), nAccepted_(0) {
   CaloJetInput_ = iConfig.getParameter<InputTag>("CaloJet");
-  MinCaloJetPt_ = iConfig.getParameter<double>("MinimumCaloJetPt");
-  MaxCaloJetEta_ = iConfig.getParameter<double>("MaximumCaloJetEta");
+  MinCaloJetPt_ = iConfig.getUntrackedParameter<double>("MinimumCaloJetPt", 20.0);
+  MaxCaloJetEta_ = iConfig.getUntrackedParameter<double>("MaximumCaloJetEta", 3.0);
 
-  LeptonType_ = iConfig.getParameter<std::string>("LeptonType");
+  LeptonType_ = iConfig.getUntrackedParameter<std::string>("LeptonType", "");
   if (LeptonType_ != "electron" && LeptonType_ != "muon")
     edm::LogError("BTagSkimLeptonJet") << "unknown lepton type !!";
   LeptonInput_ = iConfig.getParameter<InputTag>("Lepton");
-  MinLeptonPt_ = iConfig.getParameter<double>("MinimumLeptonPt");
-  MaxLeptonEta_ = iConfig.getParameter<double>("MaximumLeptonEta");
-  //MinNLepton_ = iConfig.getParameter<int>( "MinimumNLepton" );
+  MinLeptonPt_ = iConfig.getUntrackedParameter<double>("MinimumLeptonPt", 1.0);
+  MaxLeptonEta_ = iConfig.getUntrackedParameter<double>("MaximumLeptonEta", 2.5);
 
-  MaxDeltaR_ = iConfig.getParameter<double>("MaximumDeltaR");
+  MaxDeltaR_ = iConfig.getUntrackedParameter<double>("MaximumDeltaR", 0.4);
 
-  MinPtRel_ = iConfig.getParameter<double>("MinimumPtRel");
+  MinPtRel_ = iConfig.getUntrackedParameter<double>("MinimumPtRel", 0.0);
 
-  MinNLeptonJet_ = iConfig.getParameter<int>("MinimumNLeptonJet");
+  MinNLeptonJet_ = iConfig.getUntrackedParameter<int>("MinimumNLeptonJet", 0);
   if (MinNLeptonJet_ < 1)
-    edm::LogError("BTagSkimLeptonJet") << "MinimunNCaloJet < 1 !!";
+    edm::LogError("BTagSkimLeptonJet") << "MinimunNCaloJet containing muons < 1 !!";
 }
 
 /*------------------------------------------------------------------------*/
@@ -59,6 +58,10 @@ BTagSkimLeptonJet::~BTagSkimLeptonJet() {}
 
 /*------------------------------------------------------------------------*/
 
+void BTagSkimLeptonJet::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  descriptions.addWithDefaultLabel(desc);
+}
 bool BTagSkimLeptonJet::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   nEvents_++;
 
diff --git a/RecoBTag/Skimming/src/BTagSkimMC.cc b/RecoBTag/Skimming/src/BTagSkimMC.cc
index 0e078511d1832..c1e3b18555503 100644
--- a/RecoBTag/Skimming/src/BTagSkimMC.cc
+++ b/RecoBTag/Skimming/src/BTagSkimMC.cc
@@ -12,9 +12,9 @@ using namespace reco;
 
 BTagSkimMC::BTagSkimMC(const ParameterSet& p, const BTagSkimMCCount::Counters* count) : nEvents_(0), nAccepted_(0) {
   verbose = p.getUntrackedParameter<bool>("verbose", false);
-  pthatMin = p.getParameter<double>("pthat_min");
-  pthatMax = p.getParameter<double>("pthat_max");
-  process_ = p.getParameter<string>("mcProcess");
+  pthatMin = p.getUntrackedParameter<double>("pthat_min", 0.0);
+  pthatMax = p.getUntrackedParameter<double>("pthat_max", 0.0);
+  process_ = p.getUntrackedParameter<string>("mcProcess", "");
   if (verbose)
     cout << " Requested:  " << process_ << endl;
 }
@@ -91,6 +91,10 @@ void BTagSkimMC::globalEndJob(const BTagSkimMCCount::Counters* count) {
                                  << std::endl;
 }
 
-#include "FWCore/Framework/interface/MakerMacros.h"
+void BTagSkimMC::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  descriptions.addWithDefaultLabel(desc);
+}
 
+#include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(BTagSkimMC);