Skip to content

Commit

Permalink
Merge pull request #11169 from dmitrijus/dqm_no_types_fix_75x
Browse files Browse the repository at this point in the history
Fix a 'kNoTypesStored' bug in DQMRootSource
  • Loading branch information
cmsbuild committed Sep 9, 2015
2 parents c96746e + 3bce322 commit 47ab4b3
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions DQMServices/FwkIO/plugins/DQMRootSource.cc
Expand Up @@ -694,18 +694,20 @@ void DQMRootSource::readElements() {
while (m_presentIndexItr != m_orderedIndices.end() && skipIt(m_runlumiToRange[*m_presentIndexItr].m_run,m_runlumiToRange[*m_presentIndexItr].m_lumi))
++m_presentIndexItr;

if(runLumiRange.m_type == kNoTypesStored) {continue;}
boost::shared_ptr<TreeReaderBase> reader = m_treeReaders[runLumiRange.m_type];
ULong64_t index = runLumiRange.m_firstIndex;
ULong64_t endIndex = runLumiRange.m_lastIndex+1;
for (; index != endIndex; ++index)
{
bool isLumi = runLumiRange.m_lumi !=0;
if (m_shouldReadMEs)
reader->read(index,*store,isLumi);
if(runLumiRange.m_type != kNoTypesStored) {
boost::shared_ptr<TreeReaderBase> reader = m_treeReaders[runLumiRange.m_type];
ULong64_t index = runLumiRange.m_firstIndex;
ULong64_t endIndex = runLumiRange.m_lastIndex+1;
for (; index != endIndex; ++index)
{
bool isLumi = runLumiRange.m_lumi !=0;
if (m_shouldReadMEs)
reader->read(index,*store,isLumi);

//std::cout << runLumiRange.m_run << " " << runLumiRange.m_lumi <<" "<<index<< " " << runLumiRange.m_type << std::endl;
//std::cout << runLumiRange.m_run << " " << runLumiRange.m_lumi <<" "<<index<< " " << runLumiRange.m_type << std::endl;
}
}

if (m_presentIndexItr != m_orderedIndices.end())
{
//are there more parts to this same run/lumi?
Expand Down

0 comments on commit 47ab4b3

Please sign in to comment.