diff --git a/Analysis/DataModel/include/AnalysisDataModel/PID/PIDResponse.h b/Analysis/DataModel/include/AnalysisDataModel/PID/PIDResponse.h
index fec4c42041bea..13755de5ab5cc 100644
--- a/Analysis/DataModel/include/AnalysisDataModel/PID/PIDResponse.h
+++ b/Analysis/DataModel/include/AnalysisDataModel/PID/PIDResponse.h
@@ -152,15 +152,15 @@ DECLARE_SOA_TABLE(pidRespTOFHe, "AOD", "pidRespTOFHe", TOFExpSignalDiffHe<TOFNSi
 DECLARE_SOA_TABLE(pidRespTOFAl, "AOD", "pidRespTOFAl", TOFExpSignalDiffAl<TOFNSigmaAl, TOFExpSigmaAl>, TOFExpSigmaAl, TOFNSigmaAl);
 
 // Tiny size tables
-DECLARE_SOA_TABLE(pidRespTOFTEl, "AOD", "pidRespTOFTEl", TOFExpSigmaEl, pidtof_tiny::TOFNSigmaStoreEl, pidtof_tiny::TOFNSigmaEl<pidtof_tiny::TOFNSigmaStoreEl>);
-DECLARE_SOA_TABLE(pidRespTOFTMu, "AOD", "pidRespTOFTMu", TOFExpSigmaMu, pidtof_tiny::TOFNSigmaStoreMu, pidtof_tiny::TOFNSigmaMu<pidtof_tiny::TOFNSigmaStoreMu>);
-DECLARE_SOA_TABLE(pidRespTOFTPi, "AOD", "pidRespTOFTPi", TOFExpSigmaPi, pidtof_tiny::TOFNSigmaStorePi, pidtof_tiny::TOFNSigmaPi<pidtof_tiny::TOFNSigmaStorePi>);
-DECLARE_SOA_TABLE(pidRespTOFTKa, "AOD", "pidRespTOFTKa", TOFExpSigmaKa, pidtof_tiny::TOFNSigmaStoreKa, pidtof_tiny::TOFNSigmaKa<pidtof_tiny::TOFNSigmaStoreKa>);
-DECLARE_SOA_TABLE(pidRespTOFTPr, "AOD", "pidRespTOFTPr", TOFExpSigmaPr, pidtof_tiny::TOFNSigmaStorePr, pidtof_tiny::TOFNSigmaPr<pidtof_tiny::TOFNSigmaStorePr>);
-DECLARE_SOA_TABLE(pidRespTOFTDe, "AOD", "pidRespTOFTDe", TOFExpSigmaDe, pidtof_tiny::TOFNSigmaStoreDe, pidtof_tiny::TOFNSigmaDe<pidtof_tiny::TOFNSigmaStoreDe>);
-DECLARE_SOA_TABLE(pidRespTOFTTr, "AOD", "pidRespTOFTTr", TOFExpSigmaTr, pidtof_tiny::TOFNSigmaStoreTr, pidtof_tiny::TOFNSigmaTr<pidtof_tiny::TOFNSigmaStoreTr>);
-DECLARE_SOA_TABLE(pidRespTOFTHe, "AOD", "pidRespTOFTHe", TOFExpSigmaHe, pidtof_tiny::TOFNSigmaStoreHe, pidtof_tiny::TOFNSigmaHe<pidtof_tiny::TOFNSigmaStoreHe>);
-DECLARE_SOA_TABLE(pidRespTOFTAl, "AOD", "pidRespTOFTAl", TOFExpSigmaAl, pidtof_tiny::TOFNSigmaStoreAl, pidtof_tiny::TOFNSigmaAl<pidtof_tiny::TOFNSigmaStoreAl>);
+DECLARE_SOA_TABLE(pidRespTOFTEl, "AOD", "pidRespTOFTEl", pidtof_tiny::TOFNSigmaStoreEl, pidtof_tiny::TOFNSigmaEl<pidtof_tiny::TOFNSigmaStoreEl>);
+DECLARE_SOA_TABLE(pidRespTOFTMu, "AOD", "pidRespTOFTMu", pidtof_tiny::TOFNSigmaStoreMu, pidtof_tiny::TOFNSigmaMu<pidtof_tiny::TOFNSigmaStoreMu>);
+DECLARE_SOA_TABLE(pidRespTOFTPi, "AOD", "pidRespTOFTPi", pidtof_tiny::TOFNSigmaStorePi, pidtof_tiny::TOFNSigmaPi<pidtof_tiny::TOFNSigmaStorePi>);
+DECLARE_SOA_TABLE(pidRespTOFTKa, "AOD", "pidRespTOFTKa", pidtof_tiny::TOFNSigmaStoreKa, pidtof_tiny::TOFNSigmaKa<pidtof_tiny::TOFNSigmaStoreKa>);
+DECLARE_SOA_TABLE(pidRespTOFTPr, "AOD", "pidRespTOFTPr", pidtof_tiny::TOFNSigmaStorePr, pidtof_tiny::TOFNSigmaPr<pidtof_tiny::TOFNSigmaStorePr>);
+DECLARE_SOA_TABLE(pidRespTOFTDe, "AOD", "pidRespTOFTDe", pidtof_tiny::TOFNSigmaStoreDe, pidtof_tiny::TOFNSigmaDe<pidtof_tiny::TOFNSigmaStoreDe>);
+DECLARE_SOA_TABLE(pidRespTOFTTr, "AOD", "pidRespTOFTTr", pidtof_tiny::TOFNSigmaStoreTr, pidtof_tiny::TOFNSigmaTr<pidtof_tiny::TOFNSigmaStoreTr>);
+DECLARE_SOA_TABLE(pidRespTOFTHe, "AOD", "pidRespTOFTHe", pidtof_tiny::TOFNSigmaStoreHe, pidtof_tiny::TOFNSigmaHe<pidtof_tiny::TOFNSigmaStoreHe>);
+DECLARE_SOA_TABLE(pidRespTOFTAl, "AOD", "pidRespTOFTAl", pidtof_tiny::TOFNSigmaStoreAl, pidtof_tiny::TOFNSigmaAl<pidtof_tiny::TOFNSigmaStoreAl>);
 
 namespace pidtpc
 {
@@ -262,15 +262,15 @@ DECLARE_SOA_TABLE(pidRespTPCHe, "AOD", "pidRespTPCHe", TPCExpSignalDiffHe<TPCNSi
 DECLARE_SOA_TABLE(pidRespTPCAl, "AOD", "pidRespTPCAl", TPCExpSignalDiffAl<TPCNSigmaAl, TPCExpSigmaAl>, TPCExpSigmaAl, TPCNSigmaAl);
 
 // Tiny size tables
-DECLARE_SOA_TABLE(pidRespTPCTEl, "AOD", "pidRespTPCTEl", TPCExpSigmaEl, pidtpc_tiny::TPCNSigmaStoreEl, pidtpc_tiny::TPCNSigmaEl<pidtpc_tiny::TPCNSigmaStoreEl>);
-DECLARE_SOA_TABLE(pidRespTPCTMu, "AOD", "pidRespTPCTMu", TPCExpSigmaMu, pidtpc_tiny::TPCNSigmaStoreMu, pidtpc_tiny::TPCNSigmaMu<pidtpc_tiny::TPCNSigmaStoreMu>);
-DECLARE_SOA_TABLE(pidRespTPCTPi, "AOD", "pidRespTPCTPi", TPCExpSigmaPi, pidtpc_tiny::TPCNSigmaStorePi, pidtpc_tiny::TPCNSigmaPi<pidtpc_tiny::TPCNSigmaStorePi>);
-DECLARE_SOA_TABLE(pidRespTPCTKa, "AOD", "pidRespTPCTKa", TPCExpSigmaKa, pidtpc_tiny::TPCNSigmaStoreKa, pidtpc_tiny::TPCNSigmaKa<pidtpc_tiny::TPCNSigmaStoreKa>);
-DECLARE_SOA_TABLE(pidRespTPCTPr, "AOD", "pidRespTPCTPr", TPCExpSigmaPr, pidtpc_tiny::TPCNSigmaStorePr, pidtpc_tiny::TPCNSigmaPr<pidtpc_tiny::TPCNSigmaStorePr>);
-DECLARE_SOA_TABLE(pidRespTPCTDe, "AOD", "pidRespTPCTDe", TPCExpSigmaDe, pidtpc_tiny::TPCNSigmaStoreDe, pidtpc_tiny::TPCNSigmaDe<pidtpc_tiny::TPCNSigmaStoreDe>);
-DECLARE_SOA_TABLE(pidRespTPCTTr, "AOD", "pidRespTPCTTr", TPCExpSigmaTr, pidtpc_tiny::TPCNSigmaStoreTr, pidtpc_tiny::TPCNSigmaTr<pidtpc_tiny::TPCNSigmaStoreTr>);
-DECLARE_SOA_TABLE(pidRespTPCTHe, "AOD", "pidRespTPCTHe", TPCExpSigmaHe, pidtpc_tiny::TPCNSigmaStoreHe, pidtpc_tiny::TPCNSigmaHe<pidtpc_tiny::TPCNSigmaStoreHe>);
-DECLARE_SOA_TABLE(pidRespTPCTAl, "AOD", "pidRespTPCTAl", TPCExpSigmaAl, pidtpc_tiny::TPCNSigmaStoreAl, pidtpc_tiny::TPCNSigmaAl<pidtpc_tiny::TPCNSigmaStoreAl>);
+DECLARE_SOA_TABLE(pidRespTPCTEl, "AOD", "pidRespTPCTEl", pidtpc_tiny::TPCNSigmaStoreEl, pidtpc_tiny::TPCNSigmaEl<pidtpc_tiny::TPCNSigmaStoreEl>);
+DECLARE_SOA_TABLE(pidRespTPCTMu, "AOD", "pidRespTPCTMu", pidtpc_tiny::TPCNSigmaStoreMu, pidtpc_tiny::TPCNSigmaMu<pidtpc_tiny::TPCNSigmaStoreMu>);
+DECLARE_SOA_TABLE(pidRespTPCTPi, "AOD", "pidRespTPCTPi", pidtpc_tiny::TPCNSigmaStorePi, pidtpc_tiny::TPCNSigmaPi<pidtpc_tiny::TPCNSigmaStorePi>);
+DECLARE_SOA_TABLE(pidRespTPCTKa, "AOD", "pidRespTPCTKa", pidtpc_tiny::TPCNSigmaStoreKa, pidtpc_tiny::TPCNSigmaKa<pidtpc_tiny::TPCNSigmaStoreKa>);
+DECLARE_SOA_TABLE(pidRespTPCTPr, "AOD", "pidRespTPCTPr", pidtpc_tiny::TPCNSigmaStorePr, pidtpc_tiny::TPCNSigmaPr<pidtpc_tiny::TPCNSigmaStorePr>);
+DECLARE_SOA_TABLE(pidRespTPCTDe, "AOD", "pidRespTPCTDe", pidtpc_tiny::TPCNSigmaStoreDe, pidtpc_tiny::TPCNSigmaDe<pidtpc_tiny::TPCNSigmaStoreDe>);
+DECLARE_SOA_TABLE(pidRespTPCTTr, "AOD", "pidRespTPCTTr", pidtpc_tiny::TPCNSigmaStoreTr, pidtpc_tiny::TPCNSigmaTr<pidtpc_tiny::TPCNSigmaStoreTr>);
+DECLARE_SOA_TABLE(pidRespTPCTHe, "AOD", "pidRespTPCTHe", pidtpc_tiny::TPCNSigmaStoreHe, pidtpc_tiny::TPCNSigmaHe<pidtpc_tiny::TPCNSigmaStoreHe>);
+DECLARE_SOA_TABLE(pidRespTPCTAl, "AOD", "pidRespTPCTAl", pidtpc_tiny::TPCNSigmaStoreAl, pidtpc_tiny::TPCNSigmaAl<pidtpc_tiny::TPCNSigmaStoreAl>);
 
 #undef DEFINE_UNWRAP_NSIGMA_COLUMN
 
diff --git a/Analysis/Tasks/pidTOF_tiny.cxx b/Analysis/Tasks/pidTOF_tiny.cxx
index 895778d00f48b..c31a902bf96bc 100644
--- a/Analysis/Tasks/pidTOF_tiny.cxx
+++ b/Analysis/Tasks/pidTOF_tiny.cxx
@@ -77,13 +77,13 @@ struct pidTOFTaskTiny {
       const float exp_sigma = resp_PID.GetExpectedSigma(resp, trk.collision(), trk);
       const float separation = resp_PID.GetSeparation(resp, trk.collision(), trk);
       if (separation <= o2::aod::pidtof_tiny::binned_min) {
-        tofpid(exp_sigma, o2::aod::pidtof_tiny::lower_bin);
+        tofpid(o2::aod::pidtof_tiny::lower_bin);
       } else if (separation >= o2::aod::pidtof_tiny::binned_max) {
-        tofpid(exp_sigma, o2::aod::pidtof_tiny::upper_bin);
+        tofpid(o2::aod::pidtof_tiny::upper_bin);
       } else if (separation >= 0) {
-        tofpid(exp_sigma, separation / o2::aod::pidtof_tiny::bin_width + 0.5f);
+        tofpid(separation / o2::aod::pidtof_tiny::bin_width + 0.5f);
       } else {
-        tofpid(exp_sigma, separation / o2::aod::pidtof_tiny::bin_width - 0.5f);
+        tofpid(separation / o2::aod::pidtof_tiny::bin_width - 0.5f);
       }
     }
   }
diff --git a/Analysis/Tasks/pidTPC_tiny.cxx b/Analysis/Tasks/pidTPC_tiny.cxx
index 8906fc5cbdc5f..33759806a07be 100644
--- a/Analysis/Tasks/pidTPC_tiny.cxx
+++ b/Analysis/Tasks/pidTPC_tiny.cxx
@@ -79,13 +79,13 @@ struct pidTPCTaskTiny {
       const float exp_sigma = resp_PID.GetExpectedSigma(resp, trk.collision(), trk);
       const float separation = resp_PID.GetSeparation(resp, trk.collision(), trk);
       if (separation <= o2::aod::pidtpc_tiny::binned_min) {
-        tpcpid(exp_sigma, o2::aod::pidtpc_tiny::lower_bin);
+        tpcpid(o2::aod::pidtpc_tiny::lower_bin);
       } else if (separation >= o2::aod::pidtpc_tiny::binned_max) {
-        tpcpid(exp_sigma, o2::aod::pidtpc_tiny::upper_bin);
+        tpcpid(o2::aod::pidtpc_tiny::upper_bin);
       } else if (separation >= 0) {
-        tpcpid(exp_sigma, separation / o2::aod::pidtpc_tiny::bin_width + 0.5f);
+        tpcpid(separation / o2::aod::pidtpc_tiny::bin_width + 0.5f);
       } else {
-        tpcpid(exp_sigma, separation / o2::aod::pidtpc_tiny::bin_width - 0.5f);
+        tpcpid(separation / o2::aod::pidtpc_tiny::bin_width - 0.5f);
       }
     }
   }
@@ -161,13 +161,13 @@ struct pidTPCTaskTinyFull {
     const float exp_sigma = PID_RESPONSE.GetExpectedSigma(resp, trk.collision(), trk); \
     const float separation = PID_RESPONSE.GetSeparation(resp, trk.collision(), trk);   \
     if (separation <= o2::aod::pidtpc_tiny::binned_min) {                              \
-      PID_TABLE(exp_sigma, o2::aod::pidtpc_tiny::lower_bin);                           \
+      PID_TABLE(o2::aod::pidtpc_tiny::lower_bin);                                      \
     } else if (separation >= o2::aod::pidtpc_tiny::binned_max) {                       \
-      PID_TABLE(exp_sigma, o2::aod::pidtpc_tiny::upper_bin);                           \
+      PID_TABLE(o2::aod::pidtpc_tiny::upper_bin);                                      \
     } else if (separation >= 0) {                                                      \
-      PID_TABLE(exp_sigma, separation / o2::aod::pidtpc_tiny::bin_width + 0.5f);       \
+      PID_TABLE(separation / o2::aod::pidtpc_tiny::bin_width + 0.5f);                  \
     } else {                                                                           \
-      PID_TABLE(exp_sigma, separation / o2::aod::pidtpc_tiny::bin_width - 0.5f);       \
+      PID_TABLE(separation / o2::aod::pidtpc_tiny::bin_width - 0.5f);                  \
     }                                                                                  \
   }