Skip to content

Fix of MClabels #2801

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

Merged
sawenzel merged 14 commits into from
Jan 17, 2020
Merged

Fix of MClabels #2801

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ee9a0ea
Reconstruction and upgrade of Digitizer
mbroz84 Aug 16, 2019
683fc8f
Clang format
mbroz84 Aug 16, 2019
69637c0
Using crystalball for signal shape and remove obsolete headers
mbroz84 Aug 21, 2019
2bbcf09
Reset time arrays after each event
mbroz84 Aug 21, 2019
ee8fcf3
Remove FairLogger::endl
mbroz84 Aug 26, 2019
f409de5
Merge
mbroz84 Aug 26, 2019
ffde70b
Fix conflict
mbroz84 Aug 26, 2019
826a21b
Merge
mbroz84 Jan 6, 2020
6d6e560
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
mbroz84 Jan 7, 2020
1b8b5ed
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
mbroz84 Jan 9, 2020
6284775
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
mbroz84 Jan 10, 2020
29a8467
Fix of MClabels
mbroz84 Jan 16, 2020
77459ff
Fix of embedding
mbroz84 Jan 16, 2020
9ae8886
clang-format
mbroz84 Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Steer/DigitizerWorkflow/src/FDDDigitizerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,33 +102,32 @@ class FDDDPLDigitizerTask
auto& eventParts = context->getEventParts();
std::vector<o2::fdd::Digit> digitsAccum; // accumulator for digits
o2::dataformats::MCTruthContainer<o2::fdd::MCLabel> labelsAccum;

o2::dataformats::MCTruthContainer<o2::fdd::MCLabel> labels;
mDigitizer->setMCLabels(&labels);
// loop over all composite collisions given from context
// (aka loop over all the interaction records)
for (int collID = 0; collID < irecords.size(); ++collID) {
mDigitizer->SetEventTime(irecords[collID].timeNS);
mDigitizer->SetInteractionRecord(irecords[collID]);

o2::fdd::Digit digit; // digits which get filled
// for each collision, loop over the constituents event and source IDs
// (background signal merging is basically taking place here)
for (auto& part : eventParts[collID]) {
mDigitizer->SetEventID(part.entryID);
mDigitizer->SetSrcID(part.sourceID);
labels.clear();

// get the hits for this event and this source
std::vector<o2::fdd::Hit> hits;
retrieveHits(mSimChains, "FDDHit", part.sourceID, part.entryID, &hits);
LOG(INFO) << "For collision " << collID << " eventID " << part.entryID << " found FDD " << hits.size() << " hits ";

o2::fdd::Digit digit; // digits which get filled
o2::dataformats::MCTruthContainer<o2::fdd::MCLabel> labels;
mDigitizer->process(&hits, &digit);
//std::copy(digits.begin(), digits.end(), std::back_inserter(digitsAccum));
labelsAccum.mergeAtBack(labels);
mDigitizer->SetTriggers(&digit);
digitsAccum.push_back(digit); // we should move it there actually
LOG(INFO) << "Have " << digitsAccum.back().GetChannelData().size() << " fired channels ";
}
mDigitizer->SetTriggers(&digit);
digitsAccum.push_back(digit);
LOG(INFO) << "Have " << digitsAccum.back().GetChannelData().size() << " fired channels ";
}

LOG(INFO) << "FDD: Sending " << digitsAccum.size() << " digits";
Expand Down