v626: Fix the fix to #7754 (schema evolution in nested collections incl. TClonesArray) #9798
Merged
pcanal merged 1 commit intoroot-project:v6-26-00-patchesfrom Feb 3, 2022
Merged
Conversation
…3 or 4). This assignment is both unnecessary and harmfull. It is unnecessary because the pushd and popd of the onfile object address for those cases is already handle by the usage of PushDataCache and PopDataCache action for the branches of type 3 and 4 (via their configuration). It is harmfull because the type of the used/seen in the sub-branches might be completely different from the type of the collection content. For example, this code was crashing some CMS jobs because the sub-branches that had a "OnfileObject" corresponded to a nested sub-object (of type reco::ParticleState) and then this was (unconditionally) associated with the head node of the collection, which contained reco::PFCandidate objects (One of PFCandidate base class contains a reco::ParticleState sub-object). The assignment is triggered when visiting one of the child branch (type 31 or 41) of the collection parent branch. This is a fix for the main branch commit 875e8fb which is fix for the issue root-project#7754.
|
Starting build on |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TBranchElement: do not set fOnfileObject for collection parent (type 3 or 4).
This assignment is both unnecessary and harmfull.
It is unnecessary because the pushd and popd of the onfile object address
for those cases is already handle by the usage of PushDataCache and PopDataCache
action for the branches of type 3 and 4 (via their configuration).
It is harmfull because the type of the used/seen in the sub-branches might
be completely different from the type of the collection content.
For example, this code was crashing some CMS jobs because the sub-branches
that had a "OnfileObject" corresponded to a nested sub-object (of type
reco::ParticleState) and then this was (unconditionally) associated with
the head node of the collection, which contained reco::PFCandidate objects
(One of PFCandidate base class contains a reco::ParticleState sub-object).
The assignment is triggered when visiting one of the child branch (type 31 or 41)
of the collection parent branch.
This is a fix for the main branch commit 875e8fb
which is fix for the issue #7754.