From f490f571b60f6f5b96c7ac2a7f260d390784f1b2 Mon Sep 17 00:00:00 2001
From: Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
Date: Thu, 28 Oct 2021 10:32:43 +0300
Subject: [PATCH 1/2] Do not quit on empty payload

---
 Detectors/PHOS/workflow/src/ClusterizerSpec.cxx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx b/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
index 6718f0c4a6901..9058736685bdf 100644
--- a/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
+++ b/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
@@ -61,7 +61,6 @@ void ClusterizerSpec::run(framework::ProcessingContext& ctx)
     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;
     }
 
@@ -107,7 +106,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)

From abebe243665b6c40ef07d640e33d5540e011804f Mon Sep 17 00:00:00 2001
From: Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
Date: Fri, 29 Oct 2021 11:13:00 +0300
Subject: [PATCH 2/2] remove check of empty payload; corrected fill order of
 unfolded clu.

---
 Detectors/PHOS/reconstruction/src/Clusterer.cxx | 4 ++--
 Detectors/PHOS/workflow/src/ClusterizerSpec.cxx | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Detectors/PHOS/reconstruction/src/Clusterer.cxx b/Detectors/PHOS/reconstruction/src/Clusterer.cxx
index fcc512a8661c2..e5131e768829f 100644
--- a/Detectors/PHOS/reconstruction/src/Clusterer.cxx
+++ b/Detectors/PHOS/reconstruction/src/Clusterer.cxx
@@ -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);
@@ -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;
diff --git a/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx b/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
index 9058736685bdf..a54845a33759e 100644
--- a/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
+++ b/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
@@ -57,13 +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;
-      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");