Skip to content

Commit d09a98b

Browse files
authored
Merge pull request #9 from madbaron/pointer_reset
Bugfix for memory management
2 parents 551f8a0 + 803bf83 commit d09a98b

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

src/OverlayTiming.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,9 @@ namespace overlay {
560560
streamlog_out(DEBUG) << "Collection " << collection_names_in_evt->at(i) << " has now " << evt->getCollection(collection_names_in_evt->at(i))->getNumberOfElements() << " elements" << std::endl;
561561
}
562562

563+
// reset pointer
564+
overlay_Evt = nullptr;
565+
563566
}
564567

565568
//------------------------------------------------------------------------------------------------------------------------------------------

src/OverlayTimingRandomMix.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ namespace overlay
209209
for (int k = 0; k < _NOverlay; ++k)
210210
{
211211
overlay_Eventfile_reader->open(_inputFileNamesMuPlus.at(v_file_indices_mupl[k]));
212-
streamlog_out(MESSAGE) << "Open mu plus background file: " << _inputFileNamesMuPlus.at(v_file_indices_mupl[k]) << std::endl;
212+
streamlog_out(MESSAGE) << "Open mu plus background file [" << k << "/" << _NOverlay << "]: " << _inputFileNamesMuPlus.at(v_file_indices_mupl[k]) << std::endl;
213213

214214
overlay_Evt = overlay_Eventfile_reader->readNextEvent(LCIO::UPDATE);
215215

@@ -323,7 +323,7 @@ namespace overlay
323323
for (int k = 0; k < _NOverlay; ++k)
324324
{
325325
overlay_Eventfile_reader->open(_inputFileNamesMuMinus.at(v_file_indices_mumi[k]));
326-
streamlog_out(MESSAGE) << "Open mu minus background file: " << _inputFileNamesMuMinus.at(v_file_indices_mumi[k]) << std::endl;
326+
streamlog_out(MESSAGE) << "Open mu minus background file [" << k << "/" << _NOverlay << "]: " << _inputFileNamesMuMinus.at(v_file_indices_mumi[k]) << std::endl;
327327

328328
overlay_Evt = overlay_Eventfile_reader->readNextEvent(LCIO::UPDATE);
329329

@@ -407,6 +407,10 @@ namespace overlay
407407
{
408408
streamlog_out(DEBUG) << "Collection " << collection_names_in_evt->at(i) << " has now " << evt->getCollection(collection_names_in_evt->at(i))->getNumberOfElements() << " elements" << std::endl;
409409
}
410+
411+
// reset pointer
412+
overlay_Evt = nullptr;
413+
410414
}
411415

412416
//------------------------------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)