Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void HBHEDarkeningEP::fillDescriptions(edm::ConfigurationDescriptions& descripti
std::vector<edm::ParameterSet> default_year(1);
desc.addVPSet("years", desc_years, default_year);

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

// ------------ method called to produce the data ------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1062,5 +1062,5 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions&
std::vector<edm::ParameterSet> default_sipm(1);
desc.addVPSet("SiPMCharacteristics", validator_sipm, default_sipm);

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
2 changes: 1 addition & 1 deletion CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void HcalTimeSlewEP::fillDescriptions(edm::ConfigurationDescriptions& descriptio
std::vector<edm::ParameterSet> default_M3(1);
desc.addVPSet("timeSlewParametersM3", desc_M3, default_M3);

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

// ------------ method called to produce the data ------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void SiStripBackPlaneCorrectionDepESProducer::fillDescriptions(edm::Configuratio
desc.add<edm::ParameterSetDescription>("BackPlaneCorrectionDeconvMode", deconv);
}

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

DEFINE_FWK_EVENTSETUP_MODULE(SiStripBackPlaneCorrectionDepESProducer);
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void SiStripLorentzAngleDepESProducer::fillDescriptions(edm::ConfigurationDescri
desc.add<edm::ParameterSetDescription>("LorentzAngleDeconvMode", deconv);
}

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

DEFINE_FWK_EVENTSETUP_MODULE(SiStripLorentzAngleDepESProducer);
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/RecoUtils/plugins/PFCand_NoPU_WithAM.cc
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void PFCand_NoPU_WithAM::fillDescriptions(edm::ConfigurationDescriptions& descri
desc.add<InputTag>("VertexCollection");
desc.add<int>("MinQuality");

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

//define this as a plug-in
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/RecoUtils/plugins/PF_PU_FirstVertexTracks.cc
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ void PF_PU_FirstVertexTracks::fillDescriptions(edm::ConfigurationDescriptions& d
desc.add<InputTag>("VertexCollection");
desc.add<int>("MinQuality");

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

//define this as a plug-in
Expand Down
2 changes: 1 addition & 1 deletion CondCore/CondHDF5ESSource/plugins/CondHDF5ESSource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ void CondHDF5ESSource::fillDescriptions(edm::ConfigurationDescriptions& descript
desc.add<std::vector<std::string>>("excludeRecords", std::vector<std::string>())
->setComment("List of Records that should not be read from the file");

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

void CondHDF5ESSource::setIntervalFor(EventSetupRecordKey const& iRecordKey,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/MFObjects/test/MagFieldConfigTestESProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/RecoMuonObjects/test/ProduceAgingObject.cc
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ void ProduceAgingObject::fillDescriptions(edm::ConfigurationDescriptions& descri
desc.add<std::vector<int>>("maskedGEMIDs", {});
desc.add<std::vector<int>>("maskedME0IDs", {});

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

//define this as a plug-in
Expand Down
2 changes: 1 addition & 1 deletion CondTools/BeamSpot/plugins/BeamSpotOnlineRecordsReader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void BeamSpotOnlineRecordsReader::fillDescriptions(edm::ConfigurationDescription
edm::ParameterSetDescription desc;
desc.add<bool>("isHLT", true);
desc.addUntracked<std::string>("rawFileName", "");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

//define this as a plug-in
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Ecal/plugins/EcalMustacheSCParametersMaker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion CondTools/Ecal/plugins/EcalSCDynamicDPhiParametersMaker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion CondTools/RunInfo/plugins/RunInfoTestESProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ void SiStripFEDCheckPlugin::fillDescriptions(edm::ConfigurationDescriptions& des
desc.add<double>("LSMin", 0.5);
desc.add<double>("LSMax", 5000.5);

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

//
Expand Down
2 changes: 1 addition & 1 deletion DQMServices/FileIO/plugins/DQMFileSaverOnline.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion DQMServices/FileIO/plugins/DQMFileSaverPB.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion DQMServices/FwkIO/plugins/DQMRootOutputModule.cc
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ void DQMRootOutputModule::fillDescriptions(edm::ConfigurationDescriptions& descr
desc.addUntracked<edm::ParameterSetDescription>("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);
2 changes: 1 addition & 1 deletion DQMServices/FwkIO/plugins/DQMRootSource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ void DQMRootSource::fillDescriptions(edm::ConfigurationDescriptions& description
desc.addUntracked<std::vector<edm::LuminosityBlockRange>>("lumisToProcess", defaultLumis)
->setComment("Skip any lumi inside the specified run:lumi range.");

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

//
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Common/test/TestReadTriggerResults.cc
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace edmtest {
desc.add<std::vector<unsigned int>>("expectedHLTStates");
desc.add<std::vector<unsigned int>>("expectedModuleIndexes");
desc.add<edm::InputTag>("triggerResultsTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Common/test/TestWriteTriggerResults.cc
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ namespace edmtest {
desc.add<std::vector<std::string>>("names");
desc.add<std::vector<unsigned int>>("hltStates");
desc.add<std::vector<unsigned int>>("moduleIndexes");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/DetId/test/TestReadVectorDetId.cc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ namespace edmtest {
edm::ParameterSetDescription desc;
desc.add<unsigned int>("expectedTestValue");
desc.add<edm::InputTag>("collectionTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/DetId/test/TestWriteVectorDetId.cc
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ namespace edmtest {
void TestWriteVectorDetId::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<unsigned int>("testValue");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace edmtest {
desc.add<std::vector<unsigned int>>("expectedFEDData0");
desc.add<std::vector<unsigned int>>("expectedFEDData3");
desc.add<edm::InputTag>("fedRawDataCollectionTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace edmtest {
edm::ParameterSetDescription desc;
desc.add<std::vector<unsigned int>>("FEDData0");
desc.add<std::vector<unsigned int>>("FEDData3");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/HLTReco/test/TestReadTriggerEvent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ namespace edmtest {
desc.add<std::vector<int>>("expectedFilterIds");
desc.add<std::vector<unsigned int>>("expectedFilterKeys");
desc.add<edm::InputTag>("triggerEventTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/HLTReco/test/TestWriteTriggerEvent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ namespace edmtest {
desc.add<unsigned int>("elementsPerVector");
desc.add<std::vector<int>>("filterIds");
desc.add<std::vector<unsigned int>>("filterKeys");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
3 changes: 1 addition & 2 deletions DataFormats/L1Scouting/test/TestReadL1Scouting.cc
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,7 @@ namespace edmtest {
desc.add<int>("bmtfStubClassVersion");
desc.add<std::vector<int>>("expectedBmtfStubValues");
desc.add<edm::InputTag>("bmtfStubTag");

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

void TestReadL1Scouting::throwWithMessageFromConstructor(const char* msg) const {
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/L1Scouting/test/TestWriteL1Scouting.cc
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ namespace edmtest {
desc.add<std::vector<int>>("tauValues");
desc.add<std::vector<int>>("bxSumsValues");
desc.add<std::vector<int>>("bmtfStubValues");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

void TestWriteL1Scouting::throwWithMessage(const char* msg) const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace edmtest {
desc.add<std::vector<unsigned int>>("expectedSDSData1");
desc.add<std::vector<unsigned int>>("expectedSDSData2");
desc.add<edm::InputTag>("sdsRawDataCollectionTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace edmtest {
edm::ParameterSetDescription desc;
desc.add<std::vector<unsigned int>>("SDSData1");
desc.add<std::vector<unsigned int>>("SDSData2");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ namespace edmtest {
desc.add<int>("expectedElementDelta");
desc.add<int>("expectedFinalValue");
desc.add<edm::InputTag>("globalObjectMapRecordTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ namespace edmtest {
desc.add<int>("firstElement");
desc.add<int>("elementDelta");

descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Scouting/test/TestReadRun2Scouting.cc
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ namespace edmtest {
desc.add<std::vector<double>>("expectedVertexFloatingPointValues");
desc.add<std::vector<int>>("expectedVertexIntegralValues");
desc.add<edm::InputTag>("vertexesTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

void TestReadRun2Scouting::analyzeCaloJets(edm::Event const& iEvent) const {
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Scouting/test/TestReadRun3Scouting.cc
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ namespace edmtest {
desc.add<std::vector<double>>("expectedVertexFloatingPointValues");
desc.add<std::vector<int>>("expectedVertexIntegralValues");
desc.add<edm::InputTag>("vertexesTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

void TestReadRun3Scouting::analyzeCaloJets(edm::Event const& iEvent) const {
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Scouting/test/TestWriteRun2Scouting.cc
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ namespace edmtest {
desc.add<std::vector<int>>("tracksIntegralValues");
desc.add<std::vector<double>>("vertexesFloatingPointValues");
desc.add<std::vector<int>>("vertexesIntegralValues");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

void TestWriteRun2Scouting::produceCaloJets(edm::Event& iEvent) const {
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Scouting/test/TestWriteRun3Scouting.cc
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ namespace edmtest {
desc.add<std::vector<int>>("tracksIntegralValues");
desc.add<std::vector<double>>("vertexesFloatingPointValues");
desc.add<std::vector<int>>("vertexesIntegralValues");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}

void TestWriteRun3Scouting::produceCaloJets(edm::Event& iEvent) const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ namespace edmtest {
edm::ParameterSetDescription desc;
desc.add<std::vector<unsigned int>>("expectedIntegralValues");
desc.add<edm::InputTag>("collectionTag");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ namespace edmtest {
void TestWriteSiStripApproximateClusterCollection::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<std::vector<unsigned int>>("integralValues");
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
} // namespace edmtest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading