Merge branch 'master' into iwyu-PWGCF

Author: vkucera

ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx

@@ -33,6 +33,7 @@
 #include "Common/Core/trackUtilities.h"
 
 #include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/MathConstants.h>
 #include <CommonConstants/PhysicsConstants.h>
 #include <DetectorsBase/Propagator.h>
 #include <Framework/AnalysisDataModel.h>
@@ -56,6 +57,7 @@
 #include <TRandom3.h>
 #include <TString.h>
 
+#include <algorithm>
 #include <array>
 #include <cmath>
 #include <cstdlib>

ALICE3/TableProducer/alice3Multiplicity.cxx

@@ -31,8 +31,6 @@
 #include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
 
-#include <TH1.h>
-
 #include <cmath>
 #include <cstdlib>
 

ALICE3/TableProducer/alice3TrackingTranslator.cxx

@@ -27,7 +27,6 @@
 #include <Framework/Configurable.h>
 #include <Framework/DataTypes.h>
 #include <Framework/HistogramRegistry.h>
-#include <Framework/HistogramSpec.h>
 #include <Framework/InitContext.h>
 #include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
@@ -46,7 +45,6 @@
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
-#include <algorithm>
 #include <array>
 #include <cmath>
 #include <cstddef>

ALICE3/Tasks/alice3-dilepton.cxx

@@ -41,6 +41,7 @@
 #include <TMath.h>
 #include <TPDGCode.h>
 
+#include <cstdlib>
 #include <vector>
 
 using namespace o2;

ALICE3/Tasks/alice3DqEfficiency.cxx

@@ -23,12 +23,10 @@
 #include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 #include "ALICE3/DataModel/ReducedTablesAlice3.h"
 #include "Common/Core/TableHelper.h"
 
-#include <DetectorsBase/MatLayerCylSet.h>
 #include <Framework/ASoAHelpers.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
@@ -43,7 +41,6 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
-#include <cstddef>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>

ALICE3/Tasks/alice3Multicharm.cxx

@@ -41,7 +41,6 @@
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
-#include <map>
 #include <string>
 #include <vector>
 

Common/Tasks/centralityQa.cxx

@@ -12,7 +12,7 @@
 ///
 /// \file centralityQa.cxx
 /// \brief This task does dedicated centrality QA
-/// \author ALICE
+/// \author ALICE Collaboration
 ///
 
 #include "Common/CCDB/EventSelectionParams.h"
@@ -962,7 +962,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator ft0m = initEstimator(col, "FT0");
@@ -1018,7 +1018,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator ft0a = initEstimator(col, "FT0A");
@@ -1074,7 +1074,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator ft0c = initEstimator(col, "FT0C");
@@ -1130,7 +1130,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator ft0cVar1 = initEstimator(col, "FT0CVariant1");
@@ -1186,7 +1186,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator ft0cVar2 = initEstimator(col, "FT0CVariant2");
@@ -1242,7 +1242,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator fddm = initEstimator(col, "FDDM");
@@ -1298,7 +1298,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator ntpv = initEstimator(col, "NTPV");
@@ -1353,7 +1353,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator nGlo = initEstimator(col, "nGlo");
@@ -1409,7 +1409,7 @@ struct CentralityQa {
   {
     for (auto const& col : collisions) {
       if (!isCollisionAccepted(col)) {
-        return;
+        continue;
       }
 
       Estimator mft = initEstimator(col, "MFT");