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.

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

Changed beginStream of stream module to take StreamID #1134

Merged
merged 1 commit into from Oct 22, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FWCore/Framework/interface/stream/EDAnalyzerBase.h
Expand Up @@ -59,7 +59,7 @@ namespace edm {

void registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegistry* reg);

virtual void beginStream() {}
virtual void beginStream(StreamID) {}
virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
virtual void analyze(Event const&, EventSetup const&) = 0;
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/interface/stream/EDFilterBase.h
Expand Up @@ -56,7 +56,7 @@ namespace edm {

const EDFilterBase& operator=(const EDFilterBase&) = delete; // stop default

virtual void beginStream() {}
virtual void beginStream(StreamID) {}
virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
virtual bool filter(Event&, EventSetup const&) = 0;
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/interface/stream/EDProducerBase.h
Expand Up @@ -56,7 +56,7 @@ namespace edm {

const EDProducerBase& operator=(const EDProducerBase&) = delete; // stop default

virtual void beginStream() {}
virtual void beginStream(StreamID) {}
virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
virtual void produce(Event&, EventSetup const&) = 0;
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
Expand Up @@ -129,7 +129,7 @@ EDAnalyzerAdaptorBase::doBeginJob() {

void
EDAnalyzerAdaptorBase::doBeginStream(StreamID id) {
m_streamModules[id]->beginStream();
m_streamModules[id]->beginStream(id);
}
void
EDAnalyzerAdaptorBase::doEndStream(StreamID id) {
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
Expand Up @@ -121,7 +121,7 @@ namespace edm {
template< typename T>
void
ProducingModuleAdaptorBase<T>::doBeginStream(StreamID id) {
m_streamModules[id]->beginStream();
m_streamModules[id]->beginStream(id);
}
template< typename T>
void
Expand Down