Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix daughter labels when running parallel merger #5286

Merged
merged 1 commit into from Jan 25, 2021
Merged

Fix daughter labels when running parallel merger #5286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions DataFormats/simulation/include/SimulationDataFormat/MCTrack.h
View file
Open in desktop
Expand Up @@ -202,6 +202,8 @@ class MCTrackT
}
bool getInhibited() const { return ((PropEncoding)mProp).inhibited; }

bool isTransported() const { return getToBeDone() && !getInhibited(); };

/// get the string representation of the production process
const char* getProdProcessAsString() const;

Expand Down
5 changes: 4 additions & 1 deletion run/O2HitMerger.h
View file
Open in desktop
Expand Up @@ -343,7 +343,10 @@ class O2HitMerger : public FairMQDevice
originbr->GetEntry(index);
for (Int_t i = 0; i < nprimaries[index]; i++) {
auto& track = incomingdata->at(i);
track.SetFirstDaughterTrackId(-1);
if (track.isTransported()) { // reset daughters only if track was transported, it will be fixed below
track.SetFirstDaughterTrackId(-1);
track.SetLastDaughterTrackId(-1);
}
targetdata->push_back(track);
}
incomingdata->clear();
Expand Down