Skip to content

Commit f5133ff

Browse files
committed
add a fillDescriptions to TrackWithVertexRefSelector
1 parent 902cf5d commit f5133ff

File tree

7 files changed

+20
-10
lines changed

7 files changed

+20
-10
lines changed

CommonTools/RecoAlgos/python/TrackWithVertexSelectorParams_cff.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,4 @@
2929
zetaVtx = cms.double(1.0),
3030
rhoVtx = cms.double(0.2), ## tags used by b-tagging folks
3131
nSigmaDtVertex = cms.double(0),
32-
# should _not_ be used for the TrackWithVertexRefSelector
33-
copyExtras = cms.untracked.bool(False), ## copies also extras and rechits on RECO
34-
copyTrajectories = cms.untracked.bool(False), # don't set this to true on AOD!
3532
)

CommonTools/UtilAlgos/interface/ObjectSelectorBase.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414

1515
#include "FWCore/Framework/interface/Event.h"
1616
#include "FWCore/Framework/interface/ConsumesCollector.h"
17+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
1718
#include "FWCore/ParameterSet/interface/ParameterSet.h"
19+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
1820
#include "FWCore/Utilities/interface/InputTag.h"
1921
#include "CommonTools/UtilAlgos/interface/ParameterAdapter.h"
2022
#include <utility>
@@ -53,6 +55,10 @@ class ObjectSelectorBase : public Base {
5355
/// destructor
5456
~ObjectSelectorBase() override {}
5557

58+
static void fillPSetDescription(edm::ParameterSetDescription& desc) {
59+
desc.addUntracked<bool>("throwOnMissing", true);
60+
};
61+
5662
private:
5763
/// process one event
5864
bool filter(edm::Event& evt, const edm::EventSetup& es) override {

CommonTools/UtilAlgos/interface/ObjectSelectorProducer.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "FWCore/Framework/interface/Event.h"
55
#include "FWCore/Framework/interface/ConsumesCollector.h"
66
#include "FWCore/ParameterSet/interface/ParameterSet.h"
7+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
78
#include "FWCore/Utilities/interface/InputTag.h"
89
#include "CommonTools/UtilAlgos/interface/StoreManagerTrait.h"
910
#include "CommonTools/UtilAlgos/interface/SelectedOutputCollectionTrait.h"
@@ -42,6 +43,14 @@ class ObjectSelectorProducer : public Base {
4243
/// destructor
4344
~ObjectSelectorProducer() override {}
4445

46+
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
47+
edm::ParameterSetDescription desc;
48+
desc.add<edm::InputTag>("src");
49+
//Base::fillPSetDescription(desc);
50+
Selector::fillPSetDescription(desc);
51+
descriptions.addWithDefaultLabel(desc);
52+
}
53+
4554
private:
4655
/// process one event
4756
void produce(edm::Event& evt, const edm::EventSetup& es) override {

CommonTools/UtilAlgos/interface/SingleElementCollectionSelectorPlusEvent.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*
1414
*/
1515
#include "FWCore/Framework/interface/ConsumesCollector.h"
16+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
1617
#include "CommonTools/UtilAlgos/interface/SelectionAdderTrait.h"
1718
#include "CommonTools/UtilAlgos/interface/StoreContainerTrait.h"
1819
#include "CommonTools/UtilAlgos/interface/ParameterAdapter.h"
@@ -44,6 +45,8 @@ struct SingleElementCollectionSelectorPlusEvent {
4445
}
4546
}
4647

48+
static void fillPSetDescription(edm::ParameterSetDescription &desc) { Selector::fillPSetDescription(desc); };
49+
4750
private:
4851
StoreContainer selected_;
4952
Selector select_;

DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,7 @@
280280
zetaVtx = 999.,
281281
#rhoVtx = 0.2, ## tags used by b-tagging folks
282282
rhoVtx = 999., ## tags used by b-tagging folks
283-
nSigmaDtVertex = 0.,
284-
# should _not_ be used for the TrackWithVertexRefSelector
285-
copyExtras = False, ## copies also extras and rechits on RECO
286-
copyTrajectories = False # don't set this to true on AOD!
283+
nSigmaDtVertex = 0.
287284
)
288285

289286
highPurityPV0p1 = trackAssociated2pvSelector.clone(

HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackWithVertexRefSelectorBeforeSorting_cfi.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import FWCore.ParameterSet.Config as cms
22

33
hltTrackWithVertexRefSelectorBeforeSorting = cms.EDProducer("TrackWithVertexRefSelector",
4-
copyExtras = cms.untracked.bool(False),
5-
copyTrajectories = cms.untracked.bool(False),
64
d0Max = cms.double(999.0),
75
dzMax = cms.double(999.0),
86
etaMax = cms.double(5.0),

Validation/RecoTrack/python/TrackValidation_cff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ def _uniqueFirstLayers(layerList):
10801080
pixelTracksPt09 = trackRefSelector.clone( cut = cutstring )
10811081
#pixelTracksPt09 = generalTracksPt09.clone(quality = ["undefQuality"], **_pixelTracksCustom)
10821082

1083-
pixelTracksFromPV = generalTracksFromPV.clone(quality = "highPurity", ptMin = 0.0, ptMax = 99999., ptErrorCut = 99999., copyExtras = True, **_pixelTracksCustom)
1083+
pixelTracksFromPV = generalTracksFromPV.clone(quality = "highPurity", ptMin = 0.0, ptMax = 99999., ptErrorCut = 99999., **_pixelTracksCustom)
10841084
#pixelTracksFromPVPt09 = generalTracksPt09.clone(quality = ["loose","tight","highPurity"], vertexTag = "pixelVertices", src = "pixelTracksFromPV")
10851085
pixelTracksFromPVPt09 = pixelTracksFromPV.clone(ptMin = 0.9)
10861086

0 commit comments

Comments
 (0)