Merge pull request cms-sw#2384 from gartung/L1Trigger-CSCTriggerPrimitives-edm-one-producer

ktf · ktf · commit 11e609e93c19 · 2014-02-27T11:56:45.000+01:00
Multithreading fixes -- Make CSCTriggerPrimitivesProducer inherit from edm::one::producer becaus...
diff --git a/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.cc b/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.cc
@@ -52,6 +52,7 @@ CSCTriggerPrimitivesProducer::CSCTriggerPrimitivesProducer(const edm::ParameterS
   produces<CSCCLCTPreTriggerCollection>();
   produces<CSCCorrelatedLCTDigiCollection>();
   produces<CSCCorrelatedLCTDigiCollection>("MPCSORTED");
+  usesResource("CSCTriggerGeometry");
 }
 
 CSCTriggerPrimitivesProducer::~CSCTriggerPrimitivesProducer() {
diff --git a/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.h b/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.h
@@ -21,14 +21,14 @@
  */
 
 #include <FWCore/Framework/interface/Frameworkfwd.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include <FWCore/Framework/interface/one/EDProducer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 #include <FWCore/Utilities/interface/InputTag.h>
 
 class CSCTriggerPrimitivesBuilder;
 
-class CSCTriggerPrimitivesProducer : public edm::EDProducer
+class CSCTriggerPrimitivesProducer : public edm::one::EDProducer<edm::one::SharedResources>
 {
  public:
   explicit CSCTriggerPrimitivesProducer(const edm::ParameterSet&);

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ CSCTriggerPrimitivesProducer::CSCTriggerPrimitivesProducer(const edm::ParameterS`
`52`	`52`	`produces<CSCCLCTPreTriggerCollection>();`
`53`	`53`	`produces<CSCCorrelatedLCTDigiCollection>();`
`54`	`54`	`produces<CSCCorrelatedLCTDigiCollection>("MPCSORTED");`
	`55`	`+ usesResource("CSCTriggerGeometry");`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`CSCTriggerPrimitivesProducer::~CSCTriggerPrimitivesProducer() {`