Merge pull request #17452 from sabasehrish/ss_EF_CSCTFRawToDigi_ns

Converted CSCTFPacker to one module
cms-sw · Feb 18, 2017 · 89950fe · 89950fe
2 parents 1b23108 + 4d76f13
commit 89950fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h b/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h
@@ -3,7 +3,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.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/Framework/interface/EventSetup.h"
@@ -15,7 +15,7 @@
 
 #include <string>
 
-class CSCTFPacker : public edm::EDProducer {
+class CSCTFPacker : public edm::one::EDProducer<> {
 private:
 	edm::InputTag lctProducer, mbProducer, trackProducer;
 
@@ -35,7 +35,7 @@ class CSCTFPacker : public edm::EDProducer {
 	edm::EDGetTokenT<L1CSCTrackCollection> L1CSCTr_Tok;
 
 public:
-	virtual void produce(edm::Event& e, const edm::EventSetup& c);
+	virtual void produce(edm::Event& e, const edm::EventSetup& c) override;
 
 	explicit CSCTFPacker(const edm::ParameterSet &conf);
 	~CSCTFPacker(void);

diff --git a/EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc b/EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc
@@ -20,7 +20,7 @@
 #include "FWCore/Utilities/interface/CRC16.h"
 
 
-CSCTFPacker::CSCTFPacker(const edm::ParameterSet &conf):edm::EDProducer(){
+CSCTFPacker::CSCTFPacker(const edm::ParameterSet &conf):edm::one::EDProducer<>(){
 	// "Readout" configuration
 	zeroSuppression = conf.getParameter<bool>("zeroSuppression");
 	nTBINs          = conf.getParameter<int> ("nTBINs");