DPl Analysis: avoid including ASoA.h in dictionary generation

Various PWG create ROOT dictionaries for some of their classes, that,
unfortunately, through their inclusion chains pull ASoA.h and expose it
to rootcling.
ROOT's internal llvm is outdated and thus each time we need to update
ASoA.h with new code, we have to employ workarounds in oder to keep
O2Physics functional.
This is highly inconvenient, and thus there will be an update in O2 that
will explicitly forbid exposing ASoA.h to cling - the compilation will
fail with an error.
This PR removes all the instances of ASoA.h inclusion in dictionaries,
that have been exposed by the upcoming O2 change.

This is a suggested change, the final fix may be different. Preferrably,
the dictionaries that are not required should be simply removed from
CMakeLists.txt. From the codeowners, we request reviewing these changes,
suggesting different changes, if needed, and validating that the updated
code does not affect the analysis.

Author: aalkin

Common/Core/fwdtrackUtilities.h

@@ -18,7 +18,6 @@
 #ifndef COMMON_CORE_FWDTRACKUTILITIES_H_
 #define COMMON_CORE_FWDTRACKUTILITIES_H_
 
-#include <Framework/AnalysisDataModel.h>
 #include <Framework/DataTypes.h>
 #include <GlobalTracking/MatchGlobalFwd.h>
 #include <MCHTracking/TrackExtrap.h>
@@ -48,22 +47,33 @@ using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double
 using SMatrix55Std = ROOT::Math::SMatrix<double, 5>;
 using SMatrix5 = ROOT::Math::SVector<double, 5>;
 
+template <typename T>
+concept is_fwd_track = requires (T t) {
+  { t.rAtAbsorberEnd() } -> std::same_as<float>;
+};
+
+template <typename T>
+concept is_fwd_cov = requires (T t)
+{
+  { t.sigmaX() } -> std::same_as<float>;
+};
+
 /// Produce TrackParCovFwds for MFT and FwdTracks, w/ or w/o cov, with z shift
 template <typename TFwdTrack, typename... TCovariance>
 o2::track::TrackParCovFwd getTrackParCovFwdShift(TFwdTrack const& track, float zshift, TCovariance const&... covOpt)
 {
   double chi2 = track.chi2();
   if constexpr (sizeof...(covOpt) == 0) {
     // No covariance passed
-    if constexpr (std::is_same_v<std::decay_t<TFwdTrack>, aod::FwdTracks::iterator>) {
+    if constexpr (is_fwd_track<TFwdTrack>) {
       if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
         chi2 = track.chi2() * (2.f * track.nClusters() - 5.f);
       }
     }
   } else {
     // Covariance passed
     using TCov = std::decay_t<decltype((covOpt, ...))>;
-    if constexpr (std::is_same_v<TCov, aod::FwdTracksCov::iterator>) {
+    if constexpr (is_fwd_cov<TCov>) {
       if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
         chi2 = track.chi2() * (2.f * track.nClusters() - 5.f);
       }

PWGDQ/Core/CMakeLists.txt

@@ -26,7 +26,7 @@ o2physics_add_library(PWGDQCore
 o2physics_target_root_dictionary(PWGDQCore
                           HEADERS   AnalysisCut.h
                                     AnalysisCompositeCut.h
-                                    VarManager.h
+                                    VarManagerCore.h
                                     HistogramManager.h
                                     CutsLibrary.h
                                     MixingHandler.h

PWGDQ/Core/CutsLibrary.cxx

@@ -17,7 +17,7 @@
 
 #include "AnalysisCompositeCut.h"
 #include "AnalysisCut.h"
-#include "VarManager.h"
+#include "VarManagerCore.h"
 
 #include <Framework/Array2D.h>
 #include <Framework/Logger.h>

PWGDQ/Core/DQMlResponse.h

@@ -17,7 +17,7 @@
 #ifndef PWGDQ_CORE_DQMLRESPONSE_H_
 #define PWGDQ_CORE_DQMLRESPONSE_H_
 
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/VarManagerCore.h"
 
 #include "Tools/ML/MlResponse.h"
 

PWGDQ/Core/HistogramsLibrary.cxx

@@ -14,7 +14,7 @@
 #include "PWGDQ/Core/HistogramsLibrary.h"
 
 #include "HistogramManager.h"
-#include "VarManager.h"
+#include "VarManagerCore.h"
 
 #include <CommonConstants/MathConstants.h>
 #include <Framework/Logger.h>

PWGDQ/Core/MixingHandler.cxx

@@ -11,7 +11,7 @@
 
 #include "PWGDQ/Core/MixingHandler.h"
 
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/VarManagerCore.h"
 
 #include <TArrayF.h>
 #include <TMathBase.h>

PWGDQ/Core/MixingHandler.h

@@ -17,14 +17,13 @@
 #ifndef PWGDQ_CORE_MIXINGHANDLER_H_
 #define PWGDQ_CORE_MIXINGHANDLER_H_
 
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/VarManagerCore.h"
 
 #include <TArrayF.h>
 #include <TNamed.h>
 
 #include <Rtypes.h>
 
-#include <algorithm>
 #include <array>
 #include <iostream>
 #include <map>

PWGDQ/Core/MixingLibrary.cxx

@@ -14,7 +14,7 @@
 #include "PWGDQ/Core/MixingLibrary.h"
 
 #include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/VarManagerCore.h"
 
 #include <Framework/Logger.h>