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

Bug fix. This bug will break the DataMixingModule completely. #2047

Merged
merged 1 commit into from Jan 17, 2014
Merged

Bug fix. This bug will break the DataMixingModule completely. #2047

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
4 changes: 3 additions & 1 deletion SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
View file
Open in desktop
Expand Up @@ -408,13 +408,15 @@ namespace edm



void DataMixingModule::doPileUp(edm::Event &e, const edm::EventSetup& ES, edm::ModuleCallingContext const* mcc)
void DataMixingModule::doPileUp(edm::Event &e, const edm::EventSetup& ES)
{
std::vector<edm::EventID> recordEventID;
std::vector<int> PileupList;
PileupList.clear();
TrueNumInteractions_.clear();

ModuleCallingContext const* mcc = e.moduleCallingContext();

for (int bunchCrossing=minBunch_;bunchCrossing<=maxBunch_;++bunchCrossing) {
for (unsigned int isource=0;isource<maxNbSources_;++isource) {
boost::shared_ptr<PileUp> source = inputSources_[isource];
Expand Down
2 changes: 1 addition & 1 deletion SimGeneral/DataMixingModule/plugins/DataMixingModule.h
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ namespace edm {
virtual void checkSignal(const edm::Event &e) {}
virtual void createnewEDProduct() {}
virtual void addSignals(const edm::Event &e, const edm::EventSetup& ES);
virtual void doPileUp(edm::Event &e,const edm::EventSetup& ES, edm::ModuleCallingContext const* mcc);
virtual void doPileUp(edm::Event &e,const edm::EventSetup& ES) override;
virtual void put(edm::Event &e,const edm::EventSetup& ES) ;

void pileWorker(const edm::EventPrincipal&, int bcr, int EventId,const edm::EventSetup& ES, ModuleCallingContext const*);
Expand Down