Skip to content

Little Cleanup FairRootManager#1343

Merged
karabowi merged 1 commit intoFairRootGroup:devfrom
ChristianTackeGSI:pr/frm
Feb 10, 2023
Merged

Little Cleanup FairRootManager#1343
karabowi merged 1 commit intoFairRootGroup:devfrom
ChristianTackeGSI:pr/frm

Conversation

@ChristianTackeGSI
Copy link
Copy Markdown
Member

  • Turn fObj2 into std::vector
  • Drop fCurrentEntryNo, fTimeforEntryNo

This is a little step towards making the GetObject code more readable.


Checklist:

* Turn fObj2 into std::vector
* Drop fCurrentEntryNo, fTimeforEntryNo
Comment on lines +774 to +780
if (!newentry) {
/** if we do not find an object corresponding to the branch in the folder structure
* then we have no idea about what type of object is this and we cannot set the branch address
*/
LOG(info) << " Branch: " << BrName << " not found in Tree.";
// Fatal(" No Branch in the tree", BrName );
return 0;
return nullptr;
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like FairRootManager::UpdateBranches expects all pointers in fObj2 to be valid. While this looks like it handles a nullptr in fObj2.

@karabowi karabowi merged commit 279911c into FairRootGroup:dev Feb 10, 2023
@ChristianTackeGSI ChristianTackeGSI deleted the pr/frm branch February 10, 2023 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants