Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert HcalRealisticZS to stream module #6092

Merged
merged 1 commit into from Oct 29, 2014
Merged

Convert HcalRealisticZS to stream module #6092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.cc
View file
Open in desktop
Expand Up @@ -62,8 +62,8 @@ HcalRealisticZS::HcalRealisticZS(edm::ParameterSet const& conf):
//which means that channel-by-channel ZS thresholds from DB will NOT be used
if ( conf.getParameter<int>("useConfigZSvalues") ) {

algo_=std::auto_ptr<HcalZSAlgoRealistic>
(new HcalZSAlgoRealistic (markAndPass,
algo_.reset(
new HcalZSAlgoRealistic (markAndPass,
conf.getParameter<int>("HBlevel"),
conf.getParameter<int>("HElevel"),
conf.getParameter<int>("HOlevel"),
Expand All @@ -76,8 +76,8 @@ HcalRealisticZS::HcalRealisticZS(edm::ParameterSet const& conf):

} else {

algo_=std::auto_ptr<HcalZSAlgoRealistic>
(new HcalZSAlgoRealistic(markAndPass,
algo_.reset(
new HcalZSAlgoRealistic(markAndPass,
HBsearchTS,
HEsearchTS,
HOsearchTS,
Expand Down
8 changes: 4 additions & 4 deletions SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.h
View file
Open in desktop
@@ -1,7 +1,7 @@
#ifndef HCALSIMPLEREALISTICZS_H
#define HCALSIMPLEREALISTICZS_H 1

#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "DataFormats/Common/interface/Handle.h"

Expand All @@ -17,13 +17,13 @@

\author J. Mans - Minnesota
*/
class HcalRealisticZS : public edm::EDProducer {
class HcalRealisticZS : public edm::stream::EDProducer<> {
public:
explicit HcalRealisticZS(const edm::ParameterSet& ps);
virtual ~HcalRealisticZS();
virtual void produce(edm::Event& e, const edm::EventSetup& c);
virtual void produce(edm::Event& e, const edm::EventSetup& c) override;
private:
std::auto_ptr<HcalZSAlgoRealistic> algo_;
std::unique_ptr<HcalZSAlgoRealistic> algo_;
std::string inputLabel_;
edm::EDGetTokenT<HBHEDigiCollection> tok_hbhe_;
edm::EDGetTokenT<HODigiCollection> tok_ho_;
Expand Down