[PWGEM] Fix clang-tidy warning and errors in more photon meson code (#17054)

Author: mhemmer-cern

PWGEM/PhotonMeson/Core/DalitzEECut.cxx

@@ -17,16 +17,12 @@
 
 #include <Framework/Logger.h>
 
-#include <Rtypes.h>
-
 #include <cstdint>
 #include <functional>
 #include <set>
 #include <utility>
 
-ClassImp(DalitzEECut);
-
-// const char* DalitzEECut::mCutNames[static_cast<int>(DalitzEECut::DalitzEECuts::kNCuts)] = {"Mee", "PairPtRange", "PairRapidityRange", "PairDCARange", "PhivPair", "TrackPtRange", "TrackEtaRange", "TPCNCls", "TPCCrossedRows", "TPCCrossedRowsOverNCls", "TPCChi2NDF", "TPCNsigmaEl", "TPCNsigmaMu", "TPCNsigmaPi", "TPCNsigmaKa", "TPCNsigmaPr", "TOFNsigmaEl", "TOFNsigmaMu", "TOFNsigmaPi", "TOFNsigmaKa", "TOFNsigmaPr", "DCA3Dsigma", "DCAxy", "DCAz", "ITSNCls", "ITSChi2NDF", "ITSClusterSize", "Prefilter"};
+// std::array<std::string, static_cast<std::size_t>(DalitzEECut::DalitzEECuts::kNCuts)> DalitzEECut::mCutNames = {"Mee", "PairPtRange", "PairRapidityRange", "PairDCARange", "PhivPair", "TrackPtRange", "TrackEtaRange", "TPCNCls", "TPCCrossedRows", "TPCCrossedRowsOverNCls", "TPCChi2NDF", "TPCNsigmaEl", "TPCNsigmaMu", "TPCNsigmaPi", "TPCNsigmaKa", "TPCNsigmaPr", "TOFNsigmaEl", "TOFNsigmaMu", "TOFNsigmaPi", "TOFNsigmaKa", "TOFNsigmaPr", "DCA3Dsigma", "DCAxy", "DCAz", "ITSNCls", "ITSChi2NDF", "ITSClusterSize", "Prefilter"};
 
 const std::pair<int8_t, std::set<uint8_t>> DalitzEECut::its_ib_any_Requirement = {1, {0, 1, 2}}; // hits on any ITS ib layers.
 const std::pair<int8_t, std::set<uint8_t>> DalitzEECut::its_ib_1st_Requirement = {1, {0}};       // hit on 1st ITS ib layers.
@@ -49,7 +45,7 @@ void DalitzEECut::SetMeeRange(float min, float max)
   mMaxMee = max;
   LOG(info) << "DalitzEE Cut, set mee range: " << mMinMee << " - " << mMaxMee;
 }
-void DalitzEECut::SetMaxPhivPairMeeDep(std::function<float(float)> meeDepCut)
+void DalitzEECut::SetMaxPhivPairMeeDep(const std::function<float(float)>& meeDepCut)
 {
   mMaxPhivPairMeeDep = meeDepCut;
   LOG(info) << "DalitzEE Cut, set max phiv pair mee dep: " << mMaxPhivPairMeeDep(0.02);
@@ -133,7 +129,7 @@ void DalitzEECut::SetMaxDcaZ(float maxDcaZ)
   LOG(info) << "DalitzEE Cut, set max DCA z: " << mMaxDcaZ;
 }
 
-void DalitzEECut::SetMaxDcaXYPtDep(std::function<float(float)> ptDepCut)
+void DalitzEECut::SetMaxDcaXYPtDep(const std::function<float(float)>& ptDepCut)
 {
   mMaxDcaXYPtDep = ptDepCut;
   LOG(info) << "DalitzEE Cut, set max DCA xy pt dep: " << mMaxDcaXYPtDep(1.0);
@@ -182,7 +178,7 @@ void DalitzEECut::SetChi2TOF(float min, float max)
 void DalitzEECut::SetPIDScheme(int scheme)
 {
   mPIDScheme = scheme;
-  LOG(info) << "DalitzEE Cut, PID scheme: " << static_cast<int>(mPIDScheme);
+  LOG(info) << "DalitzEE Cut, PID scheme: " << mPIDScheme;
 }
 void DalitzEECut::IncludeITSsa(bool flag, float max)
 {

PWGEM/PhotonMeson/Core/DalitzEECut.h

@@ -61,16 +61,16 @@ class DalitzEECut
     kITSChi2NDF,
     kNCuts
   };
-  static const char* mCutNames[static_cast<int>(DalitzEECuts::kNCuts)];
+  // static std::array<std::string, static_cast<std::size_t>(DalitzEECuts::kNCuts)> mCutNames;
 
   enum class PIDSchemes : int {
     kUnDef = -1,
     kTOFif = 0,
     kTPConly = 1,
   };
 
-  const std::string getName() const { return name; }
-  const std::string getTitle() const { return title; }
+  [[nodiscard]] const std::string& getName() const { return name; }
+  [[nodiscard]] const std::string& getTitle() const { return title; }
 
   template <o2::soa::is_iterator TTrack1, o2::soa::is_iterator TTrack2>
   bool IsSelected(TTrack1 const& t1, TTrack2 const& t2, float bz) const
@@ -205,8 +205,6 @@ class DalitzEECut
         return PassTOFif(track);
 
       case static_cast<int>(PIDSchemes::kUnDef):
-        return true;
-
       default:
         return true;
     }
@@ -278,7 +276,7 @@ class DalitzEECut
   void SetPairPtRange(float minPt = 0.f, float maxPt = 1e10f);
   void SetPairYRange(float minY = -1e10f, float maxY = 1e10f);
   void SetMeeRange(float min = 0.f, float max = 0.04);
-  void SetMaxPhivPairMeeDep(std::function<float(float)> meeDepCut);
+  void SetMaxPhivPairMeeDep(const std::function<float(float)>& meeDepCut);
   void SelectPhotonConversion(bool flag);
 
   void SetTrackPtRange(float minPt = 0.f, float maxPt = 1e10f);
@@ -303,13 +301,13 @@ class DalitzEECut
   void SetTrackDca3DRange(float min, float max); // in sigma
   void SetMaxDcaXY(float maxDcaXY);              // in cm
   void SetMaxDcaZ(float maxDcaZ);                // in cm
-  void SetMaxDcaXYPtDep(std::function<float(float)> ptDepCut);
+  void SetMaxDcaXYPtDep(const std::function<float(float)>& ptDepCut);
   void ApplyPrefilter(bool flag);
   void ApplyPhiV(bool flag);
   void IncludeITSsa(bool flag, float maxpt);
 
   // Getters
-  bool IsPhotonConversionSelected() const { return mSelectPC; }
+  [[nodiscard]] bool IsPhotonConversionSelected() const { return mSelectPC; }
 
  private:
   std::string name;
@@ -321,8 +319,8 @@ class DalitzEECut
   float mMinPairPt{0.f}, mMaxPairPt{1e10f};  // range in pT
   float mMinPairY{-1e10f}, mMaxPairY{1e10f}; // range in rapidity
   float mMinPhivPair{0.f}, mMaxPhivPair{+3.2};
-  std::function<float(float)> mMaxPhivPairMeeDep{}; // max phiv as a function of mee
-  bool mSelectPC{false};                            // flag to select photon conversion used in mMaxPhivPairMeeDep
+  std::function<float(float)> mMaxPhivPairMeeDep; // max phiv as a function of mee
+  bool mSelectPC{false};                          // flag to select photon conversion used in mMaxPhivPairMeeDep
 
   // kinematic cuts
   float mMinTrackPt{0.f}, mMaxTrackPt{1e10f};      // range in pT
@@ -340,11 +338,11 @@ class DalitzEECut
   bool mRequireITSibAny{true};
   bool mRequireITSib1st{false};
 
-  float mMinDca3D{0.0f};                        // min dca in 3D in units of sigma
-  float mMaxDca3D{1e+10};                       // max dca in 3D in units of sigma
-  float mMaxDcaXY{1.0f};                        // max dca in xy plane
-  float mMaxDcaZ{1.0f};                         // max dca in z direction
-  std::function<float(float)> mMaxDcaXYPtDep{}; // max dca in xy plane as function of pT
+  float mMinDca3D{0.0f};                      // min dca in 3D in units of sigma
+  float mMaxDca3D{1e+10};                     // max dca in 3D in units of sigma
+  float mMaxDcaXY{1.0f};                      // max dca in xy plane
+  float mMaxDcaZ{1.0f};                       // max dca in z direction
+  std::function<float(float)> mMaxDcaXYPtDep; // max dca in xy plane as function of pT
   bool mApplyPhiV{true};
   float mMinMeanClusterSizeITS{-1e10f}, mMaxMeanClusterSizeITS{1e10f}; // <its cluster size> x cos(lmabda)
   float mMinChi2TOF{-1e10f}, mMaxChi2TOF{1e10f};                       // max tof chi2 per

PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx

@@ -19,6 +19,8 @@
 
 #include <Framework/Logger.h>
 
+#include <array>
+#include <cstddef>
 #include <string>
 
 std::array<std::string, static_cast<std::size_t>(EMCPhotonCut::EMCPhotonCuts::kNCuts)> EMCPhotonCut::mCutNames = {"Definition", "Energy", "NCell", "M02", "Timing", "TrackMatching", "SecTrackMatching", "Exotic"};

PWGEM/PhotonMeson/TableProducer/skimmerGammaCalo.cxx

@@ -351,8 +351,8 @@ struct SkimmerGammaCalo {
   PROCESS_SWITCH(SkimmerGammaCalo, processDummy, "Dummy function", false);
 };
 
-WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+WorkflowSpec defineDataProcessing(ConfigContext const& context)
 {
-  WorkflowSpec workflow{adaptAnalysisTask<SkimmerGammaCalo>(cfgc)};
+  WorkflowSpec workflow{adaptAnalysisTask<SkimmerGammaCalo>(context)};
   return workflow;
 }