Merge branch 'master' into fixes-Common

Author: vkucera

PWGLF/TableProducer/Strangeness/cascderivedqaanalysis.cxx

@@ -34,6 +34,7 @@
 #include <TString.h>
 
 #include <array>
+#include <cmath>
 #include <cstdint>
 #include <string>
 #include <vector>

PWGLF/Tasks/Resonances/k1analysis.cxx

@@ -47,7 +47,6 @@
 #include <Math/GenVector/PxPyPzM4D.h>
 #include <Math/GenVector/RotationZ.h>
 #include <TH1.h>
-#include <TPDGCode.h>
 
 #include <chrono>
 #include <cstdint>
@@ -170,10 +169,10 @@ struct K1analysis {
     Configurable<float> cfgRejectTOFnSigmaKaon{"cfgRejectTOFnSigmaKaon", 3.0, "TOF nSigma reject cut for Kaon (reject)"};       // TOF
     Configurable<float> cfgRejectTOFnSigmaProton{"cfgRejectTOFnSigmaProton", 3.0, "TOF nSigma reject cut for Proton (reject)"}; // TOF
     Configurable<float> cfgNsigmaCutCombinedPion{"cfgNsigmaCutCombinedPion", 3.0, "Combined nSigma cut for Pion"};              // Combined
-    Configurable<bool> cfgTOFVeto{"cfgTOFVeto", false, "TOF Veto, if false, TOF is nessessary for PID selection"};  // TOF Veto
-    Configurable<bool> cfgRequireTOFHighPt{"cfgRequireTOFHighPt", true, "Require TOF information for pT > cfgTOFMinPt"}; // TOF Require
-    Configurable<bool> cfgUseCircularCut{"cfgUseCircularCut", true, "Use combined TPC-TOF circular cut"};                // Use circular cut
-    Configurable<float> cfgTOFMinPt{"cfgTOFMinPt", 0.5, "Minimum TOF pT cut for Pion"};                                  // TOF pT cut
+    Configurable<bool> cfgTOFVeto{"cfgTOFVeto", false, "TOF Veto, if false, TOF is nessessary for PID selection"};              // TOF Veto
+    Configurable<bool> cfgRequireTOFHighPt{"cfgRequireTOFHighPt", true, "Require TOF information for pT > cfgTOFMinPt"};        // TOF Require
+    Configurable<bool> cfgUseCircularCut{"cfgUseCircularCut", true, "Use combined TPC-TOF circular cut"};                       // Use circular cut
+    Configurable<float> cfgTOFMinPt{"cfgTOFMinPt", 0.5, "Minimum TOF pT cut for Pion"};                                         // TOF pT cut
   } PIDCuts;
 
   // Track selections

PWGLF/Tasks/Resonances/kstarqa.cxx

@@ -42,7 +42,6 @@
 #include <Framework/O2DatabasePDGPlugin.h>
 #include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
-#include <ReconstructionDataFormats/PID.h>
 
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector3Dfwd.h>
@@ -53,8 +52,6 @@
 #include <TPDGCode.h>
 #include <TRandom.h>
 #include <TRandom3.h>
-#include <TString.h>
-#include <TVector2.h>
 
 #include <algorithm>
 #include <array>

PWGLF/Tasks/Resonances/lambda1520analysisinpp.cxx

@@ -46,6 +46,7 @@
 
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
 #include <Math/Vector4Dfwd.h>
+#include <TH1.h>
 #include <TPDGCode.h>
 #include <TRandom.h>
 

PWGLF/Tasks/Strangeness/phiStrangeCorrelation.cxx

@@ -40,6 +40,7 @@
 #include <Framework/runDataProcessing.h>
 
 #include <TH1.h>
+#include <TH2.h>
 #include <TH3.h>
 #include <TPDGCode.h>
 
@@ -56,6 +57,7 @@
 #include <string>
 #include <string_view>
 #include <tuple>
+#include <type_traits>
 #include <unordered_map>
 #include <utility>
 #include <variant>

PWGLF/Utils/inelGt.h

@@ -20,7 +20,6 @@
 #define PWGLF_UTILS_INELGT_H_
 
 #include <Framework/AnalysisDataModel.h>
-#include <Framework/O2DatabasePDGPlugin.h> // IWYU pragma: keep (until PWGCF gets fixed)
 
 #include <TParticlePDG.h>