Merge pull request #28154 from wddgit/producesCollector2

Initial Implementation of ProducesCollector
cms-sw · Oct 30, 2019 · f42c909 · f42c909
2 parents 88f1911 + ef9f5cd
commit f42c909
Show file tree

Hide file tree

Showing 109 changed files with 738 additions and 352 deletions.
diff --git a/EventFilter/L1TRawToDigi/interface/PackingSetup.h b/EventFilter/L1TRawToDigi/interface/PackingSetup.h
@@ -3,6 +3,7 @@
 
 #include <map>
 
+#include "FWCore/Framework/interface/ProducesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 #include "EventFilter/L1TRawToDigi/interface/Packer.h"
@@ -15,9 +16,6 @@ namespace edm {
   class ConsumesCollector;
   class Event;
   class ParameterSet;
-  namespace stream {
-    class EDProducerBase;
-  }
 }  // namespace edm
 
 namespace l1t {
@@ -31,7 +29,7 @@ namespace l1t {
     PackingSetup(){};
     virtual ~PackingSetup(){};
     virtual std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet&, edm::ConsumesCollector&) = 0;
-    virtual void registerProducts(edm::stream::EDProducerBase&) = 0;
+    virtual void registerProducts(edm::ProducesCollector) = 0;
 
     // Get a map of (amc #, board id) ↔ list of packing functions for a specific FED, FW combination
     virtual PackerMap getPackers(int fed, unsigned int fw) = 0;

diff --git a/EventFilter/L1TRawToDigi/plugins/L1TRawToDigi.cc b/EventFilter/L1TRawToDigi/plugins/L1TRawToDigi.cc
@@ -107,7 +107,7 @@ namespace l1t {
     }
 
     prov_ = PackingSetupFactory::get()->make(config.getParameter<std::string>("Setup"));
-    prov_->registerProducts(*this);
+    prov_->registerProducts(producesCollector());
 
     slinkHeaderSize_ = config.getUntrackedParameter<int>("lenSlinkHeader");
     slinkTrailerSize_ = config.getUntrackedParameter<int>("lenSlinkTrailer");

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.cc
@@ -1,4 +1,3 @@
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "EventFilter/L1TRawToDigi/plugins/PackerFactory.h"
@@ -43,7 +42,7 @@ PackerMap CaloSetup::getPackers(int fed, unsigned int fw) {
   return res;
 }
 
-void CaloSetup::registerProducts(edm::stream::EDProducerBase& prod) {
+void CaloSetup::registerProducts(edm::ProducesCollector prod) {
   prod.produces<L1CaloEmCollection>();
   prod.produces<CaloSpareBxCollection>("HFBitCounts");
   prod.produces<CaloSpareBxCollection>("HFRingSums");

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h
@@ -5,6 +5,7 @@
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
 
 #include "EventFilter/L1TRawToDigi/interface/PackingSetup.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "CaloCollections.h"
 #include "CaloTokens.h"
@@ -17,7 +18,7 @@ namespace l1t {
       std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
       void fillDescription(edm::ParameterSetDescription& desc) override;
       PackerMap getPackers(int fed, unsigned int fw) override;
-      void registerProducts(edm::stream::EDProducerBase& prod) override;
+      void registerProducts(edm::ProducesCollector) override;
       std::unique_ptr<UnpackerCollections> getCollections(edm::Event& e) override;
       UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override;
     };

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.cc
@@ -1,5 +1,3 @@
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
-
 #include "EventFilter/L1TRawToDigi/plugins/PackerFactory.h"
 #include "EventFilter/L1TRawToDigi/plugins/PackingSetupFactory.h"
 #include "EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h"
@@ -61,7 +59,7 @@ namespace l1t {
       return res;
     }  //getPackers
 
-    void BMTFSetup::registerProducts(edm::stream::EDProducerBase& prod) {
+    void BMTFSetup::registerProducts(edm::ProducesCollector prod) {
       prod.produces<RegionalMuonCandBxCollection>("BMTF");
       prod.produces<RegionalMuonCandBxCollection>("BMTF2");
       prod.produces<L1MuDTChambPhContainer>();

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.h
@@ -4,6 +4,7 @@
 #include "EventFilter/L1TRawToDigi/interface/Packer.h"
 #include "EventFilter/L1TRawToDigi/interface/PackingSetup.h"
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "BMTFCollections.h"
 #include "BMTFTokens.h"
@@ -16,7 +17,7 @@ namespace l1t {
       std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
       void fillDescription(edm::ParameterSetDescription& desc) override;
       PackerMap getPackers(int fed, unsigned int fw) override;
-      void registerProducts(edm::stream::EDProducerBase& prod) override;
+      void registerProducts(edm::ProducesCollector) override;
       std::unique_ptr<UnpackerCollections> getCollections(edm::Event& e) override;
       UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override;
     };

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.cc
@@ -1,4 +1,3 @@
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "EventFilter/L1TRawToDigi/plugins/PackerFactory.h"
@@ -52,7 +51,7 @@ namespace l1t {
       return res;
     }
 
-    void CaloLayer1Setup::registerProducts(edm::stream::EDProducerBase& prod) {
+    void CaloLayer1Setup::registerProducts(edm::ProducesCollector prod) {
       prod.produces<EcalTrigPrimDigiCollection>();
       prod.produces<HcalTrigPrimDigiCollection>();
       prod.produces<L1CaloRegionCollection>();

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.h
@@ -5,6 +5,7 @@
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
 
 #include "EventFilter/L1TRawToDigi/interface/PackingSetup.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "CaloLayer1Collections.h"
 #include "CaloLayer1Tokens.h"
@@ -16,7 +17,7 @@ namespace l1t {
       std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
       void fillDescription(edm::ParameterSetDescription& desc) override;
       PackerMap getPackers(int fed, unsigned int fw) override;
-      void registerProducts(edm::stream::EDProducerBase& prod) override;
+      void registerProducts(edm::ProducesCollector) override;
       std::unique_ptr<UnpackerCollections> getCollections(edm::Event& e) override;
       UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override;
     };

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSetup.cc
@@ -1,5 +1,3 @@
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
-
 #include "EventFilter/L1TRawToDigi/plugins/PackerFactory.h"
 #include "EventFilter/L1TRawToDigi/plugins/PackingSetupFactory.h"
 #include "EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h"
@@ -32,7 +30,7 @@ namespace l1t {
       return res;
     }
 
-    void CaloSetup::registerProducts(edm::stream::EDProducerBase& prod) {
+    void CaloSetup::registerProducts(edm::ProducesCollector prod) {
       prod.produces<CaloTowerBxCollection>("CaloTower");
       prod.produces<EGammaBxCollection>("EGamma");
       prod.produces<EtSumBxCollection>("EtSum");

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSetup.h
@@ -5,6 +5,7 @@
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
 
 #include "EventFilter/L1TRawToDigi/interface/PackingSetup.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "CaloCollections.h"
 #include "CaloTokens.h"
@@ -16,7 +17,7 @@ namespace l1t {
       std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
       void fillDescription(edm::ParameterSetDescription& desc) override;
       PackerMap getPackers(int fed, unsigned int fw) override;
-      void registerProducts(edm::stream::EDProducerBase& prod) override;
+      void registerProducts(edm::ProducesCollector) override;
       std::unique_ptr<UnpackerCollections> getCollections(edm::Event& e) override;
       UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override;
     };

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc
@@ -1,4 +1,3 @@
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "EventFilter/L1TRawToDigi/plugins/PackerFactory.h"
@@ -35,7 +34,7 @@ namespace l1t {
       return res;
     }
 
-    void EMTFSetup::registerProducts(edm::stream::EDProducerBase& prod) {
+    void EMTFSetup::registerProducts(edm::ProducesCollector prod) {
       prod.produces<RegionalMuonCandBxCollection>();
       prod.produces<EMTFDaqOutCollection>();
       prod.produces<EMTFHitCollection>();

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.h
@@ -5,6 +5,7 @@
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
 
 #include "EventFilter/L1TRawToDigi/interface/PackingSetup.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "EMTFCollections.h"
 #include "EMTFTokens.h"
@@ -16,7 +17,7 @@ namespace l1t {
       std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
       void fillDescription(edm::ParameterSetDescription& desc) override;
       PackerMap getPackers(int fed, unsigned int fw) override;
-      void registerProducts(edm::stream::EDProducerBase& prod) override;
+      void registerProducts(edm::ProducesCollector) override;
       std::unique_ptr<UnpackerCollections> getCollections(edm::Event& e) override;
       UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override;
     };

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GMTSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GMTSetup.cc
@@ -1,4 +1,3 @@
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "EventFilter/L1TRawToDigi/plugins/PackerFactory.h"
@@ -48,7 +47,7 @@ namespace l1t {
       return res;
     }
 
-    void GMTSetup::registerProducts(edm::stream::EDProducerBase& prod) {
+    void GMTSetup::registerProducts(edm::ProducesCollector prod) {
       prod.produces<RegionalMuonCandBxCollection>("BMTF");
       prod.produces<RegionalMuonCandBxCollection>("OMTF");
       prod.produces<RegionalMuonCandBxCollection>("EMTF");

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GMTSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GMTSetup.h
@@ -5,6 +5,7 @@
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
 
 #include "EventFilter/L1TRawToDigi/interface/PackingSetup.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "GMTCollections.h"
 #include "GMTTokens.h"
@@ -16,7 +17,7 @@ namespace l1t {
       std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
       void fillDescription(edm::ParameterSetDescription& desc) override;
       PackerMap getPackers(int fed, unsigned int fw) override;
-      void registerProducts(edm::stream::EDProducerBase& prod) override;
+      void registerProducts(edm::ProducesCollector) override;
       std::unique_ptr<UnpackerCollections> getCollections(edm::Event& e) override;
       UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override;
     };

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.cc
@@ -1,5 +1,3 @@
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
-
 #include "EventFilter/L1TRawToDigi/plugins/PackerFactory.h"
 #include "EventFilter/L1TRawToDigi/plugins/PackingSetupFactory.h"
 #include "EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h"
@@ -47,7 +45,7 @@ namespace l1t {
       return res;
     }
 
-    void GTSetup::registerProducts(edm::stream::EDProducerBase& prod) {
+    void GTSetup::registerProducts(edm::ProducesCollector prod) {
       prod.produces<MuonBxCollection>("Muon");
       prod.produces<EGammaBxCollection>("EGamma");
       prod.produces<EtSumBxCollection>("EtSum");

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h
@@ -5,6 +5,7 @@
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
 
 #include "EventFilter/L1TRawToDigi/interface/PackingSetup.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "GTCollections.h"
 #include "GTTokens.h"
@@ -17,7 +18,7 @@ namespace l1t {
       std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
       void fillDescription(edm::ParameterSetDescription& desc) override;
       PackerMap getPackers(int fed, unsigned int fw) override;
-      void registerProducts(edm::stream::EDProducerBase& prod) override;
+      void registerProducts(edm::ProducesCollector) override;
       std::unique_ptr<UnpackerCollections> getCollections(edm::Event& e) override;
       UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override;
     };

diff --git a/EventFilter/RPCRawToDigi/plugins/RPCAMCRawToDigi.cc b/EventFilter/RPCRawToDigi/plugins/RPCAMCRawToDigi.cc
@@ -22,8 +22,8 @@ RPCAMCRawToDigi::RPCAMCRawToDigi(edm::ParameterSet const &config)
       fill_counters_(config.getParameter<bool>("fillCounters")),
       rpc_unpacker_(
           RPCAMCUnpackerFactory::get()->create(config.getParameter<std::string>("RPCAMCUnpacker"),
-                                               *this,
-                                               config.getParameter<edm::ParameterSet>("RPCAMCUnpackerSettings"))) {
+                                               config.getParameter<edm::ParameterSet>("RPCAMCUnpackerSettings"),
+                                               producesCollector())) {
   if (fill_counters_) {
     produces<RPCAMCLinkCounters>();
   }

diff --git a/EventFilter/RPCRawToDigi/plugins/RPCAMCUnpacker.cc b/EventFilter/RPCRawToDigi/plugins/RPCAMCUnpacker.cc
@@ -2,8 +2,7 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-RPCAMCUnpacker::RPCAMCUnpacker(edm::stream::EDProducerBase& producer, edm::ParameterSet const& config) {}
-
+RPCAMCUnpacker::RPCAMCUnpacker(edm::ParameterSet const&, edm::ProducesCollector) {}
 RPCAMCUnpacker::~RPCAMCUnpacker() {}
 
 void RPCAMCUnpacker::fillDescription(edm::ParameterSetDescription& desc) {

diff --git a/EventFilter/RPCRawToDigi/plugins/RPCAMCUnpacker.h b/EventFilter/RPCRawToDigi/plugins/RPCAMCUnpacker.h
@@ -6,21 +6,19 @@
 
 #include "CondFormats/RPCObjects/interface/RPCAMCLink.h"
 #include "EventFilter/RPCRawToDigi/interface/RPCAMC13Record.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 namespace edm {
   class Event;
   class EventSetup;
   class ParameterSet;
   class ParameterSetDescription;
   class Run;
-  namespace stream {
-    class EDProducerBase;
-  }  // namespace stream
 }  // namespace edm
 
 class RPCAMCUnpacker {
 public:
-  RPCAMCUnpacker(edm::stream::EDProducerBase& producer, edm::ParameterSet const& config);
+  RPCAMCUnpacker(edm::ParameterSet const&, edm::ProducesCollector);
   virtual ~RPCAMCUnpacker();
 
   static void fillDescription(edm::ParameterSetDescription& desc);

diff --git a/EventFilter/RPCRawToDigi/plugins/RPCAMCUnpackerFactory.h b/EventFilter/RPCRawToDigi/plugins/RPCAMCUnpackerFactory.h
@@ -1,18 +1,16 @@
 #ifndef EventFilter_RPCRawToDigi_RPCAMCUnpackerFactory_h
 #define EventFilter_RPCRawToDigi_RPCAMCUnpackerFactory_h
 
+#include "FWCore/Framework/interface/ProducesCollector.h"
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
 namespace edm {
   class ParameterSet;
-  namespace stream {
-    class EDProducerBase;
-  }  // namespace stream
 }  // namespace edm
 
 class RPCAMCUnpacker;
 
-typedef edmplugin::PluginFactory<RPCAMCUnpacker *(edm::stream::EDProducerBase &producer, edm::ParameterSet const &)>
+typedef edmplugin::PluginFactory<RPCAMCUnpacker *(edm::ParameterSet const &, edm::ProducesCollector)>
     RPCAMCUnpackerFactory;
 
 #endif  // EventFilter_RPCRawToDigi_RPCAMCUnpackerFactory_h
diff --git a/EventFilter/RPCRawToDigi/plugins/RPCCPPFUnpacker.cc b/EventFilter/RPCRawToDigi/plugins/RPCCPPFUnpacker.cc
@@ -5,7 +5,6 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/stream/EDProducerBase.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
@@ -16,15 +15,15 @@
 #include "EventFilter/RPCRawToDigi/interface/RPCAMCLinkEvents.h"
 #include "EventFilter/RPCRawToDigi/interface/RPCMP7Record.h"
 
-RPCCPPFUnpacker::RPCCPPFUnpacker(edm::stream::EDProducerBase& producer, edm::ParameterSet const& config)
-    : RPCAMCUnpacker(producer, config),
+RPCCPPFUnpacker::RPCCPPFUnpacker(edm::ParameterSet const& config, edm::ProducesCollector producesCollector)
+    : RPCAMCUnpacker(config, producesCollector),
       fill_counters_(config.getParameter<bool>("fillAMCCounters")),
       bx_min_(config.getParameter<int>("bxMin")),
       bx_max_(config.getParameter<int>("bxMax")) {
-  producer.produces<RPCDigiCollection>();
-  producer.produces<l1t::CPPFDigiCollection>();
+  producesCollector.produces<RPCDigiCollection>();
+  producesCollector.produces<l1t::CPPFDigiCollection>();
   if (fill_counters_) {
-    producer.produces<RPCAMCLinkCounters>("RPCAMCUnpacker");
+    producesCollector.produces<RPCAMCLinkCounters>("RPCAMCUnpacker");
   }
 }
 

diff --git a/EventFilter/RPCRawToDigi/plugins/RPCCPPFUnpacker.h b/EventFilter/RPCRawToDigi/plugins/RPCCPPFUnpacker.h
@@ -6,6 +6,7 @@
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Framework/interface/ProducesCollector.h"
 
 #include "CondFormats/DataRecord/interface/RPCCPPFLinkMapRcd.h"
 #include "CondFormats/RPCObjects/interface/RPCAMCLinkMap.h"
@@ -21,7 +22,7 @@ class RPCAMCLinkCounters;
 
 class RPCCPPFUnpacker : public RPCAMCUnpacker {
 public:
-  RPCCPPFUnpacker(edm::stream::EDProducerBase& producer, edm::ParameterSet const& config);
+  RPCCPPFUnpacker(edm::ParameterSet const&, edm::ProducesCollector);
 
   void beginRun(edm::Run const& run, edm::EventSetup const& setup) override;
   void produce(edm::Event& event,

diff --git a/FWCore/Framework/interface/ProducerBase.h b/FWCore/Framework/interface/ProducerBase.h
@@ -20,6 +20,7 @@ EDProducts into an Event.
 namespace edm {
   class BranchDescription;
   class ModuleDescription;
+  class ProducesCollector;
   class ProductRegistry;
   class Event;
   class LuminosityBlock;
@@ -72,7 +73,6 @@ namespace edm {
 
     void registerProducts(ProducerBase*, ProductRegistry*, ModuleDescription const&);
 
-    using ProductRegistryHelper::produces;
     using ProductRegistryHelper::recordProvenanceList;
     using ProductRegistryHelper::typeLabelList;
 
@@ -94,6 +94,10 @@ namespace edm {
       return putTokenToResolverIndex_;
     }
 
+  protected:
+    ProducesCollector producesCollector();
+    using ProductRegistryHelper::produces;
+
   private:
     friend class EDProducer;
     friend class EDFilter;