Merge pull request #5833 from silviodonato/fastpv-ptweight

Bug fixing in FastPrimaryVertex - backport in 72X
cms-sw · Oct 16, 2014 · 0f684e1 · 0f684e1
2 parents 62c9437 + 5eb060e
commit 0f684e1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/RecoPixelVertexing/PixelVertexFinding/python/jetVertexChecker_cfi.py b/RecoPixelVertexing/PixelVertexFinding/python/jetVertexChecker_cfi.py
diff --git a/RecoPixelVertexing/PixelVertexFinding/src/JetVertexChecker.cc b/RecoPixelVertexing/PixelVertexFinding/src/JetVertexChecker.cc
@@ -171,8 +171,6 @@ JetVertexChecker::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
 void
 JetVertexChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-//The following says we do not know what parameters are allowed so do no validation
-// Please change this to state exactly what you do use, even if it is no parameters
    edm::ParameterSetDescription desc;
    desc.add<edm::InputTag> ("beamSpot",edm::InputTag("hltOnlineBeamSpot"));
    desc.add<edm::InputTag> ("jetTracks",edm::InputTag("hltFastPVJetTracksAssociator"));
@@ -184,7 +182,7 @@ JetVertexChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
    desc.add<double> ("maxChi2",20.0);
    desc.add<double> ("maxTrackPt",20.0);
    desc.add<bool> ("newMethod",false);		// <---- newMethod 
-   descriptions.addDefault(desc);
+   descriptions.add("jetVertexChecker",desc);
 }
 //define this as a plug-in
 DEFINE_FWK_MODULE(JetVertexChecker);