diff --git a/ALICE3/TableProducer/alice3-pidTOF.cxx b/ALICE3/TableProducer/alice3-pidTOF.cxx
index 2098986d054..7e4fbc9178d 100644
--- a/ALICE3/TableProducer/alice3-pidTOF.cxx
+++ b/ALICE3/TableProducer/alice3-pidTOF.cxx
@@ -11,7 +11,7 @@
 
 ///
 /// \file   alice3-pidTOF.cxx
-/// \author Nicolo' Jacazio
+/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
 /// \brief  Task to produce PID tables for TOF split for each particle.
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
@@ -245,13 +245,13 @@ struct ALICE3pidTOFTaskQA {
     });
   }
 
-  template <uint8_t i, typename T>
-  void fillParticleHistos(const T& t, const float& tof, const float& exp_diff, const float& expsigma, const float& nsigma)
+  template <o2::track::PID::ID i, typename T>
+  void fillParticleHistos(const T& t, const float& tof, const float& exp_diff, const float& expsigma)
   {
     histos.fill(HIST(hexpected[i]), t.p(), tof - exp_diff);
     histos.fill(HIST(hexpected_diff[i]), t.p(), exp_diff);
     histos.fill(HIST(hexpsigma[i]), t.p(), expsigma);
-    histos.fill(HIST(hnsigma[i]), t.p(), nsigma);
+    histos.fill(HIST(hnsigma[i]), t.p(), o2::aod::pidutils::tofNSigma(i, t));
   }
 
   void process(aod::Collision const& collision,
@@ -302,15 +302,15 @@ struct ALICE3pidTOFTaskQA {
       histos.fill(HIST("event/pt"), t.pt());
       histos.fill(HIST("event/ptreso"), t.p(), t.sigma1Pt() * t.pt() * t.pt());
       //
-      fillParticleHistos<0>(t, tof, t.tofExpSignalDiffEl(), t.tofExpSigmaEl(), t.tofNSigmaEl());
-      fillParticleHistos<1>(t, tof, t.tofExpSignalDiffMu(), t.tofExpSigmaMu(), t.tofNSigmaMu());
-      fillParticleHistos<2>(t, tof, t.tofExpSignalDiffPi(), t.tofExpSigmaPi(), t.tofNSigmaPi());
-      fillParticleHistos<3>(t, tof, t.tofExpSignalDiffKa(), t.tofExpSigmaKa(), t.tofNSigmaKa());
-      fillParticleHistos<4>(t, tof, t.tofExpSignalDiffPr(), t.tofExpSigmaPr(), t.tofNSigmaPr());
-      fillParticleHistos<5>(t, tof, t.tofExpSignalDiffDe(), t.tofExpSigmaDe(), t.tofNSigmaDe());
-      fillParticleHistos<6>(t, tof, t.tofExpSignalDiffTr(), t.tofExpSigmaTr(), t.tofNSigmaTr());
-      fillParticleHistos<7>(t, tof, t.tofExpSignalDiffHe(), t.tofExpSigmaHe(), t.tofNSigmaHe());
-      fillParticleHistos<8>(t, tof, t.tofExpSignalDiffAl(), t.tofExpSigmaAl(), t.tofNSigmaAl());
+      fillParticleHistos<o2::track::PID::Electron>(t, tof, t.tofExpSignalDiffEl(), t.tofExpSigmaEl());
+      fillParticleHistos<o2::track::PID::Muon>(t, tof, t.tofExpSignalDiffMu(), t.tofExpSigmaMu());
+      fillParticleHistos<o2::track::PID::Pion>(t, tof, t.tofExpSignalDiffPi(), t.tofExpSigmaPi());
+      fillParticleHistos<o2::track::PID::Kaon>(t, tof, t.tofExpSignalDiffKa(), t.tofExpSigmaKa());
+      fillParticleHistos<o2::track::PID::Proton>(t, tof, t.tofExpSignalDiffPr(), t.tofExpSigmaPr());
+      fillParticleHistos<o2::track::PID::Deuteron>(t, tof, t.tofExpSignalDiffDe(), t.tofExpSigmaDe());
+      fillParticleHistos<o2::track::PID::Triton>(t, tof, t.tofExpSignalDiffTr(), t.tofExpSigmaTr());
+      fillParticleHistos<o2::track::PID::Helium3>(t, tof, t.tofExpSignalDiffHe(), t.tofExpSigmaHe());
+      fillParticleHistos<o2::track::PID::Alpha>(t, tof, t.tofExpSignalDiffAl(), t.tofExpSigmaAl());
     }
   }
 };
diff --git a/Common/Core/PID/PIDResponse.h b/Common/Core/PID/PIDResponse.h
index 76137996720..c38e76a908d 100644
--- a/Common/Core/PID/PIDResponse.h
+++ b/Common/Core/PID/PIDResponse.h
@@ -11,14 +11,16 @@
 
 ///
 /// \file   PIDResponse.h
-/// \author Nicolo' Jacazio
-/// \brief Set of tables, tasks and utilities to provide the interface between
-///        the analysis data model and the PID response
+/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
+/// \brief  Set of tables, tasks and utilities to provide the interface between
+///         the analysis data model and the PID response
 ///
 
 #ifndef O2_FRAMEWORK_PIDRESPONSE_H_
 #define O2_FRAMEWORK_PIDRESPONSE_H_
 
+#include <experimental/type_traits>
+
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
@@ -42,6 +44,173 @@ void packInTable(const float& separation, tableType& table, const float& lowest,
     table(static_cast<T>(separation / width - 0.5f));
   }
 }
+
+static constexpr float defaultNSigma = -999.f; /// Default return value in case N sigma measurement is not available
+
+template <class T>
+using hasTOFEl = decltype(std::declval<T&>().tofNSigmaEl());
+template <class T>
+using hasTOFMu = decltype(std::declval<T&>().tofNSigmaMu());
+template <class T>
+using hasTOFPi = decltype(std::declval<T&>().tofNSigmaPi());
+template <class T>
+using hasTOFKa = decltype(std::declval<T&>().tofNSigmaKa());
+template <class T>
+using hasTOFPr = decltype(std::declval<T&>().tofNSigmaPr());
+template <class T>
+using hasTOFDe = decltype(std::declval<T&>().tofNSigmaDe());
+template <class T>
+using hasTOFTr = decltype(std::declval<T&>().tofNSigmaTr());
+template <class T>
+using hasTOFHe = decltype(std::declval<T&>().tofNSigmaHe());
+template <class T>
+using hasTOFAl = decltype(std::declval<T&>().tofNSigmaAl());
+
+template <typename TrackType>
+const auto tofNSigma(const o2::track::PID::ID& index, const TrackType& track)
+{
+  switch (index) {
+    case o2::track::PID::Electron:
+      if constexpr (std::experimental::is_detected<hasTOFEl, TrackType>::value) {
+        return track.tofNSigmaEl();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Muon:
+      if constexpr (std::experimental::is_detected<hasTOFMu, TrackType>::value) {
+        return track.tofNSigmaMu();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Pion:
+      if constexpr (std::experimental::is_detected<hasTOFPi, TrackType>::value) {
+        return track.tofNSigmaPi();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Kaon:
+      if constexpr (std::experimental::is_detected<hasTOFKa, TrackType>::value) {
+        return track.tofNSigmaKa();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Proton:
+      if constexpr (std::experimental::is_detected<hasTOFPr, TrackType>::value) {
+        return track.tofNSigmaPr();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Deuteron:
+      if constexpr (std::experimental::is_detected<hasTOFDe, TrackType>::value) {
+        return track.tofNSigmaDe();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Triton:
+      if constexpr (std::experimental::is_detected<hasTOFTr, TrackType>::value) {
+        return track.tofNSigmaTr();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Helium3:
+      if constexpr (std::experimental::is_detected<hasTOFHe, TrackType>::value) {
+        return track.tofNSigmaHe();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Alpha:
+      if constexpr (std::experimental::is_detected<hasTOFAl, TrackType>::value) {
+        return track.tofNSigmaAl();
+      } else {
+        return defaultNSigma;
+      }
+    default:
+      return defaultNSigma;
+  }
+}
+
+template <class T>
+using hasTPCEl = decltype(std::declval<T&>().tpcNSigmaEl());
+template <class T>
+using hasTPCMu = decltype(std::declval<T&>().tpcNSigmaMu());
+template <class T>
+using hasTPCPi = decltype(std::declval<T&>().tpcNSigmaPi());
+template <class T>
+using hasTPCKa = decltype(std::declval<T&>().tpcNSigmaKa());
+template <class T>
+using hasTPCPr = decltype(std::declval<T&>().tpcNSigmaPr());
+template <class T>
+using hasTPCDe = decltype(std::declval<T&>().tpcNSigmaDe());
+template <class T>
+using hasTPCTr = decltype(std::declval<T&>().tpcNSigmaTr());
+template <class T>
+using hasTPCHe = decltype(std::declval<T&>().tpcNSigmaHe());
+template <class T>
+using hasTPCAl = decltype(std::declval<T&>().tpcNSigmaAl());
+
+template <typename TrackType>
+const auto tpcNSigma(const o2::track::PID::ID& index, const TrackType& track)
+{
+  switch (index) {
+    case o2::track::PID::Electron:
+      if constexpr (std::experimental::is_detected<hasTPCEl, TrackType>::value) {
+        return track.tpcNSigmaEl();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Muon:
+      if constexpr (std::experimental::is_detected<hasTPCMu, TrackType>::value) {
+        return track.tpcNSigmaMu();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Pion:
+      if constexpr (std::experimental::is_detected<hasTPCPi, TrackType>::value) {
+        return track.tpcNSigmaPi();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Kaon:
+      if constexpr (std::experimental::is_detected<hasTPCKa, TrackType>::value) {
+        return track.tpcNSigmaKa();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Proton:
+      if constexpr (std::experimental::is_detected<hasTPCPr, TrackType>::value) {
+        return track.tpcNSigmaPr();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Deuteron:
+      if constexpr (std::experimental::is_detected<hasTPCDe, TrackType>::value) {
+        return track.tpcNSigmaDe();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Triton:
+      if constexpr (std::experimental::is_detected<hasTPCTr, TrackType>::value) {
+        return track.tpcNSigmaTr();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Helium3:
+      if constexpr (std::experimental::is_detected<hasTPCHe, TrackType>::value) {
+        return track.tpcNSigmaHe();
+      } else {
+        return defaultNSigma;
+      }
+    case o2::track::PID::Alpha:
+      if constexpr (std::experimental::is_detected<hasTPCAl, TrackType>::value) {
+        return track.tpcNSigmaAl();
+      } else {
+        return defaultNSigma;
+      }
+    default:
+      return defaultNSigma;
+  }
+}
+
 } // namespace pidutils
 
 namespace pidtofsignal
@@ -122,34 +291,6 @@ DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float); //! Nsigma separation with
 DECLARE_SOA_COLUMN(TOFNSigmaTr, tofNSigmaTr, float); //! Nsigma separation with the TOF detector for triton
 DECLARE_SOA_COLUMN(TOFNSigmaHe, tofNSigmaHe, float); //! Nsigma separation with the TOF detector for helium3
 DECLARE_SOA_COLUMN(TOFNSigmaAl, tofNSigmaAl, float); //! Nsigma separation with the TOF detector for alpha
-DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigma, tofNSigma,     //! Nsigma separation with the TOF detector for the combined species
-                           [](const float& El, const float& Mu, const float& Pi,
-                              const float& Ka, const float& Pr, const float& De,
-                              const float& Tr, const float& He, const float& Al,
-                              const o2::track::PID::ID& index) -> float {
-                             switch (index) {
-                               case o2::track::PID::Electron:
-                                 return El;
-                               case o2::track::PID::Muon:
-                                 return Mu;
-                               case o2::track::PID::Pion:
-                                 return Pi;
-                               case o2::track::PID::Kaon:
-                                 return Ka;
-                               case o2::track::PID::Proton:
-                                 return Pr;
-                               case o2::track::PID::Deuteron:
-                                 return De;
-                               case o2::track::PID::Triton:
-                                 return Tr;
-                               case o2::track::PID::Helium3:
-                                 return He;
-                               case o2::track::PID::Alpha:
-                                 return Al;
-                               default:
-                                 return -999.f;
-                             }
-                           });
 } // namespace pidtof
 
 // Macro to convert the stored Nsigmas to floats
@@ -186,34 +327,6 @@ DEFINE_UNWRAP_NSIGMA_COLUMN(TOFNSigmaDe, tofNSigmaDe); //! Unwrapped (float) nsi
 DEFINE_UNWRAP_NSIGMA_COLUMN(TOFNSigmaTr, tofNSigmaTr); //! Unwrapped (float) nsigma with the TOF detector for triton
 DEFINE_UNWRAP_NSIGMA_COLUMN(TOFNSigmaHe, tofNSigmaHe); //! Unwrapped (float) nsigma with the TOF detector for helium3
 DEFINE_UNWRAP_NSIGMA_COLUMN(TOFNSigmaAl, tofNSigmaAl); //! Unwrapped (float) nsigma with the TOF detector for alpha
-DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigma, tofNSigma,       //! Nsigma separation with the TOF detector for the combined species
-                           [](const float& El, const float& Mu, const float& Pi,
-                              const float& Ka, const float& Pr, const float& De,
-                              const float& Tr, const float& He, const float& Al,
-                              const o2::track::PID::ID& index) -> float {
-                             switch (index) {
-                               case o2::track::PID::Electron:
-                                 return bin_width * static_cast<float>(El);
-                               case o2::track::PID::Muon:
-                                 return bin_width * static_cast<float>(Mu);
-                               case o2::track::PID::Pion:
-                                 return bin_width * static_cast<float>(Pi);
-                               case o2::track::PID::Kaon:
-                                 return bin_width * static_cast<float>(Ka);
-                               case o2::track::PID::Proton:
-                                 return bin_width * static_cast<float>(Pr);
-                               case o2::track::PID::Deuteron:
-                                 return bin_width * static_cast<float>(De);
-                               case o2::track::PID::Triton:
-                                 return bin_width * static_cast<float>(Tr);
-                               case o2::track::PID::Helium3:
-                                 return bin_width * static_cast<float>(He);
-                               case o2::track::PID::Alpha:
-                                 return bin_width * static_cast<float>(Al);
-                               default:
-                                 return -999.f;
-                             }
-                           });
 
 } // namespace pidtof_tiny
 
@@ -263,10 +376,7 @@ DECLARE_SOA_TABLE(pidTOFFullAl, "AOD", "pidTOFFullAl", //! Table of the TOF (ful
                   pidtof::TOFExpSignalDiffAl<pidtof::TOFNSigmaAl, pidtof::TOFExpSigmaAl>,
                   pidtof::TOFExpSignalAl<pidtof::TOFNSigmaAl, pidtof::TOFExpSigmaAl>,
                   pidtof::TOFExpSigmaAl, pidtof::TOFNSigmaAl);
-DECLARE_SOA_TABLE(pidTOFFull, "AOD", "pidTOFFull", //! Table of the TOF NSigmas with full tables
-                  pidtof::TOFNSigma<pidtof::TOFNSigmaEl, pidtof::TOFNSigmaMu, pidtof::TOFNSigmaPi,
-                                    pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr, pidtof::TOFNSigmaDe,
-                                    pidtof::TOFNSigmaTr, pidtof::TOFNSigmaHe, pidtof::TOFNSigmaAl>);
+
 // Tiny size tables
 DECLARE_SOA_TABLE(pidTOFEl, "AOD", "pidTOFEl", //! Table of the TOF response with binned Nsigma for electron
                   pidtof_tiny::TOFNSigmaStoreEl, pidtof_tiny::TOFNSigmaEl<pidtof_tiny::TOFNSigmaStoreEl>);
@@ -286,10 +396,7 @@ DECLARE_SOA_TABLE(pidTOFHe, "AOD", "pidTOFHe", //! Table of the TOF response wit
                   pidtof_tiny::TOFNSigmaStoreHe, pidtof_tiny::TOFNSigmaHe<pidtof_tiny::TOFNSigmaStoreHe>);
 DECLARE_SOA_TABLE(pidTOFAl, "AOD", "pidTOFAl", //! Table of the TOF response with binned Nsigma for alpha
                   pidtof_tiny::TOFNSigmaStoreAl, pidtof_tiny::TOFNSigmaAl<pidtof_tiny::TOFNSigmaStoreAl>);
-DECLARE_SOA_TABLE(pidTOF, "AOD", "pidTOF", //! Table of the TOF NSigmas with binned Nsigma
-                  pidtof_tiny::TOFNSigma<pidtof_tiny::TOFNSigmaStoreEl, pidtof_tiny::TOFNSigmaStoreMu, pidtof_tiny::TOFNSigmaStorePi,
-                                         pidtof_tiny::TOFNSigmaStoreKa, pidtof_tiny::TOFNSigmaStorePr, pidtof_tiny::TOFNSigmaStoreDe,
-                                         pidtof_tiny::TOFNSigmaStoreTr, pidtof_tiny::TOFNSigmaStoreHe, pidtof_tiny::TOFNSigmaStoreAl>);
+
 namespace pidtpc
 {
 // Expected signals
@@ -331,34 +438,6 @@ DECLARE_SOA_COLUMN(TPCNSigmaDe, tpcNSigmaDe, float); //! Nsigma separation with
 DECLARE_SOA_COLUMN(TPCNSigmaTr, tpcNSigmaTr, float); //! Nsigma separation with the TPC detector for triton
 DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float); //! Nsigma separation with the TPC detector for helium3
 DECLARE_SOA_COLUMN(TPCNSigmaAl, tpcNSigmaAl, float); //! Nsigma separation with the TPC detector for alpha
-DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigma, tpcNSigma,     //! Nsigma separation with the TPC detector for the combined species
-                           [](const float& El, const float& Mu, const float& Pi,
-                              const float& Ka, const float& Pr, const float& De,
-                              const float& Tr, const float& He, const float& Al,
-                              const o2::track::PID::ID& index) -> float {
-                             switch (index) {
-                               case o2::track::PID::Electron:
-                                 return El;
-                               case o2::track::PID::Muon:
-                                 return Mu;
-                               case o2::track::PID::Pion:
-                                 return Pi;
-                               case o2::track::PID::Kaon:
-                                 return Ka;
-                               case o2::track::PID::Proton:
-                                 return Pr;
-                               case o2::track::PID::Deuteron:
-                                 return De;
-                               case o2::track::PID::Triton:
-                                 return Tr;
-                               case o2::track::PID::Helium3:
-                                 return He;
-                               case o2::track::PID::Alpha:
-                                 return Al;
-                               default:
-                                 return -999.f;
-                             }
-                           });
 
 } // namespace pidtpc
 
@@ -391,34 +470,7 @@ DEFINE_UNWRAP_NSIGMA_COLUMN(TPCNSigmaDe, tpcNSigmaDe); //! Unwrapped (float) nsi
 DEFINE_UNWRAP_NSIGMA_COLUMN(TPCNSigmaTr, tpcNSigmaTr); //! Unwrapped (float) nsigma with the TPC detector for triton
 DEFINE_UNWRAP_NSIGMA_COLUMN(TPCNSigmaHe, tpcNSigmaHe); //! Unwrapped (float) nsigma with the TPC detector for helium3
 DEFINE_UNWRAP_NSIGMA_COLUMN(TPCNSigmaAl, tpcNSigmaAl); //! Unwrapped (float) nsigma with the TPC detector for alpha
-DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigma, tpcNSigma,       //! Nsigma separation with the TPC detector for the combined species
-                           [](const float& El, const float& Mu, const float& Pi,
-                              const float& Ka, const float& Pr, const float& De,
-                              const float& Tr, const float& He, const float& Al,
-                              const o2::track::PID::ID& index) -> float {
-                             switch (index) {
-                               case o2::track::PID::Electron:
-                                 return bin_width * static_cast<float>(El);
-                               case o2::track::PID::Muon:
-                                 return bin_width * static_cast<float>(Mu);
-                               case o2::track::PID::Pion:
-                                 return bin_width * static_cast<float>(Pi);
-                               case o2::track::PID::Kaon:
-                                 return bin_width * static_cast<float>(Ka);
-                               case o2::track::PID::Proton:
-                                 return bin_width * static_cast<float>(Pr);
-                               case o2::track::PID::Deuteron:
-                                 return bin_width * static_cast<float>(De);
-                               case o2::track::PID::Triton:
-                                 return bin_width * static_cast<float>(Tr);
-                               case o2::track::PID::Helium3:
-                                 return bin_width * static_cast<float>(He);
-                               case o2::track::PID::Alpha:
-                                 return bin_width * static_cast<float>(Al);
-                               default:
-                                 return -999.f;
-                             }
-                           });
+
 } // namespace pidtpc_tiny
 
 // Per particle tables
@@ -440,10 +492,6 @@ DECLARE_SOA_TABLE(pidTPCFullHe, "AOD", "pidTPCFullHe", //! Table of the TPC (ful
                   pidtpc::TPCExpSignalDiffHe<pidtpc::TPCNSigmaHe, pidtpc::TPCExpSigmaHe>, pidtpc::TPCExpSigmaHe, pidtpc::TPCNSigmaHe);
 DECLARE_SOA_TABLE(pidTPCFullAl, "AOD", "pidTPCFullAl", //! Table of the TPC (full) response with expected signal, expected resolution and Nsigma for alpha
                   pidtpc::TPCExpSignalDiffAl<pidtpc::TPCNSigmaAl, pidtpc::TPCExpSigmaAl>, pidtpc::TPCExpSigmaAl, pidtpc::TPCNSigmaAl);
-DECLARE_SOA_TABLE(pidTPCFull, "AOD", "pidTPCFull", //! Table of the TPC NSigmas with full tables
-                  pidtpc::TPCNSigma<pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaMu, pidtpc::TPCNSigmaPi,
-                                    pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr, pidtpc::TPCNSigmaDe,
-                                    pidtpc::TPCNSigmaTr, pidtpc::TPCNSigmaHe, pidtpc::TPCNSigmaAl>);
 
 // Tiny size tables
 DECLARE_SOA_TABLE(pidTPCEl, "AOD", "pidTPCEl", //! Table of the TPC response with binned Nsigma for electron
@@ -464,10 +512,6 @@ DECLARE_SOA_TABLE(pidTPCHe, "AOD", "pidTPCHe", //! Table of the TPC response wit
                   pidtpc_tiny::TPCNSigmaStoreHe, pidtpc_tiny::TPCNSigmaHe<pidtpc_tiny::TPCNSigmaStoreHe>);
 DECLARE_SOA_TABLE(pidTPCAl, "AOD", "pidTPCAl", //! Table of the TPC response with binned Nsigma for alpha
                   pidtpc_tiny::TPCNSigmaStoreAl, pidtpc_tiny::TPCNSigmaAl<pidtpc_tiny::TPCNSigmaStoreAl>);
-DECLARE_SOA_TABLE(pidTPC, "AOD", "pidTPC", //! Table of the TPC NSigmas with binned Nsigma
-                  pidtpc_tiny::TPCNSigma<pidtpc_tiny::TPCNSigmaStoreEl, pidtpc_tiny::TPCNSigmaStoreMu, pidtpc_tiny::TPCNSigmaStorePi,
-                                         pidtpc_tiny::TPCNSigmaStoreKa, pidtpc_tiny::TPCNSigmaStorePr, pidtpc_tiny::TPCNSigmaStoreDe,
-                                         pidtpc_tiny::TPCNSigmaStoreTr, pidtpc_tiny::TPCNSigmaStoreHe, pidtpc_tiny::TPCNSigmaStoreAl>);
 
 #undef DEFINE_UNWRAP_NSIGMA_COLUMN
 
diff --git a/Common/TableProducer/PID/pidTOF.cxx b/Common/TableProducer/PID/pidTOF.cxx
index f6e593dbda2..478b843f2b8 100644
--- a/Common/TableProducer/PID/pidTOF.cxx
+++ b/Common/TableProducer/PID/pidTOF.cxx
@@ -11,7 +11,7 @@
 
 ///
 /// \file   pidTOF.cxx
-/// \author Nicolò Jacazio
+/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
 /// \brief  Task to produce PID tables for TOF split for each particle with only the Nsigma information.
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
@@ -234,10 +234,10 @@ struct tofPidQa {
     addParticleHistos<8>();
   }
 
-  template <uint8_t i, typename T>
-  void fillParticleHistos(const T& t, const float nsigma)
+  template <o2::track::PID::ID i, typename T>
+  void fillParticleHistos(const T& t)
   {
-    histos.fill(HIST(hnsigma[i]), t.p(), nsigma);
+    histos.fill(HIST(hnsigma[i]), t.p(), o2::aod::pidutils::tofNSigma(i, t));
   }
 
   void process(aod::Collision const& collision, soa::Join<aod::Tracks, aod::TracksExtra,
@@ -268,15 +268,15 @@ struct tofPidQa {
       histos.fill(HIST("event/pt"), t.pt());
       // histos.fill(HIST("event/ptreso"), t.p(), t.sigma1Pt() * t.pt() * t.pt());
       //
-      fillParticleHistos<0>(t, t.tofNSigmaEl());
-      fillParticleHistos<1>(t, t.tofNSigmaMu());
-      fillParticleHistos<2>(t, t.tofNSigmaPi());
-      fillParticleHistos<3>(t, t.tofNSigmaKa());
-      fillParticleHistos<4>(t, t.tofNSigmaPr());
-      fillParticleHistos<5>(t, t.tofNSigmaDe());
-      fillParticleHistos<6>(t, t.tofNSigmaTr());
-      fillParticleHistos<7>(t, t.tofNSigmaHe());
-      fillParticleHistos<8>(t, t.tofNSigmaAl());
+      fillParticleHistos<o2::track::PID::Electron>(t);
+      fillParticleHistos<o2::track::PID::Muon>(t);
+      fillParticleHistos<o2::track::PID::Pion>(t);
+      fillParticleHistos<o2::track::PID::Kaon>(t);
+      fillParticleHistos<o2::track::PID::Proton>(t);
+      fillParticleHistos<o2::track::PID::Deuteron>(t);
+      fillParticleHistos<o2::track::PID::Triton>(t);
+      fillParticleHistos<o2::track::PID::Helium3>(t);
+      fillParticleHistos<o2::track::PID::Alpha>(t);
     }
   }
 };
diff --git a/Common/TableProducer/PID/pidTOFFull.cxx b/Common/TableProducer/PID/pidTOFFull.cxx
index 0a59f7368fe..339a34693c3 100644
--- a/Common/TableProducer/PID/pidTOFFull.cxx
+++ b/Common/TableProducer/PID/pidTOFFull.cxx
@@ -542,7 +542,7 @@ struct tofPidFullQa {
   }
 
   template <o2::track::PID::ID id, typename T>
-  void fillParticleHistos(const T& t, const float& tof, const float& exp_diff, const float& expsigma, const float& nsigma)
+  void fillParticleHistos(const T& t, const float& tof, const float& exp_diff, const float& expsigma)
   {
     const float y = TMath::ASinH(t.pt() / TMath::Sqrt(PID::getMass2(id) + t.pt() * t.pt()) * TMath::SinH(t.eta()));
     if (abs(y) > 0.5) {
@@ -552,6 +552,7 @@ struct tofPidFullQa {
     histos.fill(HIST(hexpected[id]), t.p(), tof - exp_diff);
     histos.fill(HIST(hexpected_diff[id]), t.p(), exp_diff);
     histos.fill(HIST(hexpsigma[id]), t.p(), expsigma);
+    const auto& nsigma = o2::aod::pidutils::tofNSigma(id, t);
     histos.fill(HIST(hnsigma[id]), t.p(), nsigma);
     histos.fill(HIST(hnsigmapt[id]), t.pt(), nsigma);
   }
@@ -619,15 +620,15 @@ struct tofPidFullQa {
       histos.fill(HIST("event/pt"), t.pt());
       // histos.fill(HIST("event/ptreso"), t.p(), t.sigma1Pt() * t.pt() * t.pt());
       //
-      fillParticleHistos<PID::Electron>(t, tof, t.tofExpSignalDiffEl(), t.tofExpSigmaEl(), t.tofNSigmaEl());
-      fillParticleHistos<PID::Muon>(t, tof, t.tofExpSignalDiffMu(), t.tofExpSigmaMu(), t.tofNSigmaMu());
-      fillParticleHistos<PID::Pion>(t, tof, t.tofExpSignalDiffPi(), t.tofExpSigmaPi(), t.tofNSigmaPi());
-      fillParticleHistos<PID::Kaon>(t, tof, t.tofExpSignalDiffKa(), t.tofExpSigmaKa(), t.tofNSigmaKa());
-      fillParticleHistos<PID::Proton>(t, tof, t.tofExpSignalDiffPr(), t.tofExpSigmaPr(), t.tofNSigmaPr());
-      fillParticleHistos<PID::Deuteron>(t, tof, t.tofExpSignalDiffDe(), t.tofExpSigmaDe(), t.tofNSigmaDe());
-      fillParticleHistos<PID::Triton>(t, tof, t.tofExpSignalDiffTr(), t.tofExpSigmaTr(), t.tofNSigmaTr());
-      fillParticleHistos<PID::Helium3>(t, tof, t.tofExpSignalDiffHe(), t.tofExpSigmaHe(), t.tofNSigmaHe());
-      fillParticleHistos<PID::Alpha>(t, tof, t.tofExpSignalDiffAl(), t.tofExpSigmaAl(), t.tofNSigmaAl());
+      fillParticleHistos<PID::Electron>(t, tof, t.tofExpSignalDiffEl(), t.tofExpSigmaEl());
+      fillParticleHistos<PID::Muon>(t, tof, t.tofExpSignalDiffMu(), t.tofExpSigmaMu());
+      fillParticleHistos<PID::Pion>(t, tof, t.tofExpSignalDiffPi(), t.tofExpSigmaPi());
+      fillParticleHistos<PID::Kaon>(t, tof, t.tofExpSignalDiffKa(), t.tofExpSigmaKa());
+      fillParticleHistos<PID::Proton>(t, tof, t.tofExpSignalDiffPr(), t.tofExpSigmaPr());
+      fillParticleHistos<PID::Deuteron>(t, tof, t.tofExpSignalDiffDe(), t.tofExpSigmaDe());
+      fillParticleHistos<PID::Triton>(t, tof, t.tofExpSignalDiffTr(), t.tofExpSigmaTr());
+      fillParticleHistos<PID::Helium3>(t, tof, t.tofExpSignalDiffHe(), t.tofExpSigmaHe());
+      fillParticleHistos<PID::Alpha>(t, tof, t.tofExpSignalDiffAl(), t.tofExpSigmaAl());
     }
   }
 };
diff --git a/Common/TableProducer/PID/pidTPC.cxx b/Common/TableProducer/PID/pidTPC.cxx
index d4ae79c76cd..86acd50236e 100644
--- a/Common/TableProducer/PID/pidTPC.cxx
+++ b/Common/TableProducer/PID/pidTPC.cxx
@@ -245,7 +245,7 @@ struct tpcPidQa {
   }
 
   template <o2::track::PID::ID id, typename T>
-  void fillParticleHistos(const T& t, const float& nsigma)
+  void fillParticleHistos(const T& t)
   {
     if (applyRapidityCut) {
       const float y = TMath::ASinH(t.pt() / TMath::Sqrt(PID::getMass2(id) + t.pt() * t.pt()) * TMath::SinH(t.eta()));
@@ -254,6 +254,7 @@ struct tpcPidQa {
       }
     }
     // Fill histograms
+    const auto& nsigma = o2::aod::pidutils::tpcNSigma(id, t);
     histos.fill(HIST(hnsigma[id]), t.p(), nsigma);
     histos.fill(HIST(hnsigmapt[id]), t.pt(), nsigma);
     if (t.sign() > 0) {
@@ -309,15 +310,15 @@ struct tpcPidQa {
       histos.fill(HIST("event/tpcsignal"), mom, t.tpcSignal());
       histos.fill(HIST("event/signedtpcsignal"), mom * t.sign(), t.tpcSignal());
       //
-      fillParticleHistos<PID::Electron>(t, t.tpcNSigmaEl());
-      fillParticleHistos<PID::Muon>(t, t.tpcNSigmaMu());
-      fillParticleHistos<PID::Pion>(t, t.tpcNSigmaPi());
-      fillParticleHistos<PID::Kaon>(t, t.tpcNSigmaKa());
-      fillParticleHistos<PID::Proton>(t, t.tpcNSigmaPr());
-      fillParticleHistos<PID::Deuteron>(t, t.tpcNSigmaDe());
-      fillParticleHistos<PID::Triton>(t, t.tpcNSigmaTr());
-      fillParticleHistos<PID::Helium3>(t, t.tpcNSigmaHe());
-      fillParticleHistos<PID::Alpha>(t, t.tpcNSigmaAl());
+      fillParticleHistos<PID::Electron>(t);
+      fillParticleHistos<PID::Muon>(t);
+      fillParticleHistos<PID::Pion>(t);
+      fillParticleHistos<PID::Kaon>(t);
+      fillParticleHistos<PID::Proton>(t);
+      fillParticleHistos<PID::Deuteron>(t);
+      fillParticleHistos<PID::Triton>(t);
+      fillParticleHistos<PID::Helium3>(t);
+      fillParticleHistos<PID::Alpha>(t);
     }
   }
 };
diff --git a/Common/TableProducer/PID/pidTPCFull.cxx b/Common/TableProducer/PID/pidTPCFull.cxx
index e3fb24f36c7..5702bb839b7 100644
--- a/Common/TableProducer/PID/pidTPCFull.cxx
+++ b/Common/TableProducer/PID/pidTPCFull.cxx
@@ -11,7 +11,7 @@
 
 ///
 /// \file   pidTPCFull.cxx
-/// \author Nicolò Jacazio
+/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
 /// \brief  Task to produce PID tables for TPC split for each particle.
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
@@ -267,7 +267,7 @@ struct tpcPidFullQa {
   }
 
   template <o2::track::PID::ID id, typename T>
-  void fillParticleHistos(const T& t, const float& mom, const float& exp_diff, const float& expsigma, const float& nsigma)
+  void fillParticleHistos(const T& t, const float& mom, const float& exp_diff, const float& expsigma)
   {
     if (applyRapidityCut) {
       const float y = TMath::ASinH(t.pt() / TMath::Sqrt(PID::getMass2(id) + t.pt() * t.pt()) * TMath::SinH(t.eta()));
@@ -279,6 +279,7 @@ struct tpcPidFullQa {
     histos.fill(HIST(hexpected[id]), mom, t.tpcSignal() - exp_diff);
     histos.fill(HIST(hexpected_diff[id]), mom, exp_diff);
     histos.fill(HIST(hexpsigma[id]), t.p(), expsigma);
+    const auto& nsigma = o2::aod::pidutils::tpcNSigma(id, t);
     histos.fill(HIST(hnsigma[id]), t.p(), nsigma);
     histos.fill(HIST(hnsigmapt[id]), t.pt(), nsigma);
     if (t.sign() > 0) {
@@ -334,15 +335,15 @@ struct tpcPidFullQa {
       histos.fill(HIST("event/tpcsignal"), mom, t.tpcSignal());
       histos.fill(HIST("event/signedtpcsignal"), mom * t.sign(), t.tpcSignal());
       //
-      fillParticleHistos<PID::Electron>(t, mom, t.tpcExpSignalDiffEl(), t.tpcExpSigmaEl(), t.tpcNSigmaEl());
-      fillParticleHistos<PID::Muon>(t, mom, t.tpcExpSignalDiffMu(), t.tpcExpSigmaMu(), t.tpcNSigmaMu());
-      fillParticleHistos<PID::Pion>(t, mom, t.tpcExpSignalDiffPi(), t.tpcExpSigmaPi(), t.tpcNSigmaPi());
-      fillParticleHistos<PID::Kaon>(t, mom, t.tpcExpSignalDiffKa(), t.tpcExpSigmaKa(), t.tpcNSigmaKa());
-      fillParticleHistos<PID::Proton>(t, mom, t.tpcExpSignalDiffPr(), t.tpcExpSigmaPr(), t.tpcNSigmaPr());
-      fillParticleHistos<PID::Deuteron>(t, mom, t.tpcExpSignalDiffDe(), t.tpcExpSigmaDe(), t.tpcNSigmaDe());
-      fillParticleHistos<PID::Triton>(t, mom, t.tpcExpSignalDiffTr(), t.tpcExpSigmaTr(), t.tpcNSigmaTr());
-      fillParticleHistos<PID::Helium3>(t, mom, t.tpcExpSignalDiffHe(), t.tpcExpSigmaHe(), t.tpcNSigmaHe());
-      fillParticleHistos<PID::Alpha>(t, mom, t.tpcExpSignalDiffAl(), t.tpcExpSigmaAl(), t.tpcNSigmaAl());
+      fillParticleHistos<PID::Electron>(t, mom, t.tpcExpSignalDiffEl(), t.tpcExpSigmaEl());
+      fillParticleHistos<PID::Muon>(t, mom, t.tpcExpSignalDiffMu(), t.tpcExpSigmaMu());
+      fillParticleHistos<PID::Pion>(t, mom, t.tpcExpSignalDiffPi(), t.tpcExpSigmaPi());
+      fillParticleHistos<PID::Kaon>(t, mom, t.tpcExpSignalDiffKa(), t.tpcExpSigmaKa());
+      fillParticleHistos<PID::Proton>(t, mom, t.tpcExpSignalDiffPr(), t.tpcExpSigmaPr());
+      fillParticleHistos<PID::Deuteron>(t, mom, t.tpcExpSignalDiffDe(), t.tpcExpSigmaDe());
+      fillParticleHistos<PID::Triton>(t, mom, t.tpcExpSignalDiffTr(), t.tpcExpSigmaTr());
+      fillParticleHistos<PID::Helium3>(t, mom, t.tpcExpSignalDiffHe(), t.tpcExpSigmaHe());
+      fillParticleHistos<PID::Alpha>(t, mom, t.tpcExpSignalDiffAl(), t.tpcExpSigmaAl());
     }
   }
 };