From 0d71279ae897622b9f3b807a46087992512b5523 Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 11 Mar 2024 22:47:18 +0100 Subject: [PATCH] descriptions.addDefault -> descriptions.addWithDefaultLabel --- .../HcalPlugins/src/HBHEDarkeningEP.cc | 2 +- .../HcalPlugins/src/HcalHardcodeCalibrations.cc | 2 +- CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc | 2 +- .../SiStripBackPlaneCorrectionDepESProducer.cc | 2 +- .../real/SiStripLorentzAngleDepESProducer.cc | 2 +- .../test/StandaloneTrackerTopologyTest.cc | 2 +- .../RecoUtils/plugins/PFCand_NoPU_WithAM.cc | 2 +- .../RecoUtils/plugins/PF_PU_FirstVertexTracks.cc | 2 +- .../CondHDF5ESSource/plugins/CondHDF5ESSource.cc | 2 +- .../test/stubs/TestConcurrentIOVsCondCore.cc | 2 +- .../MFObjects/test/MagFieldConfigTestESProducer.cc | 2 +- .../RecoMuonObjects/test/ProduceAgingObject.cc | 2 +- .../plugins/BeamSpotOnlineRecordsReader.cc | 2 +- .../Ecal/plugins/EcalMustacheSCParametersMaker.cc | 2 +- .../plugins/EcalSCDynamicDPhiParametersMaker.cc | 2 +- CondTools/RunInfo/plugins/RunInfoTestESProducer.cc | 2 +- .../src/SiStripFEDDataCheck.cc | 2 +- DQMServices/FileIO/plugins/DQMFileSaverOnline.cc | 2 +- DQMServices/FileIO/plugins/DQMFileSaverPB.cc | 2 +- DQMServices/FwkIO/plugins/DQMRootOutputModule.cc | 2 +- DQMServices/FwkIO/plugins/DQMRootSource.cc | 2 +- DataFormats/Common/test/TestReadTriggerResults.cc | 2 +- DataFormats/Common/test/TestWriteTriggerResults.cc | 2 +- DataFormats/DetId/test/TestReadVectorDetId.cc | 2 +- DataFormats/DetId/test/TestWriteVectorDetId.cc | 2 +- .../test/TestReadFEDRawDataCollection.cc | 2 +- .../test/TestWriteFEDRawDataCollection.cc | 2 +- DataFormats/HLTReco/test/TestReadTriggerEvent.cc | 2 +- DataFormats/HLTReco/test/TestWriteTriggerEvent.cc | 2 +- DataFormats/L1Scouting/test/TestReadL1Scouting.cc | 2 +- DataFormats/L1Scouting/test/TestWriteL1Scouting.cc | 2 +- .../test/TestReadSDSRawDataCollection.cc | 2 +- .../test/TestWriteSDSRawDataCollection.cc | 2 +- .../test/TestReadGlobalObjectMapRecord.cc | 2 +- .../test/TestWriteGlobalObjectMapRecord.cc | 2 +- DataFormats/Scouting/test/TestReadRun2Scouting.cc | 2 +- DataFormats/Scouting/test/TestReadRun3Scouting.cc | 2 +- DataFormats/Scouting/test/TestWriteRun2Scouting.cc | 2 +- DataFormats/Scouting/test/TestWriteRun3Scouting.cc | 2 +- .../TestReadSiStripApproximateClusterCollection.cc | 2 +- ...TestWriteSiStripApproximateClusterCollection.cc | 2 +- .../DDCMS/plugins/DDCompactViewESProducer.cc | 2 +- .../DDCMS/plugins/DDCompactViewMFESProducer.cc | 2 +- .../DDCMS/plugins/DDSpecParRegistryESProducer.cc | 2 +- .../DDCMS/plugins/DDVectorRegistryESProducer.cc | 2 +- .../HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc | 3 +-- FWCore/Framework/test/stubs/IntTestLooper.cc | 2 +- FWCore/Framework/test/stubs/TestModuleDelete.cc | 8 ++++---- FWCore/Framework/test/stubs/TestOneAnalyzers.cc | 2 +- FWCore/Framework/test/stubs/ToyAnalyzers.cc | 14 +++++++------- FWCore/Framework/test/stubs/ToyIntProducers.cc | 14 +++++++------- FWCore/Framework/test/stubs/ToyModules.cc | 2 +- FWCore/Framework/test/stubs/ToyRefProducers.cc | 2 +- FWCore/Framework/test/stubs/ToySTLProducers.cc | 4 ++-- FWCore/Integration/plugins/AcquireIntESProducer.cc | 2 +- .../Integration/plugins/ConcurrentIOVAnalyzer.cc | 2 +- .../Integration/plugins/ConcurrentIOVESSource.cc | 2 +- FWCore/Integration/plugins/ESTestAnalyzers.cc | 6 +++--- FWCore/Integration/plugins/ESTestProducers.cc | 2 +- .../plugins/ExceptionThrowingProducer.cc | 2 +- .../plugins/ExistingDictionaryTestModules.cc | 4 ++-- .../Integration/plugins/ProducerUsingCollector.cc | 2 +- FWCore/Integration/plugins/RunLumiESAnalyzer.cc | 2 +- FWCore/Integration/plugins/RunLumiESSource.cc | 2 +- .../Integration/plugins/TestESConcurrentSource.cc | 2 +- FWCore/Integration/plugins/TestESSource.cc | 2 +- .../Integration/plugins/TestGetByLabelAnalyzer.cc | 2 +- FWCore/Integration/plugins/TestGlobalOutput.cc | 2 +- FWCore/Integration/plugins/TestLimitedOutput.cc | 2 +- FWCore/Integration/plugins/TestOneOutput.cc | 2 +- .../plugins/TestOutputWithGetterOfProducts.cc | 2 +- .../TestOutputWithGetterOfProductsGlobal.cc | 2 +- .../TestOutputWithGetterOfProductsLimited.cc | 2 +- .../plugins/ThinnedRefFromTestAnalyzer.cc | 2 +- .../Integration/plugins/ThinningDSVTestAnalyzer.cc | 2 +- FWCore/Integration/plugins/ThinningTestAnalyzer.cc | 2 +- FWCore/Integration/plugins/ValueExample.cc | 2 +- FWCore/Modules/src/EmptyESSource.cc | 2 +- FWCore/Modules/src/EventContentAnalyzer.cc | 2 +- .../src/EventSetupCacheIdentifierChecker.cc | 2 +- FWCore/Modules/src/SwitchProducer.cc | 2 +- FWCore/Modules/src/TimeStudyModules.cc | 8 ++++---- .../test/stubs/DependsOnDummyService.cc | 2 +- FWCore/ServiceRegistry/test/stubs/DummyService.cc | 2 +- .../ServiceRegistry/test/stubs/DummyServiceE0.cc | 2 +- FWCore/Services/src/JobReportService.cc | 2 +- .../GenFilters/plugins/AJJGenJetFilter.cc | 2 +- .../GenFilters/plugins/LHEGenericMassFilter.cc | 2 +- .../GenFilters/plugins/MCDisplacementFilter.cc | 2 +- .../LHEInterface/plugins/ExternalLHEProducer.cc | 2 +- .../test/PixelTopologyMapTest.cc | 2 +- .../src/XMLIdealGeometryESProducer.cc | 2 +- .../plugins/RemovePileUpDominatedEventsGen.cc | 2 +- IOPool/Input/test/SchemaEvolutionTestRead.cc | 2 +- IOPool/Input/test/SchemaEvolutionTestWrite.cc | 2 +- IgTools/IgProf/plugins/IgProfService.cc | 2 +- .../Modules/plugins/ChainedJetCorrectorProducer.cc | 2 +- .../Type1MET/interface/JetCleanerForType1METT.h | 2 +- L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc | 2 +- .../plugins/L1TCaloRCTToUpgradeConverter.cc | 2 +- .../plugins/L1TStage1Layer2Producer.cc | 2 +- L1Trigger/Phase2L1GT/plugins/L1GTBoardWriter.cc | 2 +- L1Trigger/Phase2L1GT/plugins/L1GTNTupleProducer.cc | 2 +- .../plugins/L1CTJetFileWriter.cc | 2 +- .../VolumeBasedMagneticFieldESProducerFromDB.cc | 2 +- .../DD4hep_VolumeBasedMagneticFieldESProducer.cc | 2 +- ...hep_VolumeBasedMagneticFieldESProducerFromDB.cc | 2 +- .../HepMCCandAlgos/plugins/FlavorHistoryFilter.cc | 2 +- .../plugins/GenParticleDecaySelector.cc | 2 +- PhysicsTools/HepMCCandAlgos/plugins/HFFilter.cc | 2 +- .../plugins/MCTruthCompositeMatcherNew.cc | 2 +- PhysicsTools/HepMCCandAlgos/plugins/ModelFilter.cc | 2 +- .../NanoAOD/plugins/EGMSeedGainProducer.cc | 2 +- .../NanoAOD/plugins/GenJetTauTaggerProducer.cc | 2 +- .../NanoAOD/plugins/NanoAODOutputModule.cc | 2 +- .../plugins/rntuple/NanoAODRNTupleOutputModule.cc | 2 +- .../PatUtils/interface/SmearedJetProducerT.h | 2 +- .../plugins/BTagProbabilityToDiscriminator.cc | 2 +- .../Combined/src/CandidateChargeBTagComputer.cc | 2 +- RecoBTag/ImpactParameter/plugins/IPProducer.h | 4 ++-- .../plugins/BoostedDoubleSVProducer.cc | 2 +- .../plugins/TemplatedSecondaryVertexProducer.cc | 2 +- RecoBTag/SoftLepton/plugins/SoftLepton.cc | 2 +- .../plugins/SoftPFElectronTagInfoProducer.cc | 2 +- .../plugins/SoftPFMuonTagInfoProducer.cc | 2 +- RecoBTau/JetTagComputer/plugins/JetTagProducer.cc | 2 +- .../test/TestGsfElectronConversionFinder.cc | 2 +- .../EgammaTools/interface/MVAValueMapProducer.h | 2 +- .../plugins/ElectronHEEPIDValueMapProducer.cc | 2 +- .../plugins/ElectronMVANtuplizer.cc | 2 +- .../plugins/PhotonMVANtuplizer.cc | 2 +- .../plugins/CentralityProducer.cc | 2 +- .../JetProducers/plugins/VirtualJetProducer.cc | 2 +- .../CaloTowersCreator/src/CaloTowersCreator.cc | 2 +- .../CaloTowersCreator/src/CaloTowersReCreator.cc | 2 +- .../Castor/src/CastorInvalidDataFilter.cc | 2 +- .../plugins/EcalUncalibRecHitProducer.cc | 2 +- RecoLocalCalo/HcalRecAlgos/test/MahiDebugger.cc | 2 +- .../src/HBHEPhase1Reconstructor.cc | 2 +- .../HcalRecProducers/src/HBHEPlan1Combiner.cc | 2 +- .../HcalRecProducers/src/HFPhase1Reconstructor.cc | 2 +- .../HcalRecProducers/src/HFPreReconstructor.cc | 2 +- .../plugins/LumiProducerFromBrilcalc.cc | 2 +- .../test/TestLumiProducerFromBrilcalc.cc | 2 +- .../plugins/MuonDetLayerGeometryESProducer.cc | 2 +- .../MuonIdentification/plugins/MuonIdProducer.cc | 2 +- ...MuonTransientTrackingRecHitBuilderESProducer.cc | 2 +- .../PFRecHitProducer/test/PFRecHitProducerTest.cc | 2 +- .../plugins/TrackerMTDRecoGeometryESProducer.cc | 2 +- .../plugins/TrackerRecoGeometryESProducer.cc | 2 +- .../TkNavigation/plugins/CosmicNavigationSchool.cc | 2 +- .../plugins/NavigationSchoolESProducer.cc | 2 +- .../plugins/EcalTrigPrimProducer.cc | 2 +- .../TopTools/test/TestGenTtbarCategories.cc | 2 +- .../plugins/CloseComponentsMergerESProducer.cc | 2 +- .../plugins/DistanceBetweenComponentsESProducer.cc | 2 +- .../plugins/GsfMaterialEffectsESProducer.cc | 2 +- .../plugins/GsfTrajectoryFitterESProducer.cc | 2 +- .../plugins/GsfTrajectorySmootherESProducer.cc | 2 +- .../plugins/KFSwitching1DUpdatorESProducer.cc | 2 +- .../KalmanUpdators/plugins/KFUpdatorESProducer.cc | 2 +- .../MRHChi2MeasurementEstimatorESProducer.cc | 2 +- .../plugins/TrackingRecHitPropagatorESProducer.cc | 2 +- .../plugins/PropagatorWithMaterialESProducer.cc | 2 +- .../plugins/TransientTrackBuilderESProducer.cc | 2 +- Validation/HLTrigger/plugins/HLTGenValSource.cc | 2 +- Validation/HcalHits/src/SimHitsValidationHcal.cc | 2 +- 167 files changed, 190 insertions(+), 191 deletions(-) diff --git a/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc b/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc index 7928a64b21450..4ffa2439deea8 100644 --- a/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc +++ b/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc @@ -58,7 +58,7 @@ void HBHEDarkeningEP::fillDescriptions(edm::ConfigurationDescriptions& descripti std::vector default_year(1); desc.addVPSet("years", desc_years, default_year); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // ------------ method called to produce the data ------------ diff --git a/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc b/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc index 99ef352423218..c4c6200687d3f 100644 --- a/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc +++ b/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc @@ -1062,5 +1062,5 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions& std::vector default_sipm(1); desc.addVPSet("SiPMCharacteristics", validator_sipm, default_sipm); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc b/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc index 98140fc863328..ecf450be5ef54 100644 --- a/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc +++ b/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc @@ -67,7 +67,7 @@ void HcalTimeSlewEP::fillDescriptions(edm::ConfigurationDescriptions& descriptio std::vector default_M3(1); desc.addVPSet("timeSlewParametersM3", desc_M3, default_M3); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // ------------ method called to produce the data ------------ diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc index f114271fcbe36..33ac73c213745 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc @@ -119,7 +119,7 @@ void SiStripBackPlaneCorrectionDepESProducer::fillDescriptions(edm::Configuratio desc.add("BackPlaneCorrectionDeconvMode", deconv); } - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(SiStripBackPlaneCorrectionDepESProducer); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc index 434f4a45f29c1..3d634dff4e287 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc @@ -116,7 +116,7 @@ void SiStripLorentzAngleDepESProducer::fillDescriptions(edm::ConfigurationDescri desc.add("LorentzAngleDeconvMode", deconv); } - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(SiStripLorentzAngleDepESProducer); diff --git a/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc b/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc index 19ca9be23c096..01e0ad999b4d8 100644 --- a/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc +++ b/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc @@ -222,7 +222,7 @@ void StandaloneTrackerTopologyTest::analyze(edm::StreamID, // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void StandaloneTrackerTopologyTest::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/CommonTools/RecoUtils/plugins/PFCand_NoPU_WithAM.cc b/CommonTools/RecoUtils/plugins/PFCand_NoPU_WithAM.cc index cdab8970738d8..b1b57ec2ed3a1 100644 --- a/CommonTools/RecoUtils/plugins/PFCand_NoPU_WithAM.cc +++ b/CommonTools/RecoUtils/plugins/PFCand_NoPU_WithAM.cc @@ -174,7 +174,7 @@ void PFCand_NoPU_WithAM::fillDescriptions(edm::ConfigurationDescriptions& descri desc.add("VertexCollection"); desc.add("MinQuality"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/CommonTools/RecoUtils/plugins/PF_PU_FirstVertexTracks.cc b/CommonTools/RecoUtils/plugins/PF_PU_FirstVertexTracks.cc index 0eb709997251c..9c778304a8c1e 100644 --- a/CommonTools/RecoUtils/plugins/PF_PU_FirstVertexTracks.cc +++ b/CommonTools/RecoUtils/plugins/PF_PU_FirstVertexTracks.cc @@ -195,7 +195,7 @@ void PF_PU_FirstVertexTracks::fillDescriptions(edm::ConfigurationDescriptions& d desc.add("VertexCollection"); desc.add("MinQuality"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/CondCore/CondHDF5ESSource/plugins/CondHDF5ESSource.cc b/CondCore/CondHDF5ESSource/plugins/CondHDF5ESSource.cc index a8e2d8a8d4ec8..595a0f4a8f38b 100644 --- a/CondCore/CondHDF5ESSource/plugins/CondHDF5ESSource.cc +++ b/CondCore/CondHDF5ESSource/plugins/CondHDF5ESSource.cc @@ -184,7 +184,7 @@ void CondHDF5ESSource::fillDescriptions(edm::ConfigurationDescriptions& descript desc.add>("excludeRecords", std::vector()) ->setComment("List of Records that should not be read from the file"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void CondHDF5ESSource::setIntervalFor(EventSetupRecordKey const& iRecordKey, diff --git a/CondCore/ESSources/test/stubs/TestConcurrentIOVsCondCore.cc b/CondCore/ESSources/test/stubs/TestConcurrentIOVsCondCore.cc index de9fccb033417..0a58c68bc2fc3 100644 --- a/CondCore/ESSources/test/stubs/TestConcurrentIOVsCondCore.cc +++ b/CondCore/ESSources/test/stubs/TestConcurrentIOVsCondCore.cc @@ -195,7 +195,7 @@ namespace edmtest { void TestConcurrentIOVsCondCore::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(TestConcurrentIOVsCondCore); diff --git a/CondFormats/MFObjects/test/MagFieldConfigTestESProducer.cc b/CondFormats/MFObjects/test/MagFieldConfigTestESProducer.cc index 2948985b45c3b..58889e0d31876 100644 --- a/CondFormats/MFObjects/test/MagFieldConfigTestESProducer.cc +++ b/CondFormats/MFObjects/test/MagFieldConfigTestESProducer.cc @@ -105,7 +105,7 @@ void MagFieldConfigTestESProducer::fillDescriptions(edm::ConfigurationDescriptio desc.addVPSet("configs", entryDesc, {}); } - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/CondFormats/RecoMuonObjects/test/ProduceAgingObject.cc b/CondFormats/RecoMuonObjects/test/ProduceAgingObject.cc index 4fde187a8c47b..95c658cc4035a 100644 --- a/CondFormats/RecoMuonObjects/test/ProduceAgingObject.cc +++ b/CondFormats/RecoMuonObjects/test/ProduceAgingObject.cc @@ -236,7 +236,7 @@ void ProduceAgingObject::fillDescriptions(edm::ConfigurationDescriptions& descri desc.add>("maskedGEMIDs", {}); desc.add>("maskedME0IDs", {}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/CondTools/BeamSpot/plugins/BeamSpotOnlineRecordsReader.cc b/CondTools/BeamSpot/plugins/BeamSpotOnlineRecordsReader.cc index 9acbe0dfaa8f6..648bdb0aa3aa2 100644 --- a/CondTools/BeamSpot/plugins/BeamSpotOnlineRecordsReader.cc +++ b/CondTools/BeamSpot/plugins/BeamSpotOnlineRecordsReader.cc @@ -207,7 +207,7 @@ void BeamSpotOnlineRecordsReader::fillDescriptions(edm::ConfigurationDescription edm::ParameterSetDescription desc; desc.add("isHLT", true); desc.addUntracked("rawFileName", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/CondTools/Ecal/plugins/EcalMustacheSCParametersMaker.cc b/CondTools/Ecal/plugins/EcalMustacheSCParametersMaker.cc index 8cf835c346311..1fde780170ea6 100644 --- a/CondTools/Ecal/plugins/EcalMustacheSCParametersMaker.cc +++ b/CondTools/Ecal/plugins/EcalMustacheSCParametersMaker.cc @@ -62,7 +62,7 @@ void EcalMustacheSCParametersMaker::analyze(const edm::Event& iEvent, const edm: void EcalMustacheSCParametersMaker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(EcalMustacheSCParametersMaker); diff --git a/CondTools/Ecal/plugins/EcalSCDynamicDPhiParametersMaker.cc b/CondTools/Ecal/plugins/EcalSCDynamicDPhiParametersMaker.cc index 3bcf26411eadb..f32ec4b3f088a 100644 --- a/CondTools/Ecal/plugins/EcalSCDynamicDPhiParametersMaker.cc +++ b/CondTools/Ecal/plugins/EcalSCDynamicDPhiParametersMaker.cc @@ -62,7 +62,7 @@ void EcalSCDynamicDPhiParametersMaker::analyze(const edm::Event& iEvent, const e void EcalSCDynamicDPhiParametersMaker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(EcalSCDynamicDPhiParametersMaker); diff --git a/CondTools/RunInfo/plugins/RunInfoTestESProducer.cc b/CondTools/RunInfo/plugins/RunInfoTestESProducer.cc index c17d84f4ca981..310a1d6b3cd54 100644 --- a/CondTools/RunInfo/plugins/RunInfoTestESProducer.cc +++ b/CondTools/RunInfo/plugins/RunInfoTestESProducer.cc @@ -137,7 +137,7 @@ void RunInfoTestESProducer::fillDescriptions(edm::ConfigurationDescriptions& des edm::ParameterSetDescription desc; desc.addVPSet("runInfos", runInfoDesc, {}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc index 8eb4fb8f337fc..4c33eabfda302 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc @@ -459,7 +459,7 @@ void SiStripFEDCheckPlugin::fillDescriptions(edm::ConfigurationDescriptions& des desc.add("LSMin", 0.5); desc.add("LSMax", 5000.5); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // diff --git a/DQMServices/FileIO/plugins/DQMFileSaverOnline.cc b/DQMServices/FileIO/plugins/DQMFileSaverOnline.cc index d6c65a4634959..fa210e43cbfc6 100644 --- a/DQMServices/FileIO/plugins/DQMFileSaverOnline.cc +++ b/DQMServices/FileIO/plugins/DQMFileSaverOnline.cc @@ -189,7 +189,7 @@ void DQMFileSaverOnline::fillDescriptions(edm::ConfigurationDescriptions& descri // DQMFileSaverOnline and DQMFileSaverPB both used the module label // "saver" which caused conflicting cfi filenames to be generated. // add could be used if unique module labels were given. - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/DQMServices/FileIO/plugins/DQMFileSaverPB.cc b/DQMServices/FileIO/plugins/DQMFileSaverPB.cc index 779092f68a1ef..a3652b5fb6fc6 100644 --- a/DQMServices/FileIO/plugins/DQMFileSaverPB.cc +++ b/DQMServices/FileIO/plugins/DQMFileSaverPB.cc @@ -225,7 +225,7 @@ void DQMFileSaverPB::fillDescriptions(edm::ConfigurationDescriptions& descriptio // DQMFileSaverOnline and DQMFileSaverPB both used the module label // "saver" which caused conflicting cfi filenames to be generated. // add could be used if unique module labels were given. - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void DQMFileSaverPB::savePB(DQMStore* store, std::string const& filename, int run, int lumi) const { diff --git a/DQMServices/FwkIO/plugins/DQMRootOutputModule.cc b/DQMServices/FwkIO/plugins/DQMRootOutputModule.cc index 3e58b980e07c4..cfa217fcfb334 100644 --- a/DQMServices/FwkIO/plugins/DQMRootOutputModule.cc +++ b/DQMServices/FwkIO/plugins/DQMRootOutputModule.cc @@ -595,7 +595,7 @@ void DQMRootOutputModule::fillDescriptions(edm::ConfigurationDescriptions& descr desc.addUntracked("dataset", dataSet) ->setComment("PSet is only used by Data Operations and not by this module."); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(DQMRootOutputModule); diff --git a/DQMServices/FwkIO/plugins/DQMRootSource.cc b/DQMServices/FwkIO/plugins/DQMRootSource.cc index fc99dd7745882..9ce8e4e27448f 100644 --- a/DQMServices/FwkIO/plugins/DQMRootSource.cc +++ b/DQMServices/FwkIO/plugins/DQMRootSource.cc @@ -420,7 +420,7 @@ void DQMRootSource::fillDescriptions(edm::ConfigurationDescriptions& description desc.addUntracked>("lumisToProcess", defaultLumis) ->setComment("Skip any lumi inside the specified run:lumi range."); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // diff --git a/DataFormats/Common/test/TestReadTriggerResults.cc b/DataFormats/Common/test/TestReadTriggerResults.cc index 9bd2c4b351e73..aa49c3c7f8a07 100644 --- a/DataFormats/Common/test/TestReadTriggerResults.cc +++ b/DataFormats/Common/test/TestReadTriggerResults.cc @@ -92,7 +92,7 @@ namespace edmtest { desc.add>("expectedHLTStates"); desc.add>("expectedModuleIndexes"); desc.add("triggerResultsTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/Common/test/TestWriteTriggerResults.cc b/DataFormats/Common/test/TestWriteTriggerResults.cc index 1a7abb4f34f40..cc22467c9e3af 100644 --- a/DataFormats/Common/test/TestWriteTriggerResults.cc +++ b/DataFormats/Common/test/TestWriteTriggerResults.cc @@ -79,7 +79,7 @@ namespace edmtest { desc.add>("names"); desc.add>("hltStates"); desc.add>("moduleIndexes"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/DetId/test/TestReadVectorDetId.cc b/DataFormats/DetId/test/TestReadVectorDetId.cc index a46275c6561d9..753bb5aa7bd33 100644 --- a/DataFormats/DetId/test/TestReadVectorDetId.cc +++ b/DataFormats/DetId/test/TestReadVectorDetId.cc @@ -78,7 +78,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.add("expectedTestValue"); desc.add("collectionTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/DetId/test/TestWriteVectorDetId.cc b/DataFormats/DetId/test/TestWriteVectorDetId.cc index 74f3b68721988..2f4eb496471b9 100644 --- a/DataFormats/DetId/test/TestWriteVectorDetId.cc +++ b/DataFormats/DetId/test/TestWriteVectorDetId.cc @@ -68,7 +68,7 @@ namespace edmtest { void TestWriteVectorDetId::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("testValue"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/FEDRawData/test/TestReadFEDRawDataCollection.cc b/DataFormats/FEDRawData/test/TestReadFEDRawDataCollection.cc index 788a5153dd51a..456f989f8bf0c 100644 --- a/DataFormats/FEDRawData/test/TestReadFEDRawDataCollection.cc +++ b/DataFormats/FEDRawData/test/TestReadFEDRawDataCollection.cc @@ -87,7 +87,7 @@ namespace edmtest { desc.add>("expectedFEDData0"); desc.add>("expectedFEDData3"); desc.add("fedRawDataCollectionTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/FEDRawData/test/TestWriteFEDRawDataCollection.cc b/DataFormats/FEDRawData/test/TestWriteFEDRawDataCollection.cc index ff846686598f9..c8ecb4e1eb389 100644 --- a/DataFormats/FEDRawData/test/TestWriteFEDRawDataCollection.cc +++ b/DataFormats/FEDRawData/test/TestWriteFEDRawDataCollection.cc @@ -72,7 +72,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.add>("FEDData0"); desc.add>("FEDData3"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/HLTReco/test/TestReadTriggerEvent.cc b/DataFormats/HLTReco/test/TestReadTriggerEvent.cc index fea498324e2a2..2d0b16bb7e0e2 100644 --- a/DataFormats/HLTReco/test/TestReadTriggerEvent.cc +++ b/DataFormats/HLTReco/test/TestReadTriggerEvent.cc @@ -183,7 +183,7 @@ namespace edmtest { desc.add>("expectedFilterIds"); desc.add>("expectedFilterKeys"); desc.add("triggerEventTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/HLTReco/test/TestWriteTriggerEvent.cc b/DataFormats/HLTReco/test/TestWriteTriggerEvent.cc index 608c105965ba9..c7d5b86be6512 100644 --- a/DataFormats/HLTReco/test/TestWriteTriggerEvent.cc +++ b/DataFormats/HLTReco/test/TestWriteTriggerEvent.cc @@ -143,7 +143,7 @@ namespace edmtest { desc.add("elementsPerVector"); desc.add>("filterIds"); desc.add>("filterKeys"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/L1Scouting/test/TestReadL1Scouting.cc b/DataFormats/L1Scouting/test/TestReadL1Scouting.cc index 151b632c7451e..ccfb233ceb499 100644 --- a/DataFormats/L1Scouting/test/TestReadL1Scouting.cc +++ b/DataFormats/L1Scouting/test/TestReadL1Scouting.cc @@ -316,7 +316,7 @@ namespace edmtest { desc.add("tausTag"); desc.add>("expectedBxSumsValues"); desc.add("bxSumsTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestReadL1Scouting::throwWithMessageFromConstructor(const char* msg) const { diff --git a/DataFormats/L1Scouting/test/TestWriteL1Scouting.cc b/DataFormats/L1Scouting/test/TestWriteL1Scouting.cc index ae15e158b214a..9ce117adf9c16 100644 --- a/DataFormats/L1Scouting/test/TestWriteL1Scouting.cc +++ b/DataFormats/L1Scouting/test/TestWriteL1Scouting.cc @@ -179,7 +179,7 @@ namespace edmtest { desc.add>("eGammaValues"); desc.add>("tauValues"); desc.add>("bxSumsValues"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestWriteL1Scouting::throwWithMessage(const char* msg) const { diff --git a/DataFormats/L1ScoutingRawData/test/TestReadSDSRawDataCollection.cc b/DataFormats/L1ScoutingRawData/test/TestReadSDSRawDataCollection.cc index 228938aaabdb2..9edc6f9c6f6f0 100644 --- a/DataFormats/L1ScoutingRawData/test/TestReadSDSRawDataCollection.cc +++ b/DataFormats/L1ScoutingRawData/test/TestReadSDSRawDataCollection.cc @@ -65,7 +65,7 @@ namespace edmtest { desc.add>("expectedSDSData1"); desc.add>("expectedSDSData2"); desc.add("sdsRawDataCollectionTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/L1ScoutingRawData/test/TestWriteSDSRawDataCollection.cc b/DataFormats/L1ScoutingRawData/test/TestWriteSDSRawDataCollection.cc index 926d8761d7c0d..c6235c3c426b8 100644 --- a/DataFormats/L1ScoutingRawData/test/TestWriteSDSRawDataCollection.cc +++ b/DataFormats/L1ScoutingRawData/test/TestWriteSDSRawDataCollection.cc @@ -55,7 +55,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.add>("SDSData1"); desc.add>("SDSData2"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/L1TGlobal/test/TestReadGlobalObjectMapRecord.cc b/DataFormats/L1TGlobal/test/TestReadGlobalObjectMapRecord.cc index 940bf98db1de8..21581d88fe37a 100644 --- a/DataFormats/L1TGlobal/test/TestReadGlobalObjectMapRecord.cc +++ b/DataFormats/L1TGlobal/test/TestReadGlobalObjectMapRecord.cc @@ -182,7 +182,7 @@ namespace edmtest { desc.add("expectedElementDelta"); desc.add("expectedFinalValue"); desc.add("globalObjectMapRecordTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/L1TGlobal/test/TestWriteGlobalObjectMapRecord.cc b/DataFormats/L1TGlobal/test/TestWriteGlobalObjectMapRecord.cc index 4d7150d4554a8..6e063f20a1a4a 100644 --- a/DataFormats/L1TGlobal/test/TestWriteGlobalObjectMapRecord.cc +++ b/DataFormats/L1TGlobal/test/TestWriteGlobalObjectMapRecord.cc @@ -173,7 +173,7 @@ namespace edmtest { desc.add("firstElement"); desc.add("elementDelta"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/Scouting/test/TestReadRun2Scouting.cc b/DataFormats/Scouting/test/TestReadRun2Scouting.cc index dfdea2751ea13..92429520ff4a7 100644 --- a/DataFormats/Scouting/test/TestReadRun2Scouting.cc +++ b/DataFormats/Scouting/test/TestReadRun2Scouting.cc @@ -209,7 +209,7 @@ namespace edmtest { desc.add>("expectedVertexFloatingPointValues"); desc.add>("expectedVertexIntegralValues"); desc.add("vertexesTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestReadRun2Scouting::analyzeCaloJets(edm::Event const& iEvent) const { diff --git a/DataFormats/Scouting/test/TestReadRun3Scouting.cc b/DataFormats/Scouting/test/TestReadRun3Scouting.cc index 10433f63b351a..af26bb7238461 100644 --- a/DataFormats/Scouting/test/TestReadRun3Scouting.cc +++ b/DataFormats/Scouting/test/TestReadRun3Scouting.cc @@ -217,7 +217,7 @@ namespace edmtest { desc.add>("expectedVertexFloatingPointValues"); desc.add>("expectedVertexIntegralValues"); desc.add("vertexesTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestReadRun3Scouting::analyzeCaloJets(edm::Event const& iEvent) const { diff --git a/DataFormats/Scouting/test/TestWriteRun2Scouting.cc b/DataFormats/Scouting/test/TestWriteRun2Scouting.cc index 7cab803948593..6d494fc5567e8 100644 --- a/DataFormats/Scouting/test/TestWriteRun2Scouting.cc +++ b/DataFormats/Scouting/test/TestWriteRun2Scouting.cc @@ -189,7 +189,7 @@ namespace edmtest { desc.add>("tracksIntegralValues"); desc.add>("vertexesFloatingPointValues"); desc.add>("vertexesIntegralValues"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestWriteRun2Scouting::produceCaloJets(edm::Event& iEvent) const { diff --git a/DataFormats/Scouting/test/TestWriteRun3Scouting.cc b/DataFormats/Scouting/test/TestWriteRun3Scouting.cc index 9c04b4ca074d9..dd5f5bcb4be10 100644 --- a/DataFormats/Scouting/test/TestWriteRun3Scouting.cc +++ b/DataFormats/Scouting/test/TestWriteRun3Scouting.cc @@ -196,7 +196,7 @@ namespace edmtest { desc.add>("tracksIntegralValues"); desc.add>("vertexesFloatingPointValues"); desc.add>("vertexesIntegralValues"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestWriteRun3Scouting::produceCaloJets(edm::Event& iEvent) const { diff --git a/DataFormats/SiStripCluster/test/TestReadSiStripApproximateClusterCollection.cc b/DataFormats/SiStripCluster/test/TestReadSiStripApproximateClusterCollection.cc index b85bf4c96b2ec..2e94b2ffa1a64 100644 --- a/DataFormats/SiStripCluster/test/TestReadSiStripApproximateClusterCollection.cc +++ b/DataFormats/SiStripCluster/test/TestReadSiStripApproximateClusterCollection.cc @@ -114,7 +114,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.add>("expectedIntegralValues"); desc.add("collectionTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DataFormats/SiStripCluster/test/TestWriteSiStripApproximateClusterCollection.cc b/DataFormats/SiStripCluster/test/TestWriteSiStripApproximateClusterCollection.cc index d2ecceee040e4..c6f99df0730c9 100644 --- a/DataFormats/SiStripCluster/test/TestWriteSiStripApproximateClusterCollection.cc +++ b/DataFormats/SiStripCluster/test/TestWriteSiStripApproximateClusterCollection.cc @@ -96,7 +96,7 @@ namespace edmtest { void TestWriteSiStripApproximateClusterCollection::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add>("integralValues"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/DetectorDescription/DDCMS/plugins/DDCompactViewESProducer.cc b/DetectorDescription/DDCMS/plugins/DDCompactViewESProducer.cc index a737ac9673bca..cf968d64448de 100644 --- a/DetectorDescription/DDCMS/plugins/DDCompactViewESProducer.cc +++ b/DetectorDescription/DDCMS/plugins/DDCompactViewESProducer.cc @@ -55,7 +55,7 @@ DDCompactViewESProducer::~DDCompactViewESProducer() {} void DDCompactViewESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DDCompactViewESProducer::ReturnType DDCompactViewESProducer::produce(const IdealGeometryRecord& iRecord) { diff --git a/DetectorDescription/DDCMS/plugins/DDCompactViewMFESProducer.cc b/DetectorDescription/DDCMS/plugins/DDCompactViewMFESProducer.cc index 42c1a0fb8dfbb..6ab3daeeba1be 100644 --- a/DetectorDescription/DDCMS/plugins/DDCompactViewMFESProducer.cc +++ b/DetectorDescription/DDCMS/plugins/DDCompactViewMFESProducer.cc @@ -62,7 +62,7 @@ DDCompactViewMFESProducer::~DDCompactViewMFESProducer() {} void DDCompactViewMFESProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DDCompactViewMFESProducer::ReturnType DDCompactViewMFESProducer::produce(const IdealMagneticFieldRecord &iRecord) { diff --git a/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc b/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc index d4f410b93e662..11d3d34bf80a4 100644 --- a/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc +++ b/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc @@ -57,7 +57,7 @@ DDSpecParRegistryESProducer::~DDSpecParRegistryESProducer() {} void DDSpecParRegistryESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DDSpecParRegistryESProducer::ReturnType DDSpecParRegistryESProducer::produce(const DDSpecParRegistryRcd& iRecord) { diff --git a/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc b/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc index aa6062be2659a..bf10bf366b6b0 100644 --- a/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc +++ b/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc @@ -62,7 +62,7 @@ DDVectorRegistryESProducer::~DDVectorRegistryESProducer() {} void DDVectorRegistryESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DDVectorRegistryESProducer::ReturnType DDVectorRegistryESProducer::produce(const DDVectorRegistryRcd& iRecord) { diff --git a/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc b/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc index 106e31fc103ae..0b162b824a11b 100644 --- a/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc +++ b/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc @@ -300,8 +300,7 @@ void HcalDigiToRawuHTR::fillDescriptions(edm::ConfigurationDescriptions& descrip desc.add("HFqie8", edm::InputTag("simHcalDigis")); desc.add("TP", edm::InputTag("simHcalTriggerPrimitiveDigis")); desc.add("premix", false); - descriptions.add("hcalDigiToRawuHTR", desc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/FWCore/Framework/test/stubs/IntTestLooper.cc b/FWCore/Framework/test/stubs/IntTestLooper.cc index 229b2ffe2c7b1..27c148447c631 100644 --- a/FWCore/Framework/test/stubs/IntTestLooper.cc +++ b/FWCore/Framework/test/stubs/IntTestLooper.cc @@ -58,7 +58,7 @@ namespace edmtest { desc.addUntracked>("expectEndLumiValues", std::vector{}); desc.addUntracked>("expectEndRunValues", std::vector{}); desc.addUntracked("expectESValue"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void beginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) override { diff --git a/FWCore/Framework/test/stubs/TestModuleDelete.cc b/FWCore/Framework/test/stubs/TestModuleDelete.cc index 5475582403f1d..099d605821ed1 100644 --- a/FWCore/Framework/test/stubs/TestModuleDelete.cc +++ b/FWCore/Framework/test/stubs/TestModuleDelete.cc @@ -54,7 +54,7 @@ namespace edmtest { desc.addUntracked>("srcBeginRun", std::vector{}); desc.addUntracked>("srcBeginLumi", std::vector{}); desc.addUntracked>("srcEvent", std::vector{}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override { throw edm::Exception(edm::errors::NotFound) << "Intentional 'NotFound' exception for testing purposes\n"; @@ -90,7 +90,7 @@ namespace edmtest { desc.addUntracked>("srcBeginRun", std::vector{}); desc.addUntracked>("srcBeginLumi", std::vector{}); desc.addUntracked>("srcEvent", std::vector{}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override { throw edm::Exception(edm::errors::NotFound) << "Intentional 'NotFound' exception for testing purposes\n"; @@ -129,7 +129,7 @@ namespace edmtest { desc.addUntracked>("srcBeginRun", std::vector{}); desc.addUntracked>("srcBeginLumi", std::vector{}); desc.addUntracked>("srcEvent", std::vector{}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override { throw edm::Exception(edm::errors::NotFound) << "Intentional 'NotFound' exception for testing purposes\n"; @@ -164,7 +164,7 @@ namespace edmtest { desc.addUntracked>("srcBeginRun", std::vector{}); desc.addUntracked>("srcBeginLumi", std::vector{}); desc.addUntracked>("srcEvent", std::vector{}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void beginProcessBlockProduce(edm::ProcessBlock&) override { throw edm::Exception(edm::errors::NotFound) << "Intentional 'NotFound' exception for testing purposes\n"; diff --git a/FWCore/Framework/test/stubs/TestOneAnalyzers.cc b/FWCore/Framework/test/stubs/TestOneAnalyzers.cc index 689af44cdfddc..8c1990c8184af 100644 --- a/FWCore/Framework/test/stubs/TestOneAnalyzers.cc +++ b/FWCore/Framework/test/stubs/TestOneAnalyzers.cc @@ -548,7 +548,7 @@ namespace edmtest { desc.add("consumesProcessBlockNotFound2", defaultInputTag); desc.add("consumesProcessBlockNotFound3", defaultInputTag); desc.add("consumesProcessBlockNotFound4", defaultInputTag); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: diff --git a/FWCore/Framework/test/stubs/ToyAnalyzers.cc b/FWCore/Framework/test/stubs/ToyAnalyzers.cc index a6d1a7a76df22..380a40ace9664 100644 --- a/FWCore/Framework/test/stubs/ToyAnalyzers.cc +++ b/FWCore/Framework/test/stubs/ToyAnalyzers.cc @@ -58,7 +58,7 @@ namespace edmtest { desc.addUntracked("valueMustMatch"); desc.addUntracked("moduleLabel"); desc.addUntracked("valueMustBeMissing", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const { @@ -108,7 +108,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.addUntracked>("getFromModules"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: @@ -129,7 +129,7 @@ namespace edmtest { desc.addUntracked("valueMustMatch"); desc.addUntracked("moduleLabel"); desc.addUntracked("valueMustBeMissing", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const { @@ -221,7 +221,7 @@ namespace edmtest { desc.addUntracked>("srcEndProcess", std::vector{}); desc.addUntracked("inputShouldExist", false); desc.addUntracked("inputShouldBeMissing", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: @@ -251,7 +251,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.addUntracked("getFromModule"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } }; //-------------------------------------------------------------------- @@ -267,7 +267,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.addUntracked("getFromModule"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } }; //-------------------------------------------------------------------- @@ -365,7 +365,7 @@ namespace edmtest { desc.addUntracked("checkSize", true); desc.addUntracked("sizeMustMatch"); desc.addUntracked("label"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const&) const { diff --git a/FWCore/Framework/test/stubs/ToyIntProducers.cc b/FWCore/Framework/test/stubs/ToyIntProducers.cc index 059534495729a..f8c425710a0e3 100644 --- a/FWCore/Framework/test/stubs/ToyIntProducers.cc +++ b/FWCore/Framework/test/stubs/ToyIntProducers.cc @@ -123,7 +123,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("ivalue"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: @@ -216,7 +216,7 @@ namespace edmtest { desc.add("ivalue"); desc.add("iterations"); desc.add("lumiNumberToThrow", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //-------------------------------------------------------------------- @@ -461,7 +461,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.addUntracked("onlyGetOnEvent", 0u); desc.add>("labels"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: @@ -498,7 +498,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: @@ -567,7 +567,7 @@ namespace edmtest { desc.addVPSet("transientValues", pset, std::vector{}); } - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override; @@ -628,7 +628,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("src"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override; @@ -945,7 +945,7 @@ namespace edmtest { ->setComment( "If set to false, the endJob() is still required to be called to check that the module was not deleted " "early on"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override { wasRunEvent_ = true; diff --git a/FWCore/Framework/test/stubs/ToyModules.cc b/FWCore/Framework/test/stubs/ToyModules.cc index 59b42641cde55..65148b30b1a04 100644 --- a/FWCore/Framework/test/stubs/ToyModules.cc +++ b/FWCore/Framework/test/stubs/ToyModules.cc @@ -389,7 +389,7 @@ namespace edmtest { desc.add("label"); desc.add("threshold", 0); desc.add("shouldProduce", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: diff --git a/FWCore/Framework/test/stubs/ToyRefProducers.cc b/FWCore/Framework/test/stubs/ToyRefProducers.cc index 44f6c3fce17e6..1c4c295fd3969 100644 --- a/FWCore/Framework/test/stubs/ToyRefProducers.cc +++ b/FWCore/Framework/test/stubs/ToyRefProducers.cc @@ -50,7 +50,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.add("select", 0); desc.add("target"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: diff --git a/FWCore/Framework/test/stubs/ToySTLProducers.cc b/FWCore/Framework/test/stubs/ToySTLProducers.cc index 083a9b583fb8f..9ac288a7c2382 100644 --- a/FWCore/Framework/test/stubs/ToySTLProducers.cc +++ b/FWCore/Framework/test/stubs/ToySTLProducers.cc @@ -44,7 +44,7 @@ namespace edmtest { desc.add("ivalue", 0); desc.add("count", 0); desc.add("delta", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: @@ -184,7 +184,7 @@ namespace edmtest { desc.add("ivalue", 0); desc.add("count", 0); desc.add("delta", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: diff --git a/FWCore/Integration/plugins/AcquireIntESProducer.cc b/FWCore/Integration/plugins/AcquireIntESProducer.cc index b56fac32edf54..fcbed16b16299 100644 --- a/FWCore/Integration/plugins/AcquireIntESProducer.cc +++ b/FWCore/Integration/plugins/AcquireIntESProducer.cc @@ -269,7 +269,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.addUntracked("numberOfIOVsToAccumulate", 8); desc.addUntracked("secondsToWaitForWork", 1); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/FWCore/Integration/plugins/ConcurrentIOVAnalyzer.cc b/FWCore/Integration/plugins/ConcurrentIOVAnalyzer.cc index 5cce7b175a156..962469f242f06 100644 --- a/FWCore/Integration/plugins/ConcurrentIOVAnalyzer.cc +++ b/FWCore/Integration/plugins/ConcurrentIOVAnalyzer.cc @@ -206,7 +206,7 @@ namespace edmtest { desc.addUntracked>("expectedESAcquireTestResults", std::vector()); desc.addUntracked("expectedUniquePtrTestValue", 0); desc.addUntracked("expectedOptionalTestValue", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest using namespace edmtest; diff --git a/FWCore/Integration/plugins/ConcurrentIOVESSource.cc b/FWCore/Integration/plugins/ConcurrentIOVESSource.cc index f2556e7bab400..d7c05d8f188ba 100644 --- a/FWCore/Integration/plugins/ConcurrentIOVESSource.cc +++ b/FWCore/Integration/plugins/ConcurrentIOVESSource.cc @@ -146,7 +146,7 @@ namespace edmtest { desc.add("findForRecordA", false); desc.add>("firstValidLumis", emptyVector); desc.add>("invalidLumis", emptyVector); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void ConcurrentIOVESSource::setIntervalFor(edm::eventsetup::EventSetupRecordKey const& key, diff --git a/FWCore/Integration/plugins/ESTestAnalyzers.cc b/FWCore/Integration/plugins/ESTestAnalyzers.cc index 2c5c8936b697e..abf1b3ff22520 100644 --- a/FWCore/Integration/plugins/ESTestAnalyzers.cc +++ b/FWCore/Integration/plugins/ESTestAnalyzers.cc @@ -64,7 +64,7 @@ namespace edmtest { ->setComment("ID number for each Run for which we should get EventSetup data."); desc.addUntracked>("expectedValues", std::vector()) ->setComment("EventSetup value expected for each Run. If empty, no values compared."); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } class ESTestAnalyzerB : public edm::one::EDAnalyzer<> { @@ -110,7 +110,7 @@ namespace edmtest { ->setComment("ID number for each Run for which we should get EventSetup data."); desc.addUntracked>("expectedValues", std::vector()) ->setComment("EventSetup value expected for each Run. If empty, no values compared."); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } class ESTestAnalyzerK : public edm::global::EDAnalyzer<> { @@ -197,7 +197,7 @@ namespace edmtest { ->setComment("EventSetup value for ESTestDataA:foo expected for each Run. If empty, no values compared."); desc.addUntracked>("expectedValuesZ", std::vector()) ->setComment("EventSetup value for ESTestDataZ:foo expected for each Run. If empty, no values compared."); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } class ESTestAnalyzerJ : public edm::stream::EDAnalyzer<> { diff --git a/FWCore/Integration/plugins/ESTestProducers.cc b/FWCore/Integration/plugins/ESTestProducers.cc index cdb846d673199..7c17c80a963ed 100644 --- a/FWCore/Integration/plugins/ESTestProducers.cc +++ b/FWCore/Integration/plugins/ESTestProducers.cc @@ -329,7 +329,7 @@ namespace edmtest { edm::ParameterSetDescription desc; std::vector emptyDefaultVector; desc.addUntracked>("expectedCacheIds", emptyDefaultVector); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } edm::eventsetup::ESProductResolverProvider::KeyedResolversVector ESTestESProductResolverProviderJ::registerResolvers( diff --git a/FWCore/Integration/plugins/ExceptionThrowingProducer.cc b/FWCore/Integration/plugins/ExceptionThrowingProducer.cc index c2ff119f56802..a10429ff910dd 100644 --- a/FWCore/Integration/plugins/ExceptionThrowingProducer.cc +++ b/FWCore/Integration/plugins/ExceptionThrowingProducer.cc @@ -172,7 +172,7 @@ namespace edmtest { desc.addUntracked("eventIDThrowOnStreamBeginLumi", invalidEventID); desc.addUntracked("eventIDThrowOnStreamEndRun", invalidEventID); desc.addUntracked("eventIDThrowOnStreamEndLumi", invalidEventID); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/FWCore/Integration/plugins/ExistingDictionaryTestModules.cc b/FWCore/Integration/plugins/ExistingDictionaryTestModules.cc index a42ad22417381..f923229e54253 100644 --- a/FWCore/Integration/plugins/ExistingDictionaryTestModules.cc +++ b/FWCore/Integration/plugins/ExistingDictionaryTestModules.cc @@ -27,7 +27,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void produce(edm::StreamID id, edm::Event& iEvent, edm::EventSetup const&) const override { @@ -60,7 +60,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.add("src", edm::InputTag{"prod"}); desc.add("testVecUniqInt", true); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void analyze(edm::StreamID id, edm::Event const& iEvent, edm::EventSetup const&) const override { diff --git a/FWCore/Integration/plugins/ProducerUsingCollector.cc b/FWCore/Integration/plugins/ProducerUsingCollector.cc index c9c02dbbdfead..c7010a04d2ce6 100644 --- a/FWCore/Integration/plugins/ProducerUsingCollector.cc +++ b/FWCore/Integration/plugins/ProducerUsingCollector.cc @@ -136,7 +136,7 @@ namespace edmtest { void ProducerUsingCollector::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest diff --git a/FWCore/Integration/plugins/RunLumiESAnalyzer.cc b/FWCore/Integration/plugins/RunLumiESAnalyzer.cc index 22ef96a86a3c0..f467383bcb413 100644 --- a/FWCore/Integration/plugins/RunLumiESAnalyzer.cc +++ b/FWCore/Integration/plugins/RunLumiESAnalyzer.cc @@ -185,7 +185,7 @@ namespace edmtest { void RunLumiESAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edmtest using namespace edmtest; diff --git a/FWCore/Integration/plugins/RunLumiESSource.cc b/FWCore/Integration/plugins/RunLumiESSource.cc index a01e7f4653411..422da3ceec22f 100644 --- a/FWCore/Integration/plugins/RunLumiESSource.cc +++ b/FWCore/Integration/plugins/RunLumiESSource.cc @@ -68,7 +68,7 @@ namespace edmtest { void RunLumiESSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void RunLumiESSource::setIntervalFor(edm::eventsetup::EventSetupRecordKey const&, diff --git a/FWCore/Integration/plugins/TestESConcurrentSource.cc b/FWCore/Integration/plugins/TestESConcurrentSource.cc index 0d4dd07193d79..7156f2d2c9cb0 100644 --- a/FWCore/Integration/plugins/TestESConcurrentSource.cc +++ b/FWCore/Integration/plugins/TestESConcurrentSource.cc @@ -148,7 +148,7 @@ namespace edmtest { desc.add("checkIOVInitialization", false); desc.add("expectedNumberOfConcurrentIOVs", 0); desc.add>("firstValidLumis", emptyVector); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestESConcurrentSource::setIntervalFor(EventSetupRecordKey const&, diff --git a/FWCore/Integration/plugins/TestESSource.cc b/FWCore/Integration/plugins/TestESSource.cc index bacf09312cad0..6f0ed512e1c55 100644 --- a/FWCore/Integration/plugins/TestESSource.cc +++ b/FWCore/Integration/plugins/TestESSource.cc @@ -143,7 +143,7 @@ namespace edmtest { desc.add("checkIOVInitialization", false); desc.add("expectedNumberOfConcurrentIOVs", 0); desc.add>("firstValidLumis", emptyVector); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestESSource::setIntervalFor(EventSetupRecordKey const&, diff --git a/FWCore/Integration/plugins/TestGetByLabelAnalyzer.cc b/FWCore/Integration/plugins/TestGetByLabelAnalyzer.cc index 3e565ccb424dd..6e5bbe6b24f80 100644 --- a/FWCore/Integration/plugins/TestGetByLabelAnalyzer.cc +++ b/FWCore/Integration/plugins/TestGetByLabelAnalyzer.cc @@ -24,7 +24,7 @@ namespace edmtest { desc.addUntracked("getExceptionCategory", ""); desc.addUntracked("accessExceptionCategory", ""); desc.addUntracked("consumes", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override { diff --git a/FWCore/Integration/plugins/TestGlobalOutput.cc b/FWCore/Integration/plugins/TestGlobalOutput.cc index eb9735e437307..3429714539514 100644 --- a/FWCore/Integration/plugins/TestGlobalOutput.cc +++ b/FWCore/Integration/plugins/TestGlobalOutput.cc @@ -144,7 +144,7 @@ namespace edm { desc.addUntracked>("expectedProcessesWithProcessBlockProducts", std::vector()); desc.addUntracked("expectedWriteProcessBlockTransitions", -1); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edm diff --git a/FWCore/Integration/plugins/TestLimitedOutput.cc b/FWCore/Integration/plugins/TestLimitedOutput.cc index ab91944bcdf8b..91fe6879cb4c6 100644 --- a/FWCore/Integration/plugins/TestLimitedOutput.cc +++ b/FWCore/Integration/plugins/TestLimitedOutput.cc @@ -145,7 +145,7 @@ namespace edm { desc.addUntracked>("expectedProcessesWithProcessBlockProducts", std::vector()); desc.addUntracked("expectedWriteProcessBlockTransitions", -1); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edm diff --git a/FWCore/Integration/plugins/TestOneOutput.cc b/FWCore/Integration/plugins/TestOneOutput.cc index a8353cd67edb4..62891dac1ffb4 100644 --- a/FWCore/Integration/plugins/TestOneOutput.cc +++ b/FWCore/Integration/plugins/TestOneOutput.cc @@ -406,7 +406,7 @@ namespace edm { desc.addUntracked("expectedNAddedProcesses", kDoNotTest); desc.addUntracked("expectedProductsFromInputKept", true); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edm diff --git a/FWCore/Integration/plugins/TestOutputWithGetterOfProducts.cc b/FWCore/Integration/plugins/TestOutputWithGetterOfProducts.cc index 70a312af6cff8..e68dfd71059cc 100644 --- a/FWCore/Integration/plugins/TestOutputWithGetterOfProducts.cc +++ b/FWCore/Integration/plugins/TestOutputWithGetterOfProducts.cc @@ -71,7 +71,7 @@ namespace edm { ParameterSetDescription desc; OutputModule::fillDescription(desc); desc.addUntracked("expectedSum", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestOutputWithGetterOfProducts::write(EventForOutput const& event) { diff --git a/FWCore/Integration/plugins/TestOutputWithGetterOfProductsGlobal.cc b/FWCore/Integration/plugins/TestOutputWithGetterOfProductsGlobal.cc index b4939b937e948..13deb0c489490 100644 --- a/FWCore/Integration/plugins/TestOutputWithGetterOfProductsGlobal.cc +++ b/FWCore/Integration/plugins/TestOutputWithGetterOfProductsGlobal.cc @@ -72,7 +72,7 @@ namespace edm { ParameterSetDescription desc; OutputModule::fillDescription(desc); desc.addUntracked("expectedSum", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestOutputWithGetterOfProductsGlobal::write(EventForOutput const& event) { diff --git a/FWCore/Integration/plugins/TestOutputWithGetterOfProductsLimited.cc b/FWCore/Integration/plugins/TestOutputWithGetterOfProductsLimited.cc index c49b02660bb23..149d2e7ce5949 100644 --- a/FWCore/Integration/plugins/TestOutputWithGetterOfProductsLimited.cc +++ b/FWCore/Integration/plugins/TestOutputWithGetterOfProductsLimited.cc @@ -72,7 +72,7 @@ namespace edm { ParameterSetDescription desc; OutputModule::fillDescription(desc); desc.addUntracked("expectedSum", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void TestOutputWithGetterOfProductsLimited::write(EventForOutput const& event) { diff --git a/FWCore/Integration/plugins/ThinnedRefFromTestAnalyzer.cc b/FWCore/Integration/plugins/ThinnedRefFromTestAnalyzer.cc index 091f3cdfdef49..0a6a8f7de0cbd 100644 --- a/FWCore/Integration/plugins/ThinnedRefFromTestAnalyzer.cc +++ b/FWCore/Integration/plugins/ThinnedRefFromTestAnalyzer.cc @@ -62,7 +62,7 @@ namespace edmtest { desc.add("thinnedTag"); desc.add("unrelatedTag"); desc.add("trackTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void ThinnedRefFromTestAnalyzer::analyze(edm::StreamID streamID, diff --git a/FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc b/FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc index 7fad80b70e216..22c182a7a90f1 100644 --- a/FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc +++ b/FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc @@ -126,7 +126,7 @@ namespace edmtest { desc.add("thinnedSlimmedCount", 0); desc.add("refSlimmedCount", 0); desc.add("slimmedValueFactor", 10); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void ThinningDSVTestAnalyzer::analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const { diff --git a/FWCore/Integration/plugins/ThinningTestAnalyzer.cc b/FWCore/Integration/plugins/ThinningTestAnalyzer.cc index 42abab1458623..bd986a941d863 100644 --- a/FWCore/Integration/plugins/ThinningTestAnalyzer.cc +++ b/FWCore/Integration/plugins/ThinningTestAnalyzer.cc @@ -130,7 +130,7 @@ namespace edmtest { desc.add("thinnedSlimmedCount", 0); desc.add("refSlimmedCount", 0); desc.add("slimmedValueFactor", 10); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void ThinningTestAnalyzer::analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const { diff --git a/FWCore/Integration/plugins/ValueExample.cc b/FWCore/Integration/plugins/ValueExample.cc index b5705fa56bd30..a2c288a5c3214 100644 --- a/FWCore/Integration/plugins/ValueExample.cc +++ b/FWCore/Integration/plugins/ValueExample.cc @@ -22,5 +22,5 @@ ValueExample::~ValueExample() {} void ValueExample::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("value"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/FWCore/Modules/src/EmptyESSource.cc b/FWCore/Modules/src/EmptyESSource.cc index 1b89c82909fbd..8ad54dd519ec1 100644 --- a/FWCore/Modules/src/EmptyESSource.cc +++ b/FWCore/Modules/src/EmptyESSource.cc @@ -110,7 +110,7 @@ namespace edm { "Sets the beginning point of an IOV. The end point is assumed to be the next entry in the list. If there " "are no further entries than 'end of time' is used."); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edm diff --git a/FWCore/Modules/src/EventContentAnalyzer.cc b/FWCore/Modules/src/EventContentAnalyzer.cc index 5d4d01454f471..28b3977a93c5a 100644 --- a/FWCore/Modules/src/EventContentAnalyzer.cc +++ b/FWCore/Modules/src/EventContentAnalyzer.cc @@ -482,7 +482,7 @@ namespace edm { desc.addUntracked("listPathStatus", false) ->setComment("If true, also show PathStatus/EndPathStatus data products."); descriptions.add("printContent", desc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edm diff --git a/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc b/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc index c9a58bc32dff1..593d292537aa3 100644 --- a/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc +++ b/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc @@ -182,7 +182,7 @@ void EventSetupCacheIdentifierChecker::fillDescriptions(edm::ConfigurationDescri desc.addWildcardUntracked >("*")->setComment( "The label is the name of an EventSetup Record while the vector contains the expected cacheIdentifier values for " "each beginRun, beginLuminosityBlock and event transition"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/FWCore/Modules/src/SwitchProducer.cc b/FWCore/Modules/src/SwitchProducer.cc index 819ca6246d124..5124791b7c09f 100644 --- a/FWCore/Modules/src/SwitchProducer.cc +++ b/FWCore/Modules/src/SwitchProducer.cc @@ -48,7 +48,7 @@ namespace edm { desc.add>("@all_cases"); desc.addUntracked("@chosen_case"); desc.addUntracked("@process_name"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace edm diff --git a/FWCore/Modules/src/TimeStudyModules.cc b/FWCore/Modules/src/TimeStudyModules.cc index 63878205a77fc..3ae06836c91b1 100644 --- a/FWCore/Modules/src/TimeStudyModules.cc +++ b/FWCore/Modules/src/TimeStudyModules.cc @@ -107,7 +107,7 @@ namespace timestudy { desc.add("ivalue")->setComment("Value to put into Event"); Sleeper::fillDescription(desc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } class OneSleepingProducer : public edm::one::EDProducer { @@ -140,7 +140,7 @@ namespace timestudy { desc.add("resource", std::string())->setComment("The name of the resource that is being shared"); Sleeper::fillDescription(desc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } class OneSleepingAnalyzer : public edm::one::EDAnalyzer<> { @@ -164,7 +164,7 @@ namespace timestudy { Sleeper::fillDescription(desc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } /* @@ -343,7 +343,7 @@ namespace timestudy { desc.add>("serviceFinishTimes"); Sleeper::fillDescription(desc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace timestudy diff --git a/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc b/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc index dff0542f8ef2d..0e5c8d425d40d 100644 --- a/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc +++ b/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc @@ -24,5 +24,5 @@ DependsOnDummyService::~DependsOnDummyService() {} void DependsOnDummyService::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/FWCore/ServiceRegistry/test/stubs/DummyService.cc b/FWCore/ServiceRegistry/test/stubs/DummyService.cc index 3dd4a1c514074..4c8fe9543fc78 100644 --- a/FWCore/ServiceRegistry/test/stubs/DummyService.cc +++ b/FWCore/ServiceRegistry/test/stubs/DummyService.cc @@ -31,7 +31,7 @@ void DummyService::fillDescriptions(edm::ConfigurationDescriptions& descriptions desc.add("value"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // diff --git a/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc b/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc index d6b4149111c0b..ee5ee4edabf6a 100644 --- a/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc +++ b/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc @@ -26,7 +26,7 @@ namespace { void DummyServiceBase::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DummyServiceE0::DummyServiceE0(edm::ParameterSet const&, edm::ActivityRegistry& iAR) { diff --git a/FWCore/Services/src/JobReportService.cc b/FWCore/Services/src/JobReportService.cc index c3a5a06760156..c751f0a38ccc5 100644 --- a/FWCore/Services/src/JobReportService.cc +++ b/FWCore/Services/src/JobReportService.cc @@ -56,7 +56,7 @@ namespace edm { void JobReportService::fillDescriptions(ConfigurationDescriptions& descriptions) { ParameterSetDescription desc; desc.setComment("Enables job reports."); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace service } // namespace edm diff --git a/GeneratorInterface/GenFilters/plugins/AJJGenJetFilter.cc b/GeneratorInterface/GenFilters/plugins/AJJGenJetFilter.cc index d2596e8c97ff9..27d6ec3f3ca98 100644 --- a/GeneratorInterface/GenFilters/plugins/AJJGenJetFilter.cc +++ b/GeneratorInterface/GenFilters/plugins/AJJGenJetFilter.cc @@ -230,7 +230,7 @@ void AJJGenJetFilter::fillDescriptions(edm::ConfigurationDescriptions& descripti desc.add("maxPhotonEta", 5); desc.add("minPhotonPt", 50); desc.add("maxPhotonPt", 10000); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in DEFINE_FWK_MODULE(AJJGenJetFilter); diff --git a/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc b/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc index 5347a5f75fd3e..b771d294a22c5 100644 --- a/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc +++ b/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc @@ -97,7 +97,7 @@ void LHEGenericMassFilter::fillDescriptions(edm::ConfigurationDescriptions& desc desc.add("MinMass", 0.0); desc.add("MaxMass", 1.0); desc.add("RequiredOutgoingStatus", true); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/GeneratorInterface/GenFilters/plugins/MCDisplacementFilter.cc b/GeneratorInterface/GenFilters/plugins/MCDisplacementFilter.cc index cbd103d46da49..9663c16f4983a 100644 --- a/GeneratorInterface/GenFilters/plugins/MCDisplacementFilter.cc +++ b/GeneratorInterface/GenFilters/plugins/MCDisplacementFilter.cc @@ -71,7 +71,7 @@ void MCDisplacementFilter::fillDescriptions(edm::ConfigurationDescriptions& desc desc.add>("ParticleIDs", std::vector{0}); desc.add("LengMax", -1.); desc.add("LengMin", -1.); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // ------------ method called to skim the data ------------ diff --git a/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc b/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc index 2b9d38c2c222b..15dc6d169b8c4 100644 --- a/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc +++ b/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc @@ -563,7 +563,7 @@ void ExternalLHEProducer::fillDescriptions(edm::ConfigurationDescriptions& descr nPartonMappingDesc.add("np"); desc.addVPSetOptional("nPartonMapping", nPartonMappingDesc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } std::unique_ptr ExternalLHEProducer::generateRunInfo(std::vector const& iFiles) const { diff --git a/Geometry/TrackerGeometryBuilder/test/PixelTopologyMapTest.cc b/Geometry/TrackerGeometryBuilder/test/PixelTopologyMapTest.cc index d9ac8fe19e3f0..528b6a7409991 100644 --- a/Geometry/TrackerGeometryBuilder/test/PixelTopologyMapTest.cc +++ b/Geometry/TrackerGeometryBuilder/test/PixelTopologyMapTest.cc @@ -88,7 +88,7 @@ void PixelTopologyMapTest::analyze(edm::StreamID, edm::Event const& iEvent, edm: // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void PixelTopologyMapTest::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc index f87dded819857..c2567c09ee697 100644 --- a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc +++ b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc @@ -54,7 +54,7 @@ void XMLIdealGeometryESProducer::fillDescriptions(edm::ConfigurationDescriptions desc.add("rootDDName")->setComment("The value must be of the form 'namespace:name'"); desc.add("label")->setComment("product label used to get the FileBlob"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/HLTrigger/HLTanalyzers/plugins/RemovePileUpDominatedEventsGen.cc b/HLTrigger/HLTanalyzers/plugins/RemovePileUpDominatedEventsGen.cc index c69d4b5e6fcb2..52b154db03679 100644 --- a/HLTrigger/HLTanalyzers/plugins/RemovePileUpDominatedEventsGen.cc +++ b/HLTrigger/HLTanalyzers/plugins/RemovePileUpDominatedEventsGen.cc @@ -111,7 +111,7 @@ void RemovePileUpDominatedEventsGen::fillDescriptions(edm::ConfigurationDescript edm::ParameterSetDescription desc; desc.add("pileupSummaryInfos", edm::InputTag("addPileupInfo")); desc.add("generatorInfo", edm::InputTag("generator")); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(RemovePileUpDominatedEventsGen); diff --git a/IOPool/Input/test/SchemaEvolutionTestRead.cc b/IOPool/Input/test/SchemaEvolutionTestRead.cc index ae418c532f99a..5e558c70402cd 100644 --- a/IOPool/Input/test/SchemaEvolutionTestRead.cc +++ b/IOPool/Input/test/SchemaEvolutionTestRead.cc @@ -68,7 +68,7 @@ namespace edmtest { edm::ParameterSetDescription desc; desc.add>("expectedVectorVectorIntegralValues"); desc.add("vectorVectorTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void SchemaEvolutionTestRead::analyzeVectorVector(edm::Event const& iEvent) const { diff --git a/IOPool/Input/test/SchemaEvolutionTestWrite.cc b/IOPool/Input/test/SchemaEvolutionTestWrite.cc index a951bb1870b00..b57f8b38d336f 100644 --- a/IOPool/Input/test/SchemaEvolutionTestWrite.cc +++ b/IOPool/Input/test/SchemaEvolutionTestWrite.cc @@ -69,7 +69,7 @@ namespace edmtest { void SchemaEvolutionTestWrite::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add>("testIntegralValues"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void SchemaEvolutionTestWrite::produceVectorVector(edm::Event& iEvent) const { diff --git a/IgTools/IgProf/plugins/IgProfService.cc b/IgTools/IgProf/plugins/IgProfService.cc index 5908685293473..ede77d50085f6 100644 --- a/IgTools/IgProf/plugins/IgProfService.cc +++ b/IgTools/IgProf/plugins/IgProfService.cc @@ -143,7 +143,7 @@ void IgProfService::fillDescriptions(edm::ConfigurationDescriptions &description desc.addUntracked("reportToFileAtPostOpenFile", ""); desc.addUntracked("reportToFileAtPostCloseFile", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void IgProfService::postBeginJob() { makeDump(atPostBeginJob_); } diff --git a/JetMETCorrections/Modules/plugins/ChainedJetCorrectorProducer.cc b/JetMETCorrections/Modules/plugins/ChainedJetCorrectorProducer.cc index 3b32ab7deb7fc..dc5ed25308145 100644 --- a/JetMETCorrections/Modules/plugins/ChainedJetCorrectorProducer.cc +++ b/JetMETCorrections/Modules/plugins/ChainedJetCorrectorProducer.cc @@ -173,7 +173,7 @@ void ChainedJetCorrectorProducer::fillDescriptions(edm::ConfigurationDescription // Please change this to state exactly what you do use, even if it is no parameters edm::ParameterSetDescription desc; desc.add>("correctors"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/JetMETCorrections/Type1MET/interface/JetCleanerForType1METT.h b/JetMETCorrections/Type1MET/interface/JetCleanerForType1METT.h index d57f64784c70a..a0373eb5442ff 100644 --- a/JetMETCorrections/Type1MET/interface/JetCleanerForType1METT.h +++ b/JetMETCorrections/Type1MET/interface/JetCleanerForType1METT.h @@ -116,7 +116,7 @@ class JetCleanerForType1METT : public edm::stream::EDProducer<> { ->setComment( "calculate muon-subtracted raw pt as a ValueMap for the input collection (only for selected jets, zero for " "others)"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } private: diff --git a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc index f04ab8afd3e13..dad93ac135729 100644 --- a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc +++ b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc @@ -362,7 +362,7 @@ void L1TCaloLayer1::fillDescriptions(edm::ConfigurationDescriptions& description desc.add("unpackEcalMask", false); desc.add("unpackHcalMask", false); desc.add("firmwareVersion", 1); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc index 805b791a41301..f9d7957ab50db 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc @@ -151,7 +151,7 @@ void L1TCaloRCTToUpgradeConverter::fillDescriptions(edm::ConfigurationDescriptio edm::ParameterSetDescription desc; desc.add("regionTag"); desc.add("emTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc index c5c06318b6f5f..9a6bed89e3a98 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc @@ -381,7 +381,7 @@ void L1TStage1Layer2Producer::fillDescriptions(ConfigurationDescriptions& descri desc.add("CaloEmCands"); desc.add("conditionsLabel"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/L1Trigger/Phase2L1GT/plugins/L1GTBoardWriter.cc b/L1Trigger/Phase2L1GT/plugins/L1GTBoardWriter.cc index 9c5d1402fedc4..7c4bf2c75eaaf 100644 --- a/L1Trigger/Phase2L1GT/plugins/L1GTBoardWriter.cc +++ b/L1Trigger/Phase2L1GT/plugins/L1GTBoardWriter.cc @@ -98,7 +98,7 @@ void L1GTBoardWriter::fillDescriptions(edm::ConfigurationDescriptions& descripti desc.add("maxLines", 1024); desc.add("patternFormat", "EMPv2"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(L1GTBoardWriter); diff --git a/L1Trigger/Phase2L1GT/plugins/L1GTNTupleProducer.cc b/L1Trigger/Phase2L1GT/plugins/L1GTNTupleProducer.cc index 1028b2c64769c..a8f5c1b977563 100644 --- a/L1Trigger/Phase2L1GT/plugins/L1GTNTupleProducer.cc +++ b/L1Trigger/Phase2L1GT/plugins/L1GTNTupleProducer.cc @@ -96,7 +96,7 @@ void L1GTNTupleProducer::fillDescriptions(edm::ConfigurationDescriptions& descri desc.add("producerName"); desc.add("maxNTuples"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void L1GTNTupleProducer::fillData(const l1t::P2GTCandidateCollection& collection, const std::string& instanceName) { diff --git a/L1Trigger/Phase2L1ParticleFlow/plugins/L1CTJetFileWriter.cc b/L1Trigger/Phase2L1ParticleFlow/plugins/L1CTJetFileWriter.cc index 38e1d75601524..f09e05db4283a 100644 --- a/L1Trigger/Phase2L1ParticleFlow/plugins/L1CTJetFileWriter.cc +++ b/L1Trigger/Phase2L1ParticleFlow/plugins/L1CTJetFileWriter.cc @@ -177,7 +177,7 @@ void L1CTJetFileWriter::fillDescriptions(edm::ConfigurationDescriptions& descrip desc.add("TMUX", 6); desc.add("maxLinesPerFile", 1024); desc.add("format", "EMPv2"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducerFromDB.cc b/MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducerFromDB.cc index 1cd928769d2a3..e271f2f95a5b9 100644 --- a/MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducerFromDB.cc +++ b/MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducerFromDB.cc @@ -213,7 +213,7 @@ void VolumeBasedMagneticFieldESProducerFromDB::fillDescriptions(edm::Configurati desc.add("valueOverride", -1)->setComment("Force value of current (in A); take the value from DB if < 0."); desc.addUntracked("label", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(VolumeBasedMagneticFieldESProducerFromDB); diff --git a/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducer.cc b/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducer.cc index f0f614eeb0bf0..4d6b33d66f144 100644 --- a/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducer.cc +++ b/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducer.cc @@ -134,7 +134,7 @@ void DD4hep_VolumeBasedMagneticFieldESProducer::fillDescriptions(edm::Configurat //default used to be compatible with older configurations desc.add >("paramData", std::vector()); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(DD4hep_VolumeBasedMagneticFieldESProducer); diff --git a/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc b/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc index 4a3c8dc070019..669baa8d00063 100644 --- a/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc +++ b/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc @@ -238,7 +238,7 @@ void DD4hep_VolumeBasedMagneticFieldESProducerFromDB::fillDescriptions(edm::Conf desc.add("valueOverride", -1)->setComment("Force value of current (in A); take the value from DB if < 0."); desc.addUntracked("label", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(DD4hep_VolumeBasedMagneticFieldESProducerFromDB); diff --git a/PhysicsTools/HepMCCandAlgos/plugins/FlavorHistoryFilter.cc b/PhysicsTools/HepMCCandAlgos/plugins/FlavorHistoryFilter.cc index 93c683aa14e79..b89c73a6bdce3 100644 --- a/PhysicsTools/HepMCCandAlgos/plugins/FlavorHistoryFilter.cc +++ b/PhysicsTools/HepMCCandAlgos/plugins/FlavorHistoryFilter.cc @@ -197,7 +197,7 @@ void FlavorHistoryFilter::fillDescriptions(edm::ConfigurationDescriptions& descr desc.add("dr"); desc.add("verbose"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } bool FlavorHistoryFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { diff --git a/PhysicsTools/HepMCCandAlgos/plugins/GenParticleDecaySelector.cc b/PhysicsTools/HepMCCandAlgos/plugins/GenParticleDecaySelector.cc index bc23d06727f67..9ab1260e81fb3 100644 --- a/PhysicsTools/HepMCCandAlgos/plugins/GenParticleDecaySelector.cc +++ b/PhysicsTools/HepMCCandAlgos/plugins/GenParticleDecaySelector.cc @@ -65,7 +65,7 @@ void GenParticleDecaySelector::fillDescriptions(edm::ConfigurationDescriptions& ->setComment("the PdtEntry can be specified as either an 'int' or via its name using a 'string'"); desc.add("status"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void GenParticleDecaySelector::produce(edm::Event& evt, const edm::EventSetup& es) { diff --git a/PhysicsTools/HepMCCandAlgos/plugins/HFFilter.cc b/PhysicsTools/HepMCCandAlgos/plugins/HFFilter.cc index 5771e5e511277..31e4cf6a8fe9f 100644 --- a/PhysicsTools/HepMCCandAlgos/plugins/HFFilter.cc +++ b/PhysicsTools/HepMCCandAlgos/plugins/HFFilter.cc @@ -72,7 +72,7 @@ void HFFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { desc.add("ptMin"); desc.add("etaMax"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // diff --git a/PhysicsTools/HepMCCandAlgos/plugins/MCTruthCompositeMatcherNew.cc b/PhysicsTools/HepMCCandAlgos/plugins/MCTruthCompositeMatcherNew.cc index e547aec987744..3c5f412175dc9 100644 --- a/PhysicsTools/HepMCCandAlgos/plugins/MCTruthCompositeMatcherNew.cc +++ b/PhysicsTools/HepMCCandAlgos/plugins/MCTruthCompositeMatcherNew.cc @@ -48,7 +48,7 @@ namespace reco { desc.add>("matchMaps"); desc.add>("matchPDGId"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void MCTruthCompositeMatcher::produce(edm::StreamID, edm::Event &evt, const edm::EventSetup &) const { diff --git a/PhysicsTools/HepMCCandAlgos/plugins/ModelFilter.cc b/PhysicsTools/HepMCCandAlgos/plugins/ModelFilter.cc index c6c2c1b0acffb..4f2fd116bf0e7 100644 --- a/PhysicsTools/HepMCCandAlgos/plugins/ModelFilter.cc +++ b/PhysicsTools/HepMCCandAlgos/plugins/ModelFilter.cc @@ -91,7 +91,7 @@ void ModelFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) desc.add >("parameterMins"); desc.add >("parameterMaxs"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } vector ModelFilter::split(string const& fstring, string const& splitter) { vector returnVector; diff --git a/PhysicsTools/NanoAOD/plugins/EGMSeedGainProducer.cc b/PhysicsTools/NanoAOD/plugins/EGMSeedGainProducer.cc index 9211fdc9ae953..a9971e343f741 100644 --- a/PhysicsTools/NanoAOD/plugins/EGMSeedGainProducer.cc +++ b/PhysicsTools/NanoAOD/plugins/EGMSeedGainProducer.cc @@ -106,7 +106,7 @@ void EGMSeedGainProducer::fillDescriptions(edm::ConfigurationDescriptions& de ->setComment("EB rechit collection"); desc.add("recHitsEE", edm::InputTag("reducedEgamma", "reducedEERecHits")) ->setComment("EE rechit collection"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } typedef EGMSeedGainProducer ElectronSeedGainProducer; diff --git a/PhysicsTools/NanoAOD/plugins/GenJetTauTaggerProducer.cc b/PhysicsTools/NanoAOD/plugins/GenJetTauTaggerProducer.cc index 22097c1208217..164dbd8caa1db 100644 --- a/PhysicsTools/NanoAOD/plugins/GenJetTauTaggerProducer.cc +++ b/PhysicsTools/NanoAOD/plugins/GenJetTauTaggerProducer.cc @@ -86,7 +86,7 @@ void GenJetTauTaggerProducer::fillDescriptions(edm::ConfigurationDescriptions& d // Please change this to state exactly what you do use, even if it is no parameters edm::ParameterSetDescription desc; desc.add("src")->setComment("input physics object collection"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc b/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc index 7c5ac3cb70cf2..15e68388d61cd 100644 --- a/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc +++ b/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc @@ -436,7 +436,7 @@ void NanoAODOutputModule::fillDescriptions(edm::ConfigurationDescriptions& descr branchSet.setAllowAnything(); desc.add("branches", branchSet); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(NanoAODOutputModule); diff --git a/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc b/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc index ea56c81c17d64..611c2428eb234 100644 --- a/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc +++ b/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc @@ -289,7 +289,7 @@ void NanoAODRNTupleOutputModule::fillDescriptions(edm::ConfigurationDescriptions branchSet.setAllowAnything(); desc.add("branches", branchSet); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(NanoAODRNTupleOutputModule); diff --git a/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h b/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h index 2d2ee29ab70af..fe915b42c8afd 100644 --- a/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h +++ b/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h @@ -173,7 +173,7 @@ class SmearedJetProducerT : public edm::stream::EDProducer<> { pat::GenJetMatcher::fillDescriptions(desc); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void produce(edm::Event& event, const edm::EventSetup& setup) override { diff --git a/RecoBTag/Combined/plugins/BTagProbabilityToDiscriminator.cc b/RecoBTag/Combined/plugins/BTagProbabilityToDiscriminator.cc index 8adbff6f4e2bf..633edb11e3792 100644 --- a/RecoBTag/Combined/plugins/BTagProbabilityToDiscriminator.cc +++ b/RecoBTag/Combined/plugins/BTagProbabilityToDiscriminator.cc @@ -222,7 +222,7 @@ void BTagProbabilityToDiscriminator::fillDescriptions(edm::ConfigurationDescript } desc.addVPSet("discriminators", vpsd1, temp1); } - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // define this as a plug-in diff --git a/RecoBTag/Combined/src/CandidateChargeBTagComputer.cc b/RecoBTag/Combined/src/CandidateChargeBTagComputer.cc index fbaa525a831dc..4e8634acf560a 100644 --- a/RecoBTag/Combined/src/CandidateChargeBTagComputer.cc +++ b/RecoBTag/Combined/src/CandidateChargeBTagComputer.cc @@ -254,5 +254,5 @@ void CandidateChargeBTagComputer::fillDescriptions(edm::ConfigurationDescription desc.add("useAdaBoost", true); desc.add("jetChargeExp", 0.8); desc.add("svChargeExp", 0.5); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/RecoBTag/ImpactParameter/plugins/IPProducer.h b/RecoBTag/ImpactParameter/plugins/IPProducer.h index c2cfa5712ef41..07b905f3ab0f4 100644 --- a/RecoBTag/ImpactParameter/plugins/IPProducer.h +++ b/RecoBTag/ImpactParameter/plugins/IPProducer.h @@ -457,7 +457,7 @@ inline void IPProducer("computeProbabilities", true); desc.add("useTrackQuality", false); desc.add("maximumChiSquared", 5.0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } template <> @@ -482,7 +482,7 @@ IPProducer, reco::JetTagInfo, IPProducerHelpers: desc.add("ghostTrackPriorDeltaR", 0.03); desc.add("maximumChiSquared", 5.0); desc.addOptional("explicitJTA", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } #endif diff --git a/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc b/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc index c903c83cd4713..350ecb8b9424e 100644 --- a/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc +++ b/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc @@ -802,7 +802,7 @@ void BoostedDoubleSVProducer::fillDescriptions(edm::ConfigurationDescriptions& d } desc.add("svTagInfos", edm::InputTag("pfInclusiveSecondaryVertexFinderAK8TagInfos")); desc.add("weights", edm::InputTag("")); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc b/RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc index 8ca07c3586310..0e37939430dd3 100644 --- a/RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc +++ b/RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc @@ -1308,7 +1308,7 @@ void TemplatedSecondaryVertexProducer::fillDescriptions(edm::Configur desc.addOptional("fatJets"); desc.addOptional("groomedFatJets"); desc.add("weights", edm::InputTag("")); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoBTag/SoftLepton/plugins/SoftLepton.cc b/RecoBTag/SoftLepton/plugins/SoftLepton.cc index 09705ed584dc0..f1be6d8c482bd 100644 --- a/RecoBTag/SoftLepton/plugins/SoftLepton.cc +++ b/RecoBTag/SoftLepton/plugins/SoftLepton.cc @@ -518,7 +518,7 @@ void SoftLepton::fillDescriptions(edm::ConfigurationDescriptions &descriptions) desc.add("jets", edm::InputTag("ak4PFJetsCHS")); desc.add("leptonDeltaRCut", 0.4); desc.add("leptonChi2Cut", 9999.0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(SoftLepton); diff --git a/RecoBTag/SoftLepton/plugins/SoftPFElectronTagInfoProducer.cc b/RecoBTag/SoftLepton/plugins/SoftPFElectronTagInfoProducer.cc index 2d173c32e1b35..eec21236c466d 100644 --- a/RecoBTag/SoftLepton/plugins/SoftPFElectronTagInfoProducer.cc +++ b/RecoBTag/SoftLepton/plugins/SoftPFElectronTagInfoProducer.cc @@ -91,7 +91,7 @@ void SoftPFElectronTagInfoProducer::fillDescriptions(edm::ConfigurationDescripti desc.add("electrons"); desc.add("DeltaRElectronJet"); desc.add("MaxSip3Dsig"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void SoftPFElectronTagInfoProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { diff --git a/RecoBTag/SoftLepton/plugins/SoftPFMuonTagInfoProducer.cc b/RecoBTag/SoftLepton/plugins/SoftPFMuonTagInfoProducer.cc index f81ec88868025..c5aae791e91f7 100644 --- a/RecoBTag/SoftLepton/plugins/SoftPFMuonTagInfoProducer.cc +++ b/RecoBTag/SoftLepton/plugins/SoftPFMuonTagInfoProducer.cc @@ -97,7 +97,7 @@ void SoftPFMuonTagInfoProducer::fillDescriptions(edm::ConfigurationDescriptions& desc.add("filterRatio1"); desc.add("filterRatio2"); desc.add("filterPromptMuons"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void SoftPFMuonTagInfoProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { diff --git a/RecoBTau/JetTagComputer/plugins/JetTagProducer.cc b/RecoBTau/JetTagComputer/plugins/JetTagProducer.cc index 5a8d019d91202..7698ef24cd2f7 100644 --- a/RecoBTau/JetTagComputer/plugins/JetTagProducer.cc +++ b/RecoBTau/JetTagComputer/plugins/JetTagProducer.cc @@ -180,7 +180,7 @@ void JetTagProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptio tagInfos.push_back(edm::InputTag("softPFElectronsTagInfos")); desc.add >("tagInfos", tagInfos); } - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // define it as plugin diff --git a/RecoEgamma/EgammaElectronAlgos/test/TestGsfElectronConversionFinder.cc b/RecoEgamma/EgammaElectronAlgos/test/TestGsfElectronConversionFinder.cc index a399f10e61ced..0804238a5ec67 100644 --- a/RecoEgamma/EgammaElectronAlgos/test/TestGsfElectronConversionFinder.cc +++ b/RecoEgamma/EgammaElectronAlgos/test/TestGsfElectronConversionFinder.cc @@ -102,7 +102,7 @@ void TestGsfElectronConversionFinder::analyze(const edm::Event& event, const edm void TestGsfElectronConversionFinder::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("gsfElectrons", {"gedGsfElectrons"}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h b/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h index 6fb5f3beb9398..ccc902244f874 100644 --- a/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h +++ b/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h @@ -172,7 +172,7 @@ void MVAValueMapProducer::fillDescriptions(edm::ConfigurationDescr mvaConfigurations.setUnknown(); desc.addVPSet("mvaConfigurations", mvaConfigurations); } - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } #endif diff --git a/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc b/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc index 4b476a760dd0c..8c0ebdec9d0ef 100644 --- a/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc +++ b/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc @@ -321,7 +321,7 @@ void ElectronHEEPIDValueMapProducer::fillDescriptions(edm::ConfigurationDescript desc.add("trkIsoConfig", EleTkIsolFromCands::pSetDescript()); desc.add("trkIso04Config", EleTkIsolFromCands::pSetDescript()); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(ElectronHEEPIDValueMapProducer); diff --git a/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc b/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc index c41c2c2df6f7d..c5a8d8bfe56c6 100644 --- a/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc +++ b/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc @@ -393,7 +393,7 @@ void ElectronMVANtuplizer::fillDescriptions(edm::ConfigurationDescriptions& desc desc.add>("eleMVAValMapLabels", {}); desc.add>("eleMVACats", {}); desc.add>("eleMVACatLabels", {}); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoEgamma/PhotonIdentification/plugins/PhotonMVANtuplizer.cc b/RecoEgamma/PhotonIdentification/plugins/PhotonMVANtuplizer.cc index 79cdf3b07bb24..4b699c1149095 100644 --- a/RecoEgamma/PhotonIdentification/plugins/PhotonMVANtuplizer.cc +++ b/RecoEgamma/PhotonIdentification/plugins/PhotonMVANtuplizer.cc @@ -345,7 +345,7 @@ void PhotonMVANtuplizer::fillDescriptions(edm::ConfigurationDescriptions& descri desc.add("ptThreshold", 15.0); desc.add("deltaR", 0.1); desc.add("variableDefinition"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc b/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc index 65f62bda44acd..01a7315e37633 100644 --- a/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc +++ b/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc @@ -517,7 +517,7 @@ namespace reco { desc.add("midRapidityRange", 1); desc.add("lowGainZDC", true); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // ------------ method called once each job just before starting event loop ------------ diff --git a/RecoJets/JetProducers/plugins/VirtualJetProducer.cc b/RecoJets/JetProducers/plugins/VirtualJetProducer.cc index 175e2fbb4b9a1..9e5007ec0cee0 100644 --- a/RecoJets/JetProducers/plugins/VirtualJetProducer.cc +++ b/RecoJets/JetProducers/plugins/VirtualJetProducer.cc @@ -1045,7 +1045,7 @@ void VirtualJetProducer::fillDescriptions(edm::ConfigurationDescriptions& descri // all the classes that inherit from this class redefine // the fillDescriptions function. Otherwise, the autogenerated // cfi filenames are the same and conflict. - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void VirtualJetProducer::fillDescriptionsFromVirtualJetProducer(edm::ParameterSetDescription& desc) { diff --git a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc index 4503026b5612f..39327d71eba06 100644 --- a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc +++ b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc @@ -471,5 +471,5 @@ void CaloTowersCreator::fillDescriptions(edm::ConfigurationDescriptions& descrip desc.add("HcalPhase", 0); desc.add("usePFThresholdsFromDB", true); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersReCreator.cc b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersReCreator.cc index 7300963904774..6969726919853 100644 --- a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersReCreator.cc +++ b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersReCreator.cc @@ -201,5 +201,5 @@ void CaloTowersReCreator::fillDescriptions(edm::ConfigurationDescriptions& descr desc.add("MomConstrMethod", 1); desc.add("HcalPhase", 0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/RecoLocalCalo/Castor/src/CastorInvalidDataFilter.cc b/RecoLocalCalo/Castor/src/CastorInvalidDataFilter.cc index ed0ca8e7f2c76..22d74b44b482c 100644 --- a/RecoLocalCalo/Castor/src/CastorInvalidDataFilter.cc +++ b/RecoLocalCalo/Castor/src/CastorInvalidDataFilter.cc @@ -89,7 +89,7 @@ bool CastorInvalidDataFilter::filter(edm::StreamID, edm::Event& iEvent, const ed // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void CastorInvalidDataFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in DEFINE_FWK_MODULE(CastorInvalidDataFilter); diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducer.cc b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducer.cc index dfb50c39bd9a9..5cfe6e4f557d8 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducer.cc +++ b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducer.cc @@ -80,7 +80,7 @@ void EcalUncalibRecHitProducer::fillDescriptions(edm::ConfigurationDescriptions& } desc.ifValue(edm::ParameterDescription("algo", "EcalUncalibRecHitWorkerMultiFit", true), std::move(s)); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } for (std::vector::const_iterator itInfos = infos.begin(); itInfos != infos.end(); itInfos++) { diff --git a/RecoLocalCalo/HcalRecAlgos/test/MahiDebugger.cc b/RecoLocalCalo/HcalRecAlgos/test/MahiDebugger.cc index b441df65d29ef..0cf2bd0ee0436 100644 --- a/RecoLocalCalo/HcalRecAlgos/test/MahiDebugger.cc +++ b/RecoLocalCalo/HcalRecAlgos/test/MahiDebugger.cc @@ -380,7 +380,7 @@ void MahiDebugger::fillDescriptions(edm::ConfigurationDescriptions& descriptions //desc.add("algoConfigClass"); //add_param_set(algorithm); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEPhase1Reconstructor.cc b/RecoLocalCalo/HcalRecProducers/src/HBHEPhase1Reconstructor.cc index 58a82cbfcc79f..ca5f80f222619 100644 --- a/RecoLocalCalo/HcalRecProducers/src/HBHEPhase1Reconstructor.cc +++ b/RecoLocalCalo/HcalRecProducers/src/HBHEPhase1Reconstructor.cc @@ -800,7 +800,7 @@ void HBHEPhase1Reconstructor::fillDescriptions(edm::ConfigurationDescriptions& d add_param_set(pulseShapeParametersQIE8); add_param_set(pulseShapeParametersQIE11); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEPlan1Combiner.cc b/RecoLocalCalo/HcalRecProducers/src/HBHEPlan1Combiner.cc index e9fecb3881b52..19ce852175b88 100644 --- a/RecoLocalCalo/HcalRecProducers/src/HBHEPlan1Combiner.cc +++ b/RecoLocalCalo/HcalRecProducers/src/HBHEPlan1Combiner.cc @@ -142,7 +142,7 @@ void HBHEPlan1Combiner::fillDescriptions(edm::ConfigurationDescriptions& descrip add_param_set(algorithm); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoLocalCalo/HcalRecProducers/src/HFPhase1Reconstructor.cc b/RecoLocalCalo/HcalRecProducers/src/HFPhase1Reconstructor.cc index 2b44c1e4ad372..6692ae077fca8 100644 --- a/RecoLocalCalo/HcalRecProducers/src/HFPhase1Reconstructor.cc +++ b/RecoLocalCalo/HcalRecProducers/src/HFPhase1Reconstructor.cc @@ -293,7 +293,7 @@ void HFPhase1Reconstructor::fillDescriptions(edm::ConfigurationDescriptions& des add_param_set(S8S1stat); add_param_set(PETstat); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoLocalCalo/HcalRecProducers/src/HFPreReconstructor.cc b/RecoLocalCalo/HcalRecProducers/src/HFPreReconstructor.cc index ff751d2e830e5..a541b0e36c1cf 100644 --- a/RecoLocalCalo/HcalRecProducers/src/HFPreReconstructor.cc +++ b/RecoLocalCalo/HcalRecProducers/src/HFPreReconstructor.cc @@ -272,7 +272,7 @@ void HFPreReconstructor::fillDescriptions(edm::ConfigurationDescriptions& descri desc.add("tsFromDB"); desc.add("sumAllTimeSlices"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoLuminosity/LumiProducer/plugins/LumiProducerFromBrilcalc.cc b/RecoLuminosity/LumiProducer/plugins/LumiProducerFromBrilcalc.cc index 38f38e40354c0..72d61736d5103 100644 --- a/RecoLuminosity/LumiProducer/plugins/LumiProducerFromBrilcalc.cc +++ b/RecoLuminosity/LumiProducer/plugins/LumiProducerFromBrilcalc.cc @@ -167,7 +167,7 @@ void LumiProducerFromBrilcalc::fillDescriptions(edm::ConfigurationDescriptions& desc.add("lumiFile"); desc.add("throwIfNotFound", false); desc.add("doBunchByBunch", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoLuminosity/LumiProducer/test/TestLumiProducerFromBrilcalc.cc b/RecoLuminosity/LumiProducer/test/TestLumiProducerFromBrilcalc.cc index 7f91995b539c5..1fa27821b399a 100644 --- a/RecoLuminosity/LumiProducer/test/TestLumiProducerFromBrilcalc.cc +++ b/RecoLuminosity/LumiProducer/test/TestLumiProducerFromBrilcalc.cc @@ -102,7 +102,7 @@ void TestLumiProducerFromBrilcalc::fillDescriptions(edm::ConfigurationDescriptio // Allowed parameters edm::ParameterSetDescription desc; desc.addUntracked("inputTag"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/RecoMuon/DetLayers/plugins/MuonDetLayerGeometryESProducer.cc b/RecoMuon/DetLayers/plugins/MuonDetLayerGeometryESProducer.cc index 5b9114ff074a2..171e89f3135c1 100644 --- a/RecoMuon/DetLayers/plugins/MuonDetLayerGeometryESProducer.cc +++ b/RecoMuon/DetLayers/plugins/MuonDetLayerGeometryESProducer.cc @@ -110,7 +110,7 @@ std::unique_ptr MuonDetLayerGeometryESProducer::produce(co void MuonDetLayerGeometryESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; //no parameters are used - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(MuonDetLayerGeometryESProducer); diff --git a/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc b/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc index 4a462888aac66..d38495e4ff53f 100644 --- a/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc +++ b/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc @@ -1534,5 +1534,5 @@ void MuonIdProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptio descCalo.add("TrackAssociatorParameters", descTrkAsoPar); desc.add("CaloExtractorPSet", descCalo); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc b/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc index 161a448dc3a36..51692216627d1 100644 --- a/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc +++ b/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc @@ -52,7 +52,7 @@ std::unique_ptr MuonTransientTrackingRecHitBuild void MuonTransientTrackingRecHitBuilderESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("ComponentName"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(MuonTransientTrackingRecHitBuilderESProducer); diff --git a/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc b/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc index a37d6913870ed..b6a94c8e8669e 100644 --- a/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc +++ b/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc @@ -228,7 +228,7 @@ void PFRecHitProducerTest::fillDescriptions(edm::ConfigurationDescriptions& desc ->setComment("Dump PFRecHits of first event, regardless of result of comparison"); desc.addUntracked("dumpFirstError", false)->setComment("Dump PFRecHits upon first encountered error"); desc.addUntracked("strictCompare", false)->setComment("Compare all floats for equality"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } void PFRecHitProducerTest::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) { diff --git a/RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc b/RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc index 12ceadaa7270a..5ffbfc1b42a62 100644 --- a/RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc +++ b/RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc @@ -64,7 +64,7 @@ void TrackerMTDRecoGeometryESProducer::fillDescriptions(edm::ConfigurationDescri desc.add("usePhase2Stacks", false); desc.addUntracked("trackerGeometryLabel", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(TrackerMTDRecoGeometryESProducer); diff --git a/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc b/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc index 04f9f7fba6026..b21e1ebbff7fb 100644 --- a/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc +++ b/RecoTracker/GeometryESProducer/plugins/TrackerRecoGeometryESProducer.cc @@ -61,7 +61,7 @@ void TrackerRecoGeometryESProducer::fillDescriptions(edm::ConfigurationDescripti desc.add("usePhase2Stacks", false); desc.addUntracked("trackerGeometryLabel", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(TrackerRecoGeometryESProducer); diff --git a/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc b/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc index 50bd9c348d310..17fa2f04424f3 100644 --- a/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc +++ b/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc @@ -380,7 +380,7 @@ void SkippingLayerCosmicNavigationSchoolESProducer::fillDescriptions(edm::Config desc.add("selfSearch"); desc.add("allSelf"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } #include "FWCore/PluginManager/interface/ModuleDef.h" diff --git a/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc b/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc index 2b04c5a1db5c4..2e429ae83ede2 100644 --- a/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc +++ b/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc @@ -70,7 +70,7 @@ void NavigationSchoolESProducer::fillDescriptions(edm::ConfigurationDescriptions desc.add("ComponentName"); desc.add("PluginName", ""); desc.add("SimpleMagneticField", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } #include "FWCore/PluginManager/interface/ModuleDef.h" diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc index bad5f56c4db7a..d7f467cf9fb11 100644 --- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc +++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc @@ -403,7 +403,7 @@ void EcalTrigPrimProducer::fillDescriptions(edm::ConfigurationDescriptions &desc // 'binOfMaximum' was missing. This replicates that behavior. desc.add("binOfMaximum", -1)->setComment(kComment); desc.add("TPinfoPrintout", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(EcalTrigPrimProducer); diff --git a/TopQuarkAnalysis/TopTools/test/TestGenTtbarCategories.cc b/TopQuarkAnalysis/TopTools/test/TestGenTtbarCategories.cc index 94af09defb3b4..417ec624dd77a 100644 --- a/TopQuarkAnalysis/TopTools/test/TestGenTtbarCategories.cc +++ b/TopQuarkAnalysis/TopTools/test/TestGenTtbarCategories.cc @@ -111,7 +111,7 @@ void TestGenTtbarCategories::beginJob() { void TestGenTtbarCategories::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("genTtbarId"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } //define this as a plug-in diff --git a/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.cc b/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.cc index 5542cbb7d5c31..058bce0e87e7b 100644 --- a/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.cc +++ b/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.cc @@ -70,5 +70,5 @@ void CloseComponentsMergerESProducer::fillDescriptions(edm::ConfigurationDesc desc.add("MaxComponents"); desc.add("DistanceMeasure"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.cc b/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.cc index c22836b22fe27..724e1b25bb9cc 100644 --- a/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.cc +++ b/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.cc @@ -56,5 +56,5 @@ void DistanceBetweenComponentsESProducer::fillDescriptions(edm::Configuration desc.add("DistanceMeasure"); desc.add("ComponentName"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/TrackingTools/GsfTracking/plugins/GsfMaterialEffectsESProducer.cc b/TrackingTools/GsfTracking/plugins/GsfMaterialEffectsESProducer.cc index f0ad43a53a524..cbe54a3718125 100644 --- a/TrackingTools/GsfTracking/plugins/GsfMaterialEffectsESProducer.cc +++ b/TrackingTools/GsfTracking/plugins/GsfMaterialEffectsESProducer.cc @@ -100,7 +100,7 @@ void GsfMaterialEffectsESProducer::fillDescriptions(edm::ConfigurationDescriptio edm::ParameterDescription("BetheHeitlerCorrection", true)) or "EnergyLossUpdator" >> edm::EmptyGroupDescription() //No additional parameters needed ); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(GsfMaterialEffectsESProducer); diff --git a/TrackingTools/GsfTracking/plugins/GsfTrajectoryFitterESProducer.cc b/TrackingTools/GsfTracking/plugins/GsfTrajectoryFitterESProducer.cc index 1cf8954b682ff..90e014630dbfa 100644 --- a/TrackingTools/GsfTracking/plugins/GsfTrajectoryFitterESProducer.cc +++ b/TrackingTools/GsfTracking/plugins/GsfTrajectoryFitterESProducer.cc @@ -82,7 +82,7 @@ void GsfTrajectoryFitterESProducer::fillDescriptions(edm::ConfigurationDescripti desc.add("GeometricalPropagator"); desc.add("Merger"); desc.add("RecoGeometry"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(GsfTrajectoryFitterESProducer); diff --git a/TrackingTools/GsfTracking/plugins/GsfTrajectorySmootherESProducer.cc b/TrackingTools/GsfTracking/plugins/GsfTrajectorySmootherESProducer.cc index 8fb5e61054fdf..648d1e82a594d 100644 --- a/TrackingTools/GsfTracking/plugins/GsfTrajectorySmootherESProducer.cc +++ b/TrackingTools/GsfTracking/plugins/GsfTrajectorySmootherESProducer.cc @@ -89,6 +89,6 @@ void GsfTrajectorySmootherESProducer::fillDescriptions(edm::ConfigurationDescrip desc.add("RecoGeometry"); desc.add("ErrorRescaling"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(GsfTrajectorySmootherESProducer); diff --git a/TrackingTools/KalmanUpdators/plugins/KFSwitching1DUpdatorESProducer.cc b/TrackingTools/KalmanUpdators/plugins/KFSwitching1DUpdatorESProducer.cc index e9cdf4d96dce7..7ef228cb2683a 100644 --- a/TrackingTools/KalmanUpdators/plugins/KFSwitching1DUpdatorESProducer.cc +++ b/TrackingTools/KalmanUpdators/plugins/KFSwitching1DUpdatorESProducer.cc @@ -49,6 +49,6 @@ void KFSwitching1DUpdatorESProducer::fillDescriptions(edm::ConfigurationDescript edm::ParameterSetDescription desc; desc.add("doEndCap"); desc.add("ComponentName"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(KFSwitching1DUpdatorESProducer); diff --git a/TrackingTools/KalmanUpdators/plugins/KFUpdatorESProducer.cc b/TrackingTools/KalmanUpdators/plugins/KFUpdatorESProducer.cc index 7020990947c84..af419e0bd4618 100644 --- a/TrackingTools/KalmanUpdators/plugins/KFUpdatorESProducer.cc +++ b/TrackingTools/KalmanUpdators/plugins/KFUpdatorESProducer.cc @@ -38,7 +38,7 @@ std::unique_ptr KFUpdatorESProducer::produce(const Track void KFUpdatorESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("ComponentName"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(KFUpdatorESProducer); diff --git a/TrackingTools/KalmanUpdators/plugins/MRHChi2MeasurementEstimatorESProducer.cc b/TrackingTools/KalmanUpdators/plugins/MRHChi2MeasurementEstimatorESProducer.cc index 5e962546afdce..62730ef097635 100644 --- a/TrackingTools/KalmanUpdators/plugins/MRHChi2MeasurementEstimatorESProducer.cc +++ b/TrackingTools/KalmanUpdators/plugins/MRHChi2MeasurementEstimatorESProducer.cc @@ -38,7 +38,7 @@ namespace { desc.add("MaxChi2"); desc.add("nSigma"); desc.add("ComponentName"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } } // namespace diff --git a/TrackingTools/KalmanUpdators/plugins/TrackingRecHitPropagatorESProducer.cc b/TrackingTools/KalmanUpdators/plugins/TrackingRecHitPropagatorESProducer.cc index 3b77f766dbd1d..3dd5c6af31d32 100644 --- a/TrackingTools/KalmanUpdators/plugins/TrackingRecHitPropagatorESProducer.cc +++ b/TrackingTools/KalmanUpdators/plugins/TrackingRecHitPropagatorESProducer.cc @@ -38,6 +38,6 @@ void TrackingRecHitPropagatorESProducer::fillDescriptions(edm::ConfigurationDesc edm::ParameterSetDescription desc; desc.add("ComponentName"); desc.add("SimpleMagneticField", ""); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_EVENTSETUP_MODULE(TrackingRecHitPropagatorESProducer); diff --git a/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc b/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc index 94edd0f278a10..712c3a2063c2a 100644 --- a/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc +++ b/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc @@ -56,5 +56,5 @@ void PropagatorWithMaterialESProducer::fillDescriptions(edm::ConfigurationDescri desc.add("useRungeKutta"); desc.add("useOldAnalPropLogic", true); desc.add("ptMin", -1.0); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc b/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc index 07f6c8b794b68..e151a644b0565 100644 --- a/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc +++ b/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc @@ -25,5 +25,5 @@ void TransientTrackBuilderESProducer::fillDescriptions(edm::ConfigurationDescrip desc.add("ComponentName", "TransientTrackBuilder") ->setComment("data label to use when getting the data product"); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } diff --git a/Validation/HLTrigger/plugins/HLTGenValSource.cc b/Validation/HLTrigger/plugins/HLTGenValSource.cc index 768858604311a..23ce2d8373ee2 100644 --- a/Validation/HLTrigger/plugins/HLTGenValSource.cc +++ b/Validation/HLTrigger/plugins/HLTGenValSource.cc @@ -355,7 +355,7 @@ void HLTGenValSource::fillDescriptions(edm::ConfigurationDescriptions& descripti desc.addVPSet("binnings", binningConfig, binningConfigDefaults); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } // this method handles the different object types and collections that can be used for efficiency calculation diff --git a/Validation/HcalHits/src/SimHitsValidationHcal.cc b/Validation/HcalHits/src/SimHitsValidationHcal.cc index ef72415600f67..5fb05c91eebd8 100644 --- a/Validation/HcalHits/src/SimHitsValidationHcal.cc +++ b/Validation/HcalHits/src/SimHitsValidationHcal.cc @@ -458,7 +458,7 @@ void SimHitsValidationHcal::fillDescriptions(edm::ConfigurationDescriptions &des desc.add("Verbose", false); desc.add("TestNumber", false); - descriptions.addDefault(desc); + descriptions.addWithDefaultLabel(desc); } DEFINE_FWK_MODULE(SimHitsValidationHcal);