diff --git a/RecoHI/HiMuonAlgos/plugins/HIMuonTrackingRegionProducer.h b/RecoHI/HiMuonAlgos/plugins/HIMuonTrackingRegionProducer.h index 4ae1929abffa6..828cdff36455d 100644 --- a/RecoHI/HiMuonAlgos/plugins/HIMuonTrackingRegionProducer.h +++ b/RecoHI/HiMuonAlgos/plugins/HIMuonTrackingRegionProducer.h @@ -45,7 +45,7 @@ class HIMuonTrackingRegionProducer : public TrackingRegionProducer { desc.add("MuonSrc", edm::InputTag("")); edm::ParameterSetDescription descRegion; - MuonTrackingRegionBuilder::fillDescriptions2(descRegion); + MuonTrackingRegionBuilder::fillDescriptionsOffline(descRegion); desc.add("MuonTrackingRegionBuilder", descRegion); edm::ParameterSetDescription descService; diff --git a/RecoMuon/GlobalTrackingTools/interface/MuonTrackingRegionBuilder.h b/RecoMuon/GlobalTrackingTools/interface/MuonTrackingRegionBuilder.h index 78d75fb334d74..4bab866f87eb0 100644 --- a/RecoMuon/GlobalTrackingTools/interface/MuonTrackingRegionBuilder.h +++ b/RecoMuon/GlobalTrackingTools/interface/MuonTrackingRegionBuilder.h @@ -62,17 +62,10 @@ class MuonTrackingRegionBuilder : public TrackingRegionProducer { /// Add Fill Descriptions static void fillDescriptions(edm::ParameterSetDescription& descriptions); - // 2016-08-10 MK: I'm pretty sure the fillDescriptions() above is - // not used in practice by any EDModule (it's called by - // L3MuonTrajectoryBuilder::fillDescriptions(), which itself is - // not called by anybody). I'm mainly confused that the - // fillDescriptions() above adds two PSets - // ("MuonTrackingRegionBuilder" and - // "hltMuonTrackingRegionBuilder") to the argument PSet, while to - // me it would make most sense to just fill the PSet (although I - // could be missing something). This is the behaviour of this - // fillDescriptions2() below. - static void fillDescriptions2(edm::ParameterSetDescription& descriptions); + // Separating the offline part of the fillDescriptions() above + // TODO: make similar fillDescriptionsHLT, and switch the + // fillDescriptions() above take edm::ConfigurationDescriptions& + static void fillDescriptionsOffline(edm::ParameterSetDescription& descriptions); private: diff --git a/RecoMuon/GlobalTrackingTools/src/MuonTrackingRegionBuilder.cc b/RecoMuon/GlobalTrackingTools/src/MuonTrackingRegionBuilder.cc index 05ef873bf0eaf..d902b3217f664 100644 --- a/RecoMuon/GlobalTrackingTools/src/MuonTrackingRegionBuilder.cc +++ b/RecoMuon/GlobalTrackingTools/src/MuonTrackingRegionBuilder.cc @@ -255,7 +255,7 @@ std::unique_ptr MuonTrackingRegionBuilder::regi void MuonTrackingRegionBuilder::fillDescriptions(edm::ParameterSetDescription& descriptions) { { edm::ParameterSetDescription desc; - fillDescriptions2(desc); + fillDescriptionsOffline(desc); descriptions.add("MuonTrackingRegionBuilder",desc); } { @@ -291,7 +291,7 @@ void MuonTrackingRegionBuilder::fillDescriptions(edm::ParameterSetDescription& d descriptions.setComment("Build a TrackingRegion around a standalone muon. Options to define region around beamspot or primary vertex and dynamic regions are included."); } -void MuonTrackingRegionBuilder::fillDescriptions2(edm::ParameterSetDescription& desc) { +void MuonTrackingRegionBuilder::fillDescriptionsOffline(edm::ParameterSetDescription& desc) { desc.add("EtaR_UpperLimit_Par1",0.25); desc.add("DeltaR",0.2); desc.add("beamSpot",edm::InputTag(""));