Merge pull request cms-sw#29998 from cms-tsg-storm/FixesForPSetBlobProducerIn11

cmsbuild · web-flow · commit f5e9b440e0b6 · 2020-05-28T12:29:14.000+05:00
Fixes in PSetBlobProducer functionality for use in HLT
diff --git a/EventFilter/Utilities/src/EvFOutputModule.cc b/EventFilter/Utilities/src/EvFOutputModule.cc
@@ -140,7 +140,7 @@ namespace evf {
     edm::ParameterSetDescription desc;
     edm::StreamerOutputModuleCommon::fillDescription(desc);
     EvFOutputModuleType::fillDescription(desc);
-    desc.addUntracked<edm::InputTag>("psetMap", {"psetMap"})
+    desc.addUntracked<edm::InputTag>("psetMap", {"hltPSetMap"})
         ->setComment("Optionally allow the map of ParameterSets to be calculated externally.");
     descriptions.addDefault(desc);
   }
diff --git a/IOPool/Streamer/plugins/ParameterSetBlobProducer.cc b/IOPool/Streamer/plugins/ParameterSetBlobProducer.cc
@@ -15,7 +15,10 @@ class ParameterSetBlobProducer : public edm::global::EDProducer<edm::BeginRunPro
 
   void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const final;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions&) {}
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+    edm::ParameterSetDescription desc;
+    descriptions.addWithDefaultLabel(desc);
+  }
 
 private:
   edm::EDPutTokenT<std::map<edm::ParameterSetID, edm::ParameterSetBlob>> const token_;
diff --git a/IOPool/Streamer/src/StreamerOutputModuleBase.cc b/IOPool/Streamer/src/StreamerOutputModuleBase.cc
@@ -68,7 +68,7 @@ namespace edm {
   void StreamerOutputModuleBase::fillDescription(ParameterSetDescription& desc) {
     StreamerOutputModuleCommon::fillDescription(desc);
     OutputModule::fillDescription(desc);
-    desc.addUntracked<edm::InputTag>("psetMap", {"psetMap"})
+    desc.addUntracked<edm::InputTag>("psetMap", {"hltPSetMap"})
         ->setComment("Optionally allow the map of ParameterSets to be calculated externally.");
   }
 }  // namespace edm

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ namespace evf {`
`140`	`140`	`edm::ParameterSetDescription desc;`
`141`	`141`	`edm::StreamerOutputModuleCommon::fillDescription(desc);`
`142`	`142`	`EvFOutputModuleType::fillDescription(desc);`
`143`		`- desc.addUntracked<edm::InputTag>("psetMap", {"psetMap"})`
	`143`	`+ desc.addUntracked<edm::InputTag>("psetMap", {"hltPSetMap"})`
`144`	`144`	`->setComment("Optionally allow the map of ParameterSets to be calculated externally.");`
`145`	`145`	`descriptions.addDefault(desc);`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ namespace edm {`
`68`	`68`	`void StreamerOutputModuleBase::fillDescription(ParameterSetDescription& desc) {`
`69`	`69`	`StreamerOutputModuleCommon::fillDescription(desc);`
`70`	`70`	`OutputModule::fillDescription(desc);`
`71`		`- desc.addUntracked<edm::InputTag>("psetMap", {"psetMap"})`
	`71`	`+ desc.addUntracked<edm::InputTag>("psetMap", {"hltPSetMap"})`
`72`	`72`	`->setComment("Optionally allow the map of ParameterSets to be calculated externally.");`
`73`	`73`	`}`
`74`	`74`	`} // namespace edm`