[PWGEM,PhotonMeson] Adapt IsSelected function from cut librarires and add new cluster tables for reduced derived data size

- The `IsSelected` function defined in `DalitzEECut`, `EMCPhotonCut`, `PHOSPhotonCut` and `V0PhotonCut` was changed to always have as first argument the photon and then additional arguments and template arguments specifilcy for that photon reconstruction method, e.g. matchedtrack tables for EMC or type of the legs for V0. For `DalitzEECut` the arguments are now track1, track2, B_z instead of one argument that basically packed those three into a tuple.
- Based on the change above many tasks where changed accordingly where `IsSelected` was called. This was mostly just making sure the correct template arguments are given.
- Changed `Pi0EtaToGammaGamma` header files to make them more readable (hopefully). Main change here is the addition of Tags for PCM, EMC, PHOS and DalitzEE and streamlining the template parameters of the main struct and the `runPairing` function
- Add new EMCal cluster tables:
  - `EmEmcClusters_000` to store just the cluster information
  - `EmEmcMTracks` to store just the matched global tracks in a flat table linked to the EmEmcClusters_000 index
  - EmEmcMSTracks to store just the matched secondary tracks in a flat table linked to the EmEmcClusters_000 index
  - `MinClusters` just like `EmEmcClusters_000` but with reduced data size by compression to int16_t where possible
  - `MinMTracks` similar to above for `EmEmcMTracks`
  - `MinMSTracks` similar to above for `EmEmcMSTracks`

- Changed includes to follow IWYU for all touched files
- Changed `M_PI` calls where I saw them to use the o2 constants equivalent, since they are `constexpr` instead of just `const`.
- Optimize compile time by using `is_table` and `is_iterator` instead of `typename` for templates in Pi0EtaToGammaGamma task and photon cuts.
- Fix cpplint errors on all touched files and specifically for `gammaConversions.h` and `gammaConversionsTruthOnlyMc.cxx`
- increment ClassDef of photon cuts

Author: mhemmer-cern

PWGEM/PhotonMeson/Core/DalitzEECut.cxx

@@ -9,14 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-//
-// Class for dilepton Cut
-//
+/// \file EMCPhotonCut.cxx
+/// \brief header of class for dalitz ee cuts.
+/// \author D. Sekihata, daiki.sekihata@cern.ch
 
 #include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
 
 #include "Framework/Logger.h"
 
+#include <Rtypes.h>
+
+#include <cstdint>
+#include <functional>
 #include <set>
 #include <utility>
 

PWGEM/PhotonMeson/Core/DalitzEECut.h

@@ -9,31 +9,29 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-//
-// Class for dalitz ee selection
-//
+/// \file EMCPhotonCut.cxx
+/// \brief header of class for dalitz ee cuts.
+/// \author D. Sekihata, daiki.sekihata@cern.ch
 
 #ifndef PWGEM_PHOTONMESON_CORE_DALITZEECUT_H_
 #define PWGEM_PHOTONMESON_CORE_DALITZEECUT_H_
 
 #include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
 #include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <CommonConstants/PhysicsConstants.h>
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/DataTypes.h"
-#include "Framework/Logger.h"
+#include <Math/Vector4D.h> // IWYU pragma: keep
+#include <Math/Vector4Dfwd.h>
+#include <TNamed.h>
 
-#include "Math/Vector4D.h"
-#include "TNamed.h"
+#include <Rtypes.h>
 
 #include <algorithm>
+#include <cstdint>
+#include <functional>
 #include <set>
-#include <string>
 #include <utility>
-#include <vector>
 
 using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
 
@@ -74,13 +72,9 @@ class DalitzEECut : public TNamed
     kTPConly = 1,
   };
 
-  template <typename T = int, typename TPair>
-  bool IsSelected(TPair const& pair) const
+  template <typename TTrack1, typename TTrack2>
+  bool IsSelected(TTrack1 const& t1, TTrack2 const& t2, float bz) const
   {
-    auto t1 = std::get<0>(pair);
-    auto t2 = std::get<1>(pair);
-    float bz = std::get<2>(pair);
-
     if (!IsSelectedTrack(t1) || !IsSelectedTrack(t2)) {
       return false;
     }
@@ -361,7 +355,7 @@ class DalitzEECut : public TNamed
   float mMinTPCNsigmaPi{0}, mMaxTPCNsigmaPi{0};
   float mMinTOFNsigmaEl{-1e+10}, mMaxTOFNsigmaEl{+1e+10};
 
-  ClassDef(DalitzEECut, 1);
+  ClassDef(DalitzEECut, 2);
 };
 
 #endif // PWGEM_PHOTONMESON_CORE_DALITZEECUT_H_

PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

@@ -8,50 +8,56 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-//
-// ========================
-//
+
 /// \file DiphotonHadronMPC.h
 /// \brief This code is to analyze diphoton-hadron correlation. Keep in mind that cumulant method does not require event mixing.
-///
 /// \author D. Sekihata, daiki.sekihata@cern.ch
 
 #ifndef PWGEM_PHOTONMESON_CORE_DIPHOTONHADRONMPC_H_
 #define PWGEM_PHOTONMESON_CORE_DIPHOTONHADRONMPC_H_
 
 #include "PWGEM/Dilepton/Core/EMTrackCut.h"
 #include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
 #include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
 #include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
 #include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
 #include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "Common/CCDB/RCTSelectionFlags.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
-#include "Math/Vector4D.h"
-#include "TString.h"
+#include <Common/CCDB/RCTSelectionFlags.h>
+#include <Common/Core/RecoDecay.h>
+#include <Common/DataModel/Centrality.h>
+#include <Common/DataModel/EventSelection.h>
+#include <Common/DataModel/PIDResponseTPC.h>
+
+#include <CCDB/BasicCCDBManager.h>
+#include <CCDB/CcdbApi.h>
+#include <CommonConstants/MathConstants.h>
+#include <CommonConstants/PhysicsConstants.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+#include <Framework/ASoAHelpers.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisHelpers.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/Configurable.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/HistogramSpec.h>
+#include <Framework/InitContext.h>
+#include <Framework/OutputObjHeader.h>
+#include <Framework/runDataProcessing.h>
+
+#include <Math/Vector4D.h> // IWYU pragma: keep
+#include <Math/Vector4Dfwd.h>
 
 #include <algorithm>
-#include <array>
-#include <cstring>
-#include <iterator>
+#include <cmath>
+#include <cstdint>
 #include <map>
 #include <string>
+#include <string_view>
 #include <tuple>
 #include <utility>
 #include <vector>
@@ -353,11 +359,11 @@ struct DiphotonHadronMPC {
 
     // diphoton-hadron info
     const AxisSpec axis_deta{ConfDEtaBins, deta_axis_title};
-    const AxisSpec axis_dphi{cfgNbinsDPhi, -M_PI / 2, +3 * M_PI / 2, dphi_axis_title};
+    const AxisSpec axis_dphi{cfgNbinsDPhi, -o2::constants::math::PIHalf, +3 * o2::constants::math::PIHalf, dphi_axis_title};
 
     const AxisSpec axis_pt_hadron{ConfPtHadronBins, "p_{T,h} (GeV/c)"};
     const AxisSpec axis_eta_hadron{40, -2, +2, "#eta_{h}"};
-    const AxisSpec axis_phi_hadron{36, 0, 2 * M_PI, "#varphi_{h} (rad.)"};
+    const AxisSpec axis_phi_hadron{36, 0, o2::constants::math::TwoPI, "#varphi_{h} (rad.)"};
 
     fRegistry.add("Hadron/hs", "hadron", kTHnSparseD, {axis_pt_hadron, axis_eta_hadron, axis_phi_hadron}, false);
     fRegistry.add("Hadron/hTrackBit", "track bit", kTH1D, {{65536, -0.5, 65535.5}}, false);
@@ -370,7 +376,7 @@ struct DiphotonHadronMPC {
 
     // hadron-hadron
     const AxisSpec axis_deta_hh{60, -3, +3, "#Delta#eta = #eta_{h}^{ref1} - #eta_{h}^{ref2}"};
-    const AxisSpec axis_dphi_hh{90, -M_PI / 2, +3 * M_PI / 2, "#Delta#varphi = #varphi_{h}^{ref1} - #varphi_{h}^{ref2} (rad.)"};
+    const AxisSpec axis_dphi_hh{90, -o2::constants::math::PIHalf, +3 * o2::constants::math::PIHalf, "#Delta#varphi = #varphi_{h}^{ref1} - #varphi_{h}^{ref2} (rad.)"};
     // const AxisSpec axis_cosndphi_hh{cfgNbinsCosNDPhi, -1, +1, std::format("cos({0:d}(#varphi_{{h}}^{{ref1}} - #varphi_{{h}}^{{ref2}}))", cfgNmod.value)};
     fRegistry.add("HadronHadron/same/hDEtaDPhi", "hadron-hadron 2PC", kTH2D, {axis_dphi_hh, axis_deta_hh}, true);
     fRegistry.addClone("HadronHadron/same/", "HadronHadron/mix/");
@@ -564,7 +570,7 @@ struct DiphotonHadronMPC {
         auto photons2_per_collision = photons2.sliceBy(perCollision2, collision.globalIndex());
 
         for (const auto& [g1, g2] : combinations(CombinationsStrictlyUpperIndexPolicy(photons1_per_collision, photons2_per_collision))) {
-          if (!cut1.template IsSelected<TSubInfos1>(g1) || !cut2.template IsSelected<TSubInfos2>(g2)) {
+          if (!cut1.template IsSelected<decltype(g1), TSubInfos1>(g1) || !cut2.template IsSelected<decltype(g2), TSubInfos2>(g2)) {
             continue;
           }
 
@@ -594,7 +600,7 @@ struct DiphotonHadronMPC {
               float deta = v12.Eta() - v3.Eta();
               float dphi = v12.Phi() - v3.Phi();
               // o2::math_utils::bringTo02Pi(dphi);
-              dphi = RecoDecay::constrainAngle(dphi, -M_PI / 2, 1U);
+              dphi = RecoDecay::constrainAngle(dphi, -o2::constants::math::PIHalf, 1U);
               fRegistry.fill(HIST("DiphotonHadron/same/hs"), v12.M(), v12.Pt(), deta, dphi);
               npair++;
             }
@@ -624,7 +630,7 @@ struct DiphotonHadronMPC {
         auto electrons_per_collision = electrons->sliceByCached(o2::aod::emprimaryelectron::emeventId, collision.globalIndex(), cache);
 
         for (const auto& g1 : photons1_per_collision) {
-          if (!cut1.template IsSelected<TSubInfos1>(g1)) {
+          if (!cut1.template IsSelected<decltype(g1), TSubInfos1>(g1)) {
             continue;
           }
           auto pos1 = g1.template posTrack_as<TSubInfos1>();
@@ -670,7 +676,7 @@ struct DiphotonHadronMPC {
               float deta = veeg.Eta() - v3.Eta();
               float dphi = veeg.Phi() - v3.Phi();
               // o2::math_utils::bringTo02Pi(dphi);
-              dphi = RecoDecay::constrainAngle(dphi, -M_PI / 2, 1U);
+              dphi = RecoDecay::constrainAngle(dphi, -o2::constants::math::PIHalf, 1U);
               fRegistry.fill(HIST("DiphotonHadron/same/hs"), veeg.M(), veeg.Pt(), deta, dphi);
               npair++;
 
@@ -720,7 +726,7 @@ struct DiphotonHadronMPC {
             float deta = ref1.eta() - ref2.eta();
             float dphi = ref1.phi() - ref2.phi();
             // o2::math_utils::bringTo02Pi(dphi);
-            dphi = RecoDecay::constrainAngle(dphi, -M_PI / 2, 1U);
+            dphi = RecoDecay::constrainAngle(dphi, -o2::constants::math::PIHalf, 1U);
             fRegistry.fill(HIST("HadronHadron/same/hDEtaDPhi"), dphi, deta);
           }
         }
@@ -794,7 +800,7 @@ struct DiphotonHadronMPC {
               float deta = trg.eta() - ref.eta();
               float dphi = trg.phi() - ref.phi();
               // o2::math_utils::bringTo02Pi(dphi);
-              dphi = RecoDecay::constrainAngle(dphi, -M_PI / 2, 1U);
+              dphi = RecoDecay::constrainAngle(dphi, -o2::constants::math::PIHalf, 1U);
               fRegistry.fill(HIST("DiphotonHadron/mix/hs"), trg.mass(), trg.pt(), deta, dphi);
             }
           }
@@ -889,7 +895,7 @@ struct DiphotonHadronMPC {
               float deta = trg.eta() - ref.eta();
               float dphi = trg.phi() - ref.phi();
               // o2::math_utils::bringTo02Pi(dphi);
-              dphi = RecoDecay::constrainAngle(dphi, -M_PI / 2, 1U);
+              dphi = RecoDecay::constrainAngle(dphi, -o2::constants::math::PIHalf, 1U);
               fRegistry.fill(HIST("DiphotonHadron/mix/hs"), trg.mass(), trg.pt(), deta, dphi);
             }
           }
@@ -917,7 +923,7 @@ struct DiphotonHadronMPC {
             float deta = ref1.eta() - ref2.eta();
             float dphi = ref1.phi() - ref2.phi();
             // o2::math_utils::bringTo02Pi(dphi);
-            dphi = RecoDecay::constrainAngle(dphi, -M_PI / 2, 1U);
+            dphi = RecoDecay::constrainAngle(dphi, -o2::constants::math::PIHalf, 1U);
             fRegistry.fill(HIST("HadronHadron/mix/hDEtaDPhi"), dphi, deta);
           }
         }