Merge branch 'AliceO2Group:master' into jethadronBranch

Author: yhou-git

Common/TableProducer/zdcTaskLightIons.cxx

@@ -208,7 +208,7 @@ struct ZdcTaskLightIons {
           }
         }
         if (isZNChit && isZNAhit) {
-          registry.get<TH1>(HIST("zdcDebunchHist"))->Fill(zna - znc, zna + znc);
+          registry.get<TH2>(HIST("zdcDebunchHist"))->Fill(zna - znc, zna + znc);
         }
 
         zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
@@ -311,7 +311,7 @@ struct ZdcTaskLightIons {
           }
         }
         if (isZNChit && isZNAhit) {
-          registry.get<TH1>(HIST("zdcDebunchHist"))->Fill(zna - znc, zna + znc);
+          registry.get<TH2>(HIST("zdcDebunchHist"))->Fill(zna - znc, zna + znc);
         }
 
         zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],

Common/Tools/PID/pidTPCModule.h

@@ -294,7 +294,9 @@ class pidTPCModule
         LOGF(info, "***************************************************");
         LOGF(info, "No need for TPC only information detected. Will not generate Nsigma for TPC only tracks");
         LOGF(info, "If this is unexpected behaviour and a necessity was not identified, please add the");
-        LOGF(info, "corresponding task to the list 'devicesRequiringTPCOnlyPID' in pidTPCModule::Init()");
+        LOGF(info, "corresponding task to the configurable 'devicesRequiringTPCOnlyPID' of this task");
+        LOGF(info, "To do that, please get in touch with core service wagon maintainers and ask:");
+        LOGF(info, "It is always best to use core service wagons instead of private copies");
       }
       LOGF(info, "***************************************************");
     }