Skip to content

Commit 083eb7b

Browse files
committed
Add fillDescriptions to several plugins used at HLT
- add fillDescriptions to a bunch of modules in CommonTools - add a fillDescriptions to CaloMETProducer
1 parent f5133ff commit 083eb7b

File tree

91 files changed

+902
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+902
-150
lines changed

Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <vector>
55
#include "FWCore/Framework/interface/ConsumesCollector.h"
66
#include "DataFormats/TrackReco/interface/Track.h"
7+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
78

89
namespace edm {
910
class Event;
@@ -25,6 +26,8 @@ class AlignmentCSCBeamHaloSelector {
2526
/// select tracks
2627
Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
2728

29+
static void fillPSetDescription(edm::ParameterSetDescription &desc);
30+
2831
private:
2932
unsigned int m_minStations;
3033
unsigned int m_minHitsPerStation;

Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <vector>
55
#include "DataFormats/TrackReco/interface/Track.h"
6+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
67

78
namespace edm {
89
class Event;
@@ -24,6 +25,8 @@ class AlignmentCSCOverlapSelector {
2425
/// select tracks
2526
Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
2627

28+
static void fillPSetDescription(edm::ParameterSetDescription &desc);
29+
2730
private:
2831
int m_station;
2932
unsigned int m_minHitsPerChamber;

Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "DataFormats/TrackReco/interface/Track.h"
55
#include "FWCore/Utilities/interface/InputTag.h"
6+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
67
#include <vector>
78

89
namespace edm {
@@ -25,6 +26,8 @@ class AlignmentCSCTrackSelector {
2526
/// select tracks
2627
Tracks select(const Tracks& tracks, const edm::Event& evt) const;
2728

29+
static void fillPSetDescription(edm::ParameterSetDescription& desc);
30+
2831
private:
2932
edm::InputTag m_src;
3033
int m_stationA, m_stationB, m_minHitsDT, m_minHitsPerStation, m_maxHitsPerStation;

Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//Framework
88
#include "FWCore/Framework/interface/ConsumesCollector.h"
99
#include "FWCore/ParameterSet/interface/ParameterSet.h"
10+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
1011
#include "FWCore/Utilities/interface/EDGetToken.h"
1112
//STL
1213
#include <vector>
@@ -34,6 +35,8 @@ class AlignmentGlobalTrackSelector {
3435
///returns if any of the Filters is used.
3536
bool useThisFilter();
3637

38+
static void fillPSetDescription(edm::ParameterSetDescription& desc);
39+
3740
private:
3841
///returns [tracks] if there are less than theMaxCount Jets with theMinJetPt and an empty set if not
3942
Tracks checkJetCount(const Tracks& cands, const edm::Event& iEvent) const;

Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "DataFormats/MuonReco/interface/Muon.h"
1919
#include "CommonTools/RecoAlgos/interface/MuonSelector.h"
20+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
2021
#include <vector>
2122

2223
namespace edm {
@@ -36,6 +37,8 @@ class AlignmentMuonSelector {
3637
/// select muons
3738
Muons select(const Muons& muons, const edm::Event& evt) const;
3839

40+
static void fillPSetDescription(edm::ParameterSetDescription& desc);
41+
3942
private:
4043
/// apply basic cuts on pt,eta,phi,nhit
4144
Muons basicCuts(const Muons& muons) const;

Alignment/CommonAlignmentProducer/interface/AlignmentSeedSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "FWCore/ParameterSet/interface/ParameterSet.h"
55
#include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h"
6+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
67
#include <vector>
78

89
namespace edm {
@@ -22,6 +23,8 @@ class AlignmentSeedSelector {
2223
/// select tracks
2324
Seeds select(const Seeds& seeds, const edm::Event& evt) const;
2425

26+
static void fillPSetDescription(edm::ParameterSetDescription& desc);
27+
2528
private:
2629
/// private data members
2730
bool applySeedNumber;

Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "FWCore/Framework/interface/ConsumesCollector.h"
1010
#include "FWCore/Utilities/interface/EDGetToken.h"
1111
#include "FWCore/Utilities/interface/InputTag.h"
12+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
1213
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
1314
#include <vector>
1415

@@ -37,6 +38,8 @@ class AlignmentTrackSelector {
3738
///returns if any of the Filters is used.
3839
bool useThisFilter();
3940

41+
static void fillPSetDescription(edm::ParameterSetDescription& desc);
42+
4043
private:
4144
/// apply basic cuts on pt,eta,phi,nhit
4245
Tracks basicCuts(const Tracks& tracks, const edm::Event& evt, const edm::EventSetup& eSetup) const;

Alignment/CommonAlignmentProducer/interface/AlignmentTwoBodyDecayTrackSelector.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
//Framework
66
#include "FWCore/Framework/interface/ConsumesCollector.h"
77
#include "FWCore/ParameterSet/interface/ParameterSet.h"
8+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
89
#include "FWCore/Utilities/interface/EDGetToken.h"
910
//STL
1011
#include <vector>
@@ -32,6 +33,8 @@ class AlignmentTwoBodyDecayTrackSelector {
3233

3334
bool useThisFilter();
3435

36+
static void fillPSetDescription(edm::ParameterSetDescription& desc);
37+
3538
private:
3639
///checks if the mass of the mother is in the mass region
3740
Tracks checkMass(const Tracks& cands) const;

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
1+
#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h"
2+
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
23
#include "FWCore/Framework/interface/ConsumesCollector.h"
34
#include "FWCore/Framework/interface/MakerMacros.h"
4-
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
5-
#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h"
5+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
66

77
// the following include is necessary to clone all track branches
88
// including recoTrackExtras and TrackingRecHitsOwned.
@@ -32,6 +32,10 @@ struct CSCBeamHaloConfigSelector {
3232
selected_ = theSelector.select(all_, evt); // might add dummy...
3333
}
3434

35+
static void fillPSetDescription(edm::ParameterSetDescription &desc) {
36+
AlignmentCSCBeamHaloSelector::fillPSetDescription(desc);
37+
}
38+
3539
private:
3640
container all_, selected_;
3741
AlignmentCSCBeamHaloSelector theSelector;

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
1+
#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h"
2+
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
23
#include "FWCore/Framework/interface/ConsumesCollector.h"
34
#include "FWCore/Framework/interface/MakerMacros.h"
4-
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
5-
#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h"
5+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
66

77
// the following include is necessary to clone all track branches
88
// including recoTrackExtras and TrackingRecHitsOwned.
@@ -30,6 +30,10 @@ struct CSCOverlapConfigSelector {
3030
selected_ = theSelector.select(all_, evt); // might add dummy...
3131
}
3232

33+
static void fillPSetDescription(edm::ParameterSetDescription &desc) {
34+
AlignmentCSCOverlapSelector::fillPSetDescription(desc);
35+
}
36+
3337
private:
3438
container all_, selected_;
3539
AlignmentCSCOverlapSelector theSelector;

0 commit comments

Comments
 (0)