From 3361022349065022d599acbcd3fdd716e81840a2 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 27 May 2013 12:42:37 +0000 Subject: [PATCH] --- yaml --- r: 133301 b: "refs/heads/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6" c: b4fb031862c462d89d3c33c3f544cce539cd83c7 h: "refs/heads/CMSSW_7_0_X" i: 133299: a1c34d5d5e4cbcdef7baf6dd80d8d718dc2b04aa --- [refs] | 2 +- .../SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.cc | 2 +- .../SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.h | 5 ++--- .../SimMuon/GEMDigitizer/src/GEMDigiProducer.cc | 2 +- .../SimMuon/GEMDigitizer/src/GEMDigiProducer.h | 5 ++--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index bc5320e418a62..946f8d6d614d3 100644 --- a/[refs] +++ b/[refs] @@ -1,4 +1,4 @@ --- refs/heads/gh-pages: 517fc50ef888eab98e534466557d7fe8de342307 "refs/heads/CMSSW_7_0_X": 74f7c9a4cf24913e2a9f4e6805bb2e8e25ab7d52 -"refs/heads/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6": f78cdfd7d00a6266cecf0298c919c43062743793 +"refs/heads/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6": b4fb031862c462d89d3c33c3f544cce539cd83c7 diff --git a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.cc b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.cc index 859187f431f42..2371d7d22df19 100644 --- a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.cc +++ b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.cc @@ -28,7 +28,7 @@ GEMCSCPadDigiProducer::~GEMCSCPadDigiProducer() {} -void GEMCSCPadDigiProducer::beginRun( edm::Run& r, const edm::EventSetup& eventSetup) +void GEMCSCPadDigiProducer::beginRun( const edm::Run& r, const edm::EventSetup& eventSetup) { edm::ESHandle hGeom; eventSetup.get().get( hGeom ); diff --git a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.h b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.h index 10621baa30314..6550df2d23ece 100644 --- a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.h +++ b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMCSCPadDigiProducer.h @@ -24,11 +24,10 @@ class GEMCSCPadDigiProducer : public edm::EDProducer explicit GEMCSCPadDigiProducer(const edm::ParameterSet& ps); virtual ~GEMCSCPadDigiProducer(); - virtual void beginRun( edm::Run&, const edm::EventSetup& ); - virtual void endRun( edm::Run&, const edm::EventSetup& ) {} + virtual void beginRun( const edm::Run&, const edm::EventSetup& ) override; /** Produces the EDM products */ - virtual void produce(edm::Event& e, const edm::EventSetup& c); + virtual void produce(edm::Event& e, const edm::EventSetup& c) override; private: diff --git a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.cc b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.cc index 8a0e502742c18..2bf57b43cddd7 100644 --- a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.cc +++ b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.cc @@ -56,7 +56,7 @@ GEMDigiProducer::~GEMDigiProducer() } -void GEMDigiProducer::beginRun( edm::Run& r, const edm::EventSetup& eventSetup) +void GEMDigiProducer::beginRun( const edm::Run& r, const edm::EventSetup& eventSetup) { edm::ESHandle hGeom; eventSetup.get().get( hGeom ); diff --git a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.h b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.h index 6be5bd54fa52e..0b4ec9e63f9be 100644 --- a/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.h +++ b/branches/hcalrh_pf_mods_in_CMSSW_6_2_0_SLHC6/SimMuon/GEMDigitizer/src/GEMDigiProducer.h @@ -22,11 +22,10 @@ class GEMDigiProducer : public edm::EDProducer explicit GEMDigiProducer(const edm::ParameterSet& ps); virtual ~GEMDigiProducer(); - virtual void beginRun( edm::Run&, const edm::EventSetup& ); - virtual void endRun( edm::Run&, const edm::EventSetup& ) {} + virtual void beginRun( const edm::Run&, const edm::EventSetup& ) override; /**Produces the EDM products,*/ - virtual void produce(edm::Event& e, const edm::EventSetup& c); + virtual void produce(edm::Event& e, const edm::EventSetup& c) override; void setGEMSetUp(std::vector, std::vector);