Add fillDescriptions to several plugins used at HLT

 - add fillDescriptions to a bunch of modules in CommonTools
 - add a fillDescriptions to CaloMETProducer

Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h

@@ -4,6 +4,7 @@
 #include <vector>
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
 namespace edm {
   class Event;
@@ -25,6 +26,8 @@ class AlignmentCSCBeamHaloSelector {
   /// select tracks
   Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
 
+  static void fillPSetDescription(edm::ParameterSetDescription &desc);
+
 private:
   unsigned int m_minStations;
   unsigned int m_minHitsPerStation;

Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h

@@ -3,6 +3,7 @@
 
 #include <vector>
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
 namespace edm {
   class Event;
@@ -24,6 +25,8 @@ class AlignmentCSCOverlapSelector {
   /// select tracks
   Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
 
+  static void fillPSetDescription(edm::ParameterSetDescription &desc);
+
 private:
   int m_station;
   unsigned int m_minHitsPerChamber;

Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h

@@ -3,6 +3,7 @@
 
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include <vector>
 
 namespace edm {
@@ -25,6 +26,8 @@ class AlignmentCSCTrackSelector {
   /// select tracks
   Tracks select(const Tracks& tracks, const edm::Event& evt) const;
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 private:
   edm::InputTag m_src;
   int m_stationA, m_stationB, m_minHitsDT, m_minHitsPerStation, m_maxHitsPerStation;

Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h

@@ -7,6 +7,7 @@
 //Framework
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 //STL
 #include <vector>
@@ -34,6 +35,8 @@ class AlignmentGlobalTrackSelector {
   ///returns if any of the Filters is used.
   bool useThisFilter();
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 private:
   ///returns [tracks] if there are less than theMaxCount Jets with theMinJetPt and an empty set if not
   Tracks checkJetCount(const Tracks& cands, const edm::Event& iEvent) const;

Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h

@@ -17,6 +17,7 @@
 
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "CommonTools/RecoAlgos/interface/MuonSelector.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include <vector>
 
 namespace edm {
@@ -36,6 +37,8 @@ class AlignmentMuonSelector {
   /// select muons
   Muons select(const Muons& muons, const edm::Event& evt) const;
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 private:
   /// apply basic cuts on pt,eta,phi,nhit
   Muons basicCuts(const Muons& muons) const;

Alignment/CommonAlignmentProducer/interface/AlignmentSeedSelector.h

@@ -3,6 +3,7 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include <vector>
 
 namespace edm {
@@ -22,6 +23,8 @@ class AlignmentSeedSelector {
   /// select tracks
   Seeds select(const Seeds& seeds, const edm::Event& evt) const;
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 private:
   /// private data members
   bool applySeedNumber;

Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h

@@ -9,6 +9,7 @@
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include <vector>
 
@@ -37,6 +38,8 @@ class AlignmentTrackSelector {
   ///returns if any of the Filters is used.
   bool useThisFilter();
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 private:
   /// apply basic cuts on pt,eta,phi,nhit
   Tracks basicCuts(const Tracks& tracks, const edm::Event& evt, const edm::EventSetup& eSetup) const;

Alignment/CommonAlignmentProducer/interface/AlignmentTwoBodyDecayTrackSelector.h

@@ -5,6 +5,7 @@
 //Framework
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 //STL
 #include <vector>
@@ -32,6 +33,8 @@ class AlignmentTwoBodyDecayTrackSelector {
 
   bool useThisFilter();
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 private:
   ///checks if the mass of the mother is in the mass region
   Tracks checkMass(const Tracks& cands) const;

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc

@@ -1,8 +1,8 @@
-
+#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
-#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
 // the following include is necessary to clone all track branches
 // including recoTrackExtras and TrackingRecHitsOwned.
@@ -32,6 +32,10 @@ struct CSCBeamHaloConfigSelector {
     selected_ = theSelector.select(all_, evt);  // might add dummy...
   }
 
+  static void fillPSetDescription(edm::ParameterSetDescription &desc) {
+    AlignmentCSCBeamHaloSelector::fillPSetDescription(desc);
+  }
+
 private:
   container all_, selected_;
   AlignmentCSCBeamHaloSelector theSelector;

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc

@@ -1,8 +1,8 @@
-
+#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
-#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
 // the following include is necessary to clone all track branches
 // including recoTrackExtras and TrackingRecHitsOwned.
@@ -30,6 +30,10 @@ struct CSCOverlapConfigSelector {
     selected_ = theSelector.select(all_, evt);  // might add dummy...
   }
 
+  static void fillPSetDescription(edm::ParameterSetDescription &desc) {
+    AlignmentCSCOverlapSelector::fillPSetDescription(desc);
+  }
+
 private:
   container all_, selected_;
   AlignmentCSCOverlapSelector theSelector;

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc

@@ -1,6 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
@@ -33,6 +34,10 @@ struct CSCTrackConfigSelector {
     theSelectedTracks = theBaseSelector.select(all, evt);  // might add dummy
   }
 
+  static void fillPSetDescription(edm::ParameterSetDescription &desc) {
+    AlignmentCSCTrackSelector::fillPSetDescription(desc);
+  }
+
 private:
   container theSelectedTracks;
 

Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc

@@ -14,6 +14,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
@@ -43,6 +44,10 @@ struct MuonConfigSelector {
     selected_ = theSelector.select(all_, evt);  // might add dummy
   }
 
+  static void fillPSetDescription(edm::ParameterSetDescription &desc) {
+    AlignmentMuonSelector::fillPSetDescription(desc);
+  }
+
 private:
   container all_, selected_;
   AlignmentMuonSelector theSelector;

Alignment/CommonAlignmentProducer/plugins/AlignmentSeedSelectorModule.cc

@@ -1,7 +1,7 @@
-
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentSeedSelector.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 
@@ -25,6 +25,10 @@ struct SeedConfigSelector {
     selected_ = theSelector.select(all_, evt);  // might add dummy...
   }
 
+  static void fillPSetDescription(edm::ParameterSetDescription &desc) {
+    AlignmentSeedSelector::fillPSetDescription(desc);
+  }
+
 private:
   container all_, selected_;
   AlignmentSeedSelector theSelector;

Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc

@@ -1,6 +1,6 @@
-
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
@@ -51,6 +51,18 @@ struct TrackConfigSelector {
       theSelectedTracks = theTwoBodyDecaySelector.select(theSelectedTracks, evt, eSetup);
   }
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc) {
+    AlignmentTrackSelector::fillPSetDescription(desc);
+
+    edm::ParameterSetDescription globalSelectorDesc;
+    AlignmentGlobalTrackSelector::fillPSetDescription(globalSelectorDesc);
+    desc.add<edm::ParameterSetDescription>("GlobalSelector", globalSelectorDesc);
+
+    edm::ParameterSetDescription twoBodySelectorDesc;
+    AlignmentTwoBodyDecayTrackSelector::fillPSetDescription(twoBodySelectorDesc);
+    desc.add<edm::ParameterSetDescription>("TwoBodyDecaySelector", twoBodySelectorDesc);
+  }
+
 private:
   container theSelectedTracks;
 

Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc

@@ -19,6 +19,11 @@ AlignmentCSCBeamHaloSelector::AlignmentCSCBeamHaloSelector(const edm::ParameterS
       << " different CSC stations." << std::endl;
 }
 
+void AlignmentCSCBeamHaloSelector::fillPSetDescription(edm::ParameterSetDescription &desc) {
+  desc.add<unsigned int>("minStations", 0);
+  desc.add<unsigned int>("minHitsPerStation", 1);
+}
+
 // destructor -----------------------------------------------------------------
 
 AlignmentCSCBeamHaloSelector::~AlignmentCSCBeamHaloSelector() {}

Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc

@@ -23,6 +23,11 @@ AlignmentCSCOverlapSelector::AlignmentCSCOverlapSelector(const edm::ParameterSet
   }
 }
 
+void AlignmentCSCOverlapSelector::fillPSetDescription(edm::ParameterSetDescription &desc) {
+  desc.add<int>("station", 1);
+  desc.add<unsigned int>("minHitsPerChamber", 0);
+}
+
 // destructor -----------------------------------------------------------------
 
 AlignmentCSCOverlapSelector::~AlignmentCSCOverlapSelector() {}

Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc

@@ -20,6 +20,14 @@ AlignmentCSCTrackSelector::AlignmentCSCTrackSelector(const edm::ParameterSet& cf
       m_minHitsPerStation(cfg.getParameter<int>("minHitsPerStation")),
       m_maxHitsPerStation(cfg.getParameter<int>("maxHitsPerStation")) {}
 
+void AlignmentCSCTrackSelector::fillPSetDescription(edm::ParameterSetDescription& desc) {
+  desc.add<int>("stationA", 0);
+  desc.add<int>("stationB", 0);
+  desc.add<int>("minHitsDT", 0);
+  desc.add<int>("minHitsPerStation", 0);
+  desc.add<int>("maxHitsPerStation", 0);
+}
+
 // destructor -----------------------------------------------------------------
 
 AlignmentCSCTrackSelector::~AlignmentCSCTrackSelector() {}

Alignment/CommonAlignmentProducer/src/AlignmentGlobalTrackSelector.cc

@@ -61,6 +61,27 @@ AlignmentGlobalTrackSelector::AlignmentGlobalTrackSelector(const edm::ParameterS
   }
 }
 
+void AlignmentGlobalTrackSelector::fillPSetDescription(edm::ParameterSetDescription& desc) {
+  // Global muon finding
+  desc.add<bool>("applyGlobalMuonFilter", false);
+  desc.add<edm::InputTag>("muonSource", edm::InputTag("muons"));
+  desc.add<double>("maxTrackDeltaR", 0.001);
+  desc.add<int>("minGlobalMuonCount", 1);
+
+  // Isolation tests
+  desc.add<bool>("applyIsolationtest", false);
+  desc.add<edm::InputTag>("jetIsoSource", edm::InputTag("kt6CaloJets"));
+  desc.add<double>("maxJetPt", 40.0);  // GeV
+  desc.add<double>("minJetDeltaR", 0.2);
+  desc.add<int>("minIsolatedCount", 0);
+
+  // Jet count filter
+  desc.add<bool>("applyJetCountFilter", false);
+  desc.add<edm::InputTag>("jetCountSource", edm::InputTag("kt6CaloJets"));
+  desc.add<double>("minJetPt", 40.0);  // GeV
+  desc.add<int>("maxJetCount", 3);
+}
+
 // destructor -----------------------------------------------------------------
 AlignmentGlobalTrackSelector::~AlignmentGlobalTrackSelector() {}
 

Alignment/CommonAlignmentProducer/src/AlignmentMuonSelector.cc

@@ -53,6 +53,38 @@ AlignmentMuonSelector::AlignmentMuonSelector(const edm::ParameterSet& cfg)
         << "apply Mass Pair filter minMassPair=" << minMassPair << " maxMassPair=" << maxMassPair;
 }
 
+void AlignmentMuonSelector::fillPSetDescription(edm::ParameterSetDescription& desc) {
+  desc.add<bool>("applyBasicCuts", true);
+  desc.add<bool>("applyNHighestPt", false);
+  desc.add<bool>("applyMultiplicityFilter", false);
+  desc.add<bool>("applyMassPairFilter", false);
+  desc.add<int>("nHighestPt", 2);
+  desc.add<int>("minMultiplicity", 1);
+  desc.add<double>("pMin", 0.0);
+  desc.add<double>("pMax", 999999.0);
+  desc.add<double>("ptMin", 10.);
+  desc.add<double>("ptMax", 999999.0);
+  desc.add<double>("etaMin", -2.4);
+  desc.add<double>("etaMax", 2.4);
+  desc.add<double>("phiMin", -3.1416);
+  desc.add<double>("phiMax", 3.1416);
+  desc.add<double>("nHitMinSA", 0.0);
+  desc.add<double>("nHitMaxSA", 999999.0);
+  desc.add<double>("chi2nMaxSA", 999999.0);
+  desc.add<double>("nHitMinGB", 0.0);
+  desc.add<double>("nHitMaxGB", 999999.0);
+  desc.add<double>("chi2nMaxGB", 999999.0);
+  desc.add<double>("nHitMinTO", 0.0);
+  desc.add<double>("nHitMaxTO", 999999.0);
+  desc.add<double>("chi2nMaxTO", 999999.0);
+  desc.add<double>("minMassPair", 89.0)
+      ->setComment(
+          "copy best mass pair combination muons to result vector \n Criteria: \n a) maxMassPair != minMassPair: the "
+          "two highest pt muons with mass pair inside the given mass window \n b) maxMassPair == minMassPair: the muon "
+          "pair with mass pair closest to given mass value");
+  desc.add<double>("maxMassPair", 90.0);
+}
+
 // destructor -----------------------------------------------------------------
 
 AlignmentMuonSelector::~AlignmentMuonSelector() {}

Alignment/CommonAlignmentProducer/src/AlignmentSeedSelector.cc

@@ -12,6 +12,12 @@ AlignmentSeedSelector::AlignmentSeedSelector(const edm::ParameterSet& cfg)
     edm::LogInfo("AlignmentSeedSelector") << "apply seedNumber N<=" << minNSeeds;
 }
 
+void AlignmentSeedSelector::fillPSetDescription(edm::ParameterSetDescription& desc) {
+  desc.add<bool>("applySeedNumber", false);
+  desc.add<int>("minNSeeds", 0);
+  desc.add<int>("maxNSeeds", 999999.);
+}
+
 // destructor -----------------------------------------------------------------
 
 AlignmentSeedSelector::~AlignmentSeedSelector() {}