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

FWLite MultiChainEvent: avoid crash on empty files (76X) #10897

Merged
merged 3 commits into from Aug 22, 2015
Merged

FWLite MultiChainEvent: avoid crash on empty files (76X) #10897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cac7ef2
DataFormats/FWLite: avoid crash in MultiChainEvent constructor if the…
gpetruc Aug 13, 2015
c36824a
DataFormats/FWLite: ChainEvent: fix also toBegin and atEnd, so that '…
gpetruc Aug 13, 2015
d0fc197
Add unit tests of multichain with empty files
gpetruc Aug 18, 2015
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 DataFormats/FWLite/src/ChainEvent.cc
View file
Open in desktop
Expand Up @@ -199,6 +199,7 @@ ChainEvent::to(edm::RunNumber_t run, edm::EventNumber_t event)
ChainEvent const&
ChainEvent::toBegin()
{
if (!size()) return *this;
if (eventIndex_ != 0)
{
switchToFile(0);
Expand Down Expand Up @@ -301,6 +302,7 @@ ChainEvent::operator bool() const
bool
ChainEvent::atEnd() const
{
if (!size()) return true;
if (eventIndex_ == static_cast<Long64_t>(fileNames_.size())-1) {
return event_->atEnd();
}
Expand All @@ -310,7 +312,7 @@ ChainEvent::atEnd() const
Long64_t
ChainEvent::size() const
{
return accumulatedSize_.back();
return accumulatedSize_.empty() ? 0 : accumulatedSize_.back();
}

edm::TriggerNames const&
Expand Down
11 changes: 9 additions & 2 deletions DataFormats/FWLite/src/MultiChainEvent.cc
View file
Open in desktop
Expand Up @@ -77,8 +77,15 @@ namespace fwlite {

getter_ = std::shared_ptr<internal::MultiProductGetter>(new internal::MultiProductGetter(this));

event1_->setGetter(getter_);
event2_->setGetter(getter_);
if (event1_->size() == 0) {
std::cout << "------------------------------------------------------------------------" << std::endl;
std::cout << "WARNING! MultiChainEvent: all primary files have zero events." << std::endl;
std::cout << "Trying to access the events may lead to a crash. " << std::endl;
std::cout << "------------------------------------------------------------------------" << std::endl;
} else {
event1_->setGetter(getter_);
event2_->setGetter(getter_);
}

useSecFileMapSorted_ = useSecFileMapSorted;

Expand Down
14 changes: 14 additions & 0 deletions DataFormats/FWLite/test/pyroot_multichain.py
View file
Open in desktop
@@ -0,0 +1,14 @@
#! /usr/bin/env python
import ROOT
from DataFormats.FWLite import Events, Handle
import FWCore.ParameterSet.VarParsing as VarParsing
options = VarParsing.VarParsing ('analysis')
options.parseArguments()
events = Events(options)

print "In total there are %d events" % events.size()
print "Trying an event loop"
for i,event in enumerate(events):
print "I am processing an event"
if i > 10: break
print "Done with the event loops"
2 changes: 2 additions & 0 deletions DataFormats/FWLite/test/run_all_t.sh
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@ ${LOCAL_TEST_DIR}/VIPTest.sh || die 'Failed to create file' $?
root -b -n -q ${LOCAL_TEST_DIR}/vector_int_cint.C || die 'Failed in vector_int_cint.C' $?

python ${LOCAL_TEST_DIR}/pyroot_handle_reuse.py || die 'Failed in pyroot_handle_reuse.py' $?
python ${LOCAL_TEST_DIR}/pyroot_multichain.py inputFiles=file:prodmerge.root secondaryInputFiles=file:prod1.root,file:prod2.root || die 'Failed in pyroot_multichain.py (non-empty files)' $?
python ${LOCAL_TEST_DIR}/pyroot_multichain.py inputFiles=file:empty_a.root secondaryInputFiles=file:good_a.root || die 'Failed in pyroot_multichain.py (empty file)' $?

#NOTE: ROOT has a bug which keeps the AssociationVector from running its ioread rule and therefore it never clears its cache
#test AssociationVector reading
Expand Down