From 42f0cbf3736028245867ceef78ca8711aadd97dc Mon Sep 17 00:00:00 2001 From: Saba Sehrish Date: Tue, 7 Feb 2017 11:39:25 -0600 Subject: [PATCH 1/3] Converted to one module --- EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h | 4 ++-- EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h b/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h index 77415328dbec4..e6543f6fc69b5 100644 --- 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 -class CSCTFPacker : public edm::EDProducer { +class CSCTFPacker : public edm::one::EDProducer { private: edm::InputTag lctProducer, mbProducer, trackProducer; diff --git a/EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc b/EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc index 274de9a0e52bc..1e0a3c1823aed 100644 --- 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("zeroSuppression"); nTBINs = conf.getParameter ("nTBINs"); From 70534c372cc182c99de8e487d6981e6aebe16916 Mon Sep 17 00:00:00 2001 From: Saba Sehrish Date: Tue, 7 Feb 2017 11:50:43 -0600 Subject: [PATCH 2/3] added override --- EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h b/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h index e6543f6fc69b5..eeea77e815d3b 100644 --- a/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h +++ b/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h @@ -35,7 +35,7 @@ class CSCTFPacker : public edm::one::EDProducer { edm::EDGetTokenT 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); From 4d76f132a60badf68cb2fa1d67181bb2bb37b3bd Mon Sep 17 00:00:00 2001 From: Saba Sehrish Date: Tue, 7 Feb 2017 14:53:37 -0600 Subject: [PATCH 3/3] removed SharedResource --- EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h | 2 +- EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h b/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h index eeea77e815d3b..6ce165c2dfc80 100644 --- a/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h +++ b/EventFilter/CSCTFRawToDigi/interface/CSCTFPacker.h @@ -15,7 +15,7 @@ #include -class CSCTFPacker : public edm::one::EDProducer { +class CSCTFPacker : public edm::one::EDProducer<> { private: edm::InputTag lctProducer, mbProducer, trackProducer; diff --git a/EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc b/EventFilter/CSCTFRawToDigi/plugins/CSCTFPacker.cc index 1e0a3c1823aed..df2d58b153512 100644 --- 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::one::EDProducer(){ +CSCTFPacker::CSCTFPacker(const edm::ParameterSet &conf):edm::one::EDProducer<>(){ // "Readout" configuration zeroSuppression = conf.getParameter("zeroSuppression"); nTBINs = conf.getParameter ("nTBINs");