New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix BranchChildren/Parentage problems that occur with SubProcess and EDAlias #17950
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
36 changes: 36 additions & 0 deletions
36
DataFormats/Provenance/interface/SubProcessParentageHelper.h
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
#ifndef DataFormats_Provenance_SubProcessParentageHelper_h | ||
#define DataFormats_Provenance_SubProcessParentageHelper_h | ||
|
||
// This class is used to properly fill Parentage in SubProcesses. | ||
// In particular it helps filling the BranchChildren container | ||
// that is used when dropping descendants of products that | ||
// have been dropped on input. | ||
// | ||
// This class is only filled for SubProcesses. Its data member | ||
// only has entries for products produced in a prior SubProcess | ||
// or the top level Process in the same overall process. | ||
|
||
#include "DataFormats/Provenance/interface/BranchID.h" | ||
|
||
#include <vector> | ||
|
||
namespace edm { | ||
|
||
class ProductRegistry; | ||
|
||
class SubProcessParentageHelper { | ||
public: | ||
|
||
void update(SubProcessParentageHelper const& parentSubProcessParentageHelper, | ||
ProductRegistry const& parentProductRegistry); | ||
|
||
std::vector<BranchID> const& producedProducts() const { | ||
return producedProducts_; | ||
} | ||
|
||
private: | ||
|
||
std::vector<BranchID> producedProducts_; | ||
}; | ||
} | ||
#endif |
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#include "DataFormats/Provenance/interface/SubProcessParentageHelper.h" | ||
|
||
#include "DataFormats/Provenance/interface/BranchDescription.h" | ||
#include "DataFormats/Provenance/interface/ProductRegistry.h" | ||
#include "FWCore/Utilities/interface/BranchType.h" | ||
|
||
namespace edm { | ||
|
||
void SubProcessParentageHelper:: | ||
update(SubProcessParentageHelper const& parentSubProcessParentageHelper, | ||
ProductRegistry const& parentProductRegistry) { | ||
|
||
*this = parentSubProcessParentageHelper; | ||
|
||
for(auto const& prod : parentProductRegistry.productList()) { | ||
BranchDescription const& desc = prod.second; | ||
if (desc.produced() && desc.branchType() == InEvent && !desc.isAlias()) { | ||
producedProducts_.push_back(desc.branchID()); | ||
} | ||
} | ||
} | ||
} |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a comment explaining the difference between
branchID
andoriginalBranchID