From 0d0dd52d70d01de9b3b531c53b6b68f9c814a54e Mon Sep 17 00:00:00 2001
From: Rocco Liotino <rocco.liotino@cern.ch>
Date: Wed, 8 Apr 2026 15:57:03 +0200
Subject: [PATCH 1/3] Fix chamber and cluster charge

---
 .../AOTTrack/PID/HMPID/hmpidTableProducer.cxx | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
index e7cb03e25be..e89ee771039 100644
--- a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
+++ b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
@@ -11,28 +11,33 @@
 
 #include "tableHMPID.h"
 
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include <CCDB/BasicCCDBManager.h>
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include <Framework/ASoA.h>
+#include <Framework/ASoAHelpers.h>
 #include <Framework/AnalysisDataModel.h>
-#include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
-#include <Framework/Configurable.h>
 #include <Framework/HistogramRegistry.h>
-#include <Framework/HistogramSpec.h>
-#include <Framework/InitContext.h>
-#include <Framework/OutputObjHeader.h>
+#include <Framework/RunningWorkflowInfo.h>
 #include <Framework/runDataProcessing.h>
+#include <ReconstructionDataFormats/DCA.h>
+#include <ReconstructionDataFormats/PID.h>
+#include <ReconstructionDataFormats/Track.h>
+#include <ReconstructionDataFormats/TrackParametrization.h>
+
+#include <TTree.h>
 
-#include <cstdint>
 #include <string>
-#include <unordered_set>
 
 using namespace o2;
 using namespace o2::framework;
@@ -135,6 +140,10 @@ struct HmpidTableProducer {
 
       float centrality = col.centFV0A();
 
+      // check cluster size sign
+      if (t.hmpidClusSize() <= 0)
+        continue;
+
       float hmpidPhotsCharge2[o2::aod::kDimPhotonsCharge];
 
       for (int i = 0; i < o2::aod::kDimPhotonsCharge; i++) {

From 7e3a1c9c7d663b7250cf89f421607b7b445bacdb Mon Sep 17 00:00:00 2001
From: Rocco Liotino <rocco.liotino@cern.ch>
Date: Wed, 8 Apr 2026 16:06:26 +0200
Subject: [PATCH 2/3] Fixing MegaLinter

---
 DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
index e89ee771039..7505c93e473 100644
--- a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
+++ b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
@@ -34,10 +34,9 @@
 #include <ReconstructionDataFormats/PID.h>
 #include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/TrackParametrization.h>
-
 #include <TTree.h>
-
 #include <string>
+#include <unordered_set>
 
 using namespace o2;
 using namespace o2::framework;

From 7d64bd8237ea871e9b98faf9e4fbb7e87c41283f Mon Sep 17 00:00:00 2001
From: Rocco Liotino <rocco.liotino@cern.ch>
Date: Wed, 8 Apr 2026 16:11:49 +0200
Subject: [PATCH 3/3] Fixing CLang

---
 DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
index 7505c93e473..3c589016874 100644
--- a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
+++ b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
@@ -34,7 +34,9 @@
 #include <ReconstructionDataFormats/PID.h>
 #include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/TrackParametrization.h>
+
 #include <TTree.h>
+
 #include <string>
 #include <unordered_set>