Skip to content
Snippets Groups Projects
Commit 0578295c authored by Marcin Nowak's avatar Marcin Nowak :radioactive:
Browse files

Attempt to fix merging problem that seems to show after the last changes

parent 47c3a416
No related branches found
No related tags found
No related merge requests found
...@@ -563,10 +563,9 @@ DbStatus DbDatabaseMerger::merge(const string& fid, ...@@ -563,10 +563,9 @@ DbStatus DbDatabaseMerger::merge(const string& fid,
<< " branches" << endl; << " branches" << endl;
} else { } else {
m_output->GetObject(key->GetName(),out_tree); m_output->GetObject(key->GetName(),out_tree);
s.start = static_cast<int>(out_tree->GetEntries());
if (name == "##Params") { if (name == "##Params") {
if ( s_dbg ) cout << "+++ Slow merge for " << name << endl; if ( s_dbg ) cout << "+++ Slow merge for " << name << endl;
Long64_t out_entries = out_tree->GetEntries();
s.start = static_cast<int>(out_entries);
out_tree->CopyAddresses(src_tree); out_tree->CopyAddresses(src_tree);
for (Long64_t i=0; i<src_entries; i++) { for (Long64_t i=0; i<src_entries; i++) {
src_tree->GetEntry(i); src_tree->GetEntry(i);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment