Merge pull request #29998 from cms-tsg-storm/FixesForPSetBlobProducer…

…In11 Fixes in PSetBlobProducer functionality for use in HLT
cms-sw · May 28, 2020 · f5e9b44 · f5e9b44
2 parents 8f3c8ea + 514b10b
commit f5e9b44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
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