Skip to content

Do not quit on empty payload #7444

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
shahor02 merged 2 commits into from
Oct 30, 2021
Merged

Do not quit on empty payload #7444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f490f57
Do not quit on empty payload
Oct 28, 2021
abebe24
remove check of empty payload; corrected fill order of unfolded clu.
Oct 29, 2021
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
4 changes: 2 additions & 2 deletions Detectors/PHOS/reconstruction/src/Clusterer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void Clusterer::process(gsl::span<const Digit> digits, gsl::span<const TriggerRe
mCluEl.emplace_back(absId, digitSeed.isHighGain(), energy, calibrateT(digitSeed.getTime(), absId, digitSeed.isHighGain()),
x, z, digitSeed.getLabel(), 1.);
}
mLastElementInEvent = mCluEl.size();
mLastElementInEvent = cluelements.size();

// Collect digits to clusters
makeClusters(clusters, cluelements);
Expand Down Expand Up @@ -374,7 +374,7 @@ void Clusterer::unfoldOneCluster(Cluster& iniClu, char nMax, std::vector<Cluster
}

// Iterations finished, put first new cluster into place of mother one, others to the end of list
for (int iclu = nMax; iclu--;) {
for (int iclu = 0; iclu < nMax; iclu++) {
//copy cluElements to the final list
int start = cluelements.size();
int nce = 0;
Expand Down
9 changes: 0 additions & 9 deletions Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@ void ClusterizerSpec::run(framework::ProcessingContext& ctx)
if (mUseDigits) {
LOG(DEBUG) << "PHOSClusterizer - run on digits called";

auto dataref = ctx.inputs().get("digits");
auto const* phosheader = o2::framework::DataRefUtils::getHeader<o2::phos::PHOSBlockHeader*>(dataref);
if (!phosheader->mHasPayload) {
LOG(DEBUG) << "[PHOSClusterizer - run] No more digits" << std::endl;
ctx.services().get<o2::framework::ControlService>().readyToQuit(framework::QuitRequest::Me);
return;
}

// auto digits = ctx.inputs().get<gsl::span<o2::phos::Digit>>("digits");
auto digits = ctx.inputs().get<std::vector<o2::phos::Digit>>("digits");
auto digitsTR = ctx.inputs().get<std::vector<o2::phos::TriggerRecord>>("digitTriggerRecords");
Expand Down Expand Up @@ -107,7 +99,6 @@ void ClusterizerSpec::run(framework::ProcessingContext& ctx)
if (mPropagateMC) {
ctx.outputs().snapshot(o2::framework::Output{"PHS", "CLUSTERTRUEMC", 0, o2::framework::Lifetime::Timeframe}, mOutputTruthCont);
}
ctx.services().get<o2::framework::ControlService>().readyToQuit(framework::QuitRequest::Me);
}

o2::framework::DataProcessorSpec o2::phos::reco_workflow::getClusterizerSpec(bool propagateMC, bool fullClu)
Expand Down