diff --git a/Common/Core/fwdtrackUtilities.h b/Common/Core/fwdtrackUtilities.h index a178f4fc831..bc947d588f6 100644 --- a/Common/Core/fwdtrackUtilities.h +++ b/Common/Core/fwdtrackUtilities.h @@ -48,13 +48,12 @@ using SMatrix55Std = ROOT::Math::SMatrix; using SMatrix5 = ROOT::Math::SVector; template -concept is_fwd_track = requires (T t) { +concept is_fwd_track = requires(T t) { { t.rAtAbsorberEnd() } -> std::same_as; }; template -concept is_fwd_cov = requires (T t) -{ +concept is_fwd_cov = requires(T t) { { t.sigmaX() } -> std::same_as; }; diff --git a/PWGDQ/Core/VarManager.cxx b/PWGDQ/Core/VarManager.cxx index 35b3d464a8c..e3940839166 100644 --- a/PWGDQ/Core/VarManager.cxx +++ b/PWGDQ/Core/VarManager.cxx @@ -673,7 +673,7 @@ bool VarManager::GetUsedVar(int var) return false; } - // Flag to set PV recalculation via KF +// Flag to set PV recalculation via KF void VarManager::SetPVrecalculationKF(const bool pvRecalKF) { fgPVrecalKF = pvRecalKF; @@ -684,7 +684,7 @@ void VarManager::SetMagneticField(float magField) fgMagField = magField; } - // Setup plane position for MFT-MCH matching +// Setup plane position for MFT-MCH matching void VarManager::SetMatchingPlane(float z) { fgzMatching = z; @@ -695,13 +695,13 @@ float VarManager::GetMatchingPlane() return fgzMatching; } - // Set z shift for forward tracks +// Set z shift for forward tracks void VarManager::SetZShift(float z) { fgzShiftFwd = z; } - // Setup the 2 prong KFParticle +// Setup the 2 prong KFParticle void VarManager::SetupTwoProngKFParticle(float magField) { KFParticle::SetField(magField); @@ -713,7 +713,7 @@ void VarManager::SetupMuonMagField() o2::mch::TrackExtrap::setField(); } - // Setup the 2 prong DCAFitterN +// Setup the 2 prong DCAFitterN void VarManager::SetupTwoProngDCAFitter(float magField, bool propagateToPCA, float maxR, float maxDZIni, float minParamChange, float minRelChi2Change, bool useAbsDCA) { fgFitterTwoProngBarrel.setBz(magField); @@ -726,7 +726,7 @@ void VarManager::SetupTwoProngDCAFitter(float magField, bool propagateToPCA, flo fgUsedKF = false; } - // Setup the 2 prong FwdDCAFitterN +// Setup the 2 prong FwdDCAFitterN void VarManager::SetupTwoProngFwdDCAFitter(float magField, bool propagateToPCA, float maxR, float minParamChange, float minRelChi2Change, bool useAbsDCA) { fgFitterTwoProngFwd.setBz(magField); @@ -760,7 +760,7 @@ void VarManager::SetupThreeProngKFParticle(float magField) fgUsedKF = true; } - // Setup the 3 prong DCAFitterN +// Setup the 3 prong DCAFitterN void VarManager::SetupThreeProngDCAFitter(float magField, bool propagateToPCA, float maxR, float /*maxDZIni*/, float minParamChange, float minRelChi2Change, bool useAbsDCA) { fgFitterThreeProngBarrel.setBz(magField); @@ -772,14 +772,14 @@ void VarManager::SetupThreeProngDCAFitter(float magField, bool propagateToPCA, f fgUsedKF = false; } - // Setup the 4 prong KFParticle +// Setup the 4 prong KFParticle void VarManager::SetupFourProngKFParticle(float magField) { KFParticle::SetField(magField); fgUsedKF = true; } - // Setup the 4 prong DCAFitterN +// Setup the 4 prong DCAFitterN void VarManager::SetupFourProngDCAFitter(float magField, bool propagateToPCA, float maxR, float /*maxDZIni*/, float minParamChange, float minRelChi2Change, bool useAbsDCA) { fgFitterFourProngBarrel.setBz(magField); diff --git a/PWGEM/Dilepton/DataModel/dileptonTables.h b/PWGEM/Dilepton/DataModel/dileptonTables.h index 2e4c94c3a49..b1c306f17fe 100644 --- a/PWGEM/Dilepton/DataModel/dileptonTables.h +++ b/PWGEM/Dilepton/DataModel/dileptonTables.h @@ -13,12 +13,12 @@ #include "Common/CCDB/EventSelectionParams.h" #include "Common/Core/RecoDecay.h" +#include "Common/DataModel/Centrality.h" +#include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/Multiplicity.h" #include "Common/DataModel/PIDResponseTOF.h" #include "Common/DataModel/PIDResponseTPC.h" #include "Common/DataModel/TrackSelectionTables.h" -#include -#include -#include #include #include diff --git a/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h b/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h index 73569263ec2..8c0287bc71b 100644 --- a/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h +++ b/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h @@ -17,7 +17,9 @@ #define PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_ #include "PWGEM/PhotonMeson/Utils/TrackSelection.h" + #include + #include class PHOSPhotonCut : public TNamed diff --git a/PWGEM/PhotonMeson/Core/V0PhotonCut.h b/PWGEM/PhotonMeson/Core/V0PhotonCut.h index 5668815d7a6..c371b2e0a71 100644 --- a/PWGEM/PhotonMeson/Core/V0PhotonCut.h +++ b/PWGEM/PhotonMeson/Core/V0PhotonCut.h @@ -164,9 +164,8 @@ concept IsNonLinIterator = requires(T t) { } // namespace o2::analysis::em::v0 template -concept is_table = requires(T t) -{ - { t.begin() } ->std::same_as::iterator>; +concept is_table = requires(T t) { + { t.begin() } -> std::same_as::iterator>; }; class V0PhotonCut : public TNamed diff --git a/PWGEM/PhotonMeson/Utils/TrackSelection.h b/PWGEM/PhotonMeson/Utils/TrackSelection.h index 93f6ad911e4..f1302cc9573 100644 --- a/PWGEM/PhotonMeson/Utils/TrackSelection.h +++ b/PWGEM/PhotonMeson/Utils/TrackSelection.h @@ -17,33 +17,30 @@ #define PWGEM_PHOTONMESON_UTILS_TRACKSELECTION_H_ #include -#include + #include +#include template -concept is_iterator = requires (T t) -{ +concept is_iterator = requires(T t) { typename std::decay_t::policy_t; typename std::decay_t::all_columns; t.getIndexBindings(); }; template -concept is_sentinel = requires (T t) -{ +concept is_sentinel = requires(T t) { std::same_as; }; template -concept is_track_with_extra = requires (T t) -{ +concept is_track_with_extra = requires(T t) { { t.hasITS() } -> std::same_as; { t.hasTPC() } -> std::same_as; }; template -concept is_mc_particle = requires (T t) -{ +concept is_mc_particle = requires(T t) { { t.pdgCode() } -> std::same_as; }; diff --git a/PWGUD/Core/decayTree.cxx b/PWGUD/Core/decayTree.cxx index 3c730320a35..058c85f4caf 100644 --- a/PWGUD/Core/decayTree.cxx +++ b/PWGUD/Core/decayTree.cxx @@ -1248,7 +1248,7 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) auto max = o2::framework::AxisSpec(res->nmassBins(), res->massHistRange()[0], res->massHistRange()[1]); auto momax = o2::framework::AxisSpec(res->nmomBins(), res->momHistRange()[0], res->momHistRange()[1]); - // M-pT, M-eta, pT-eta + // M-pT, M-eta, pT-eta for (const auto& cc : fccs) { base = cc; base.append("/").append(res->name()).append("/"); @@ -1262,20 +1262,20 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) annot = "pT versus eta; pT (" + res->name() + ") GeV/c; eta (" + res->name() + ")"; fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH2F, {momax, etax}})}); - // M versus daughters + // M versus daughters auto daughs = res->getDaughters(); auto ndaughs = daughs.size(); for (auto i = 0; i < static_cast(ndaughs); i++) { auto d1 = getResonance(daughs[i]); - // M vs pT daughter + // M vs pT daughter hname = base; hname.append("MvspT_").append(res->name()).append(d1->name()); annot = "M versus pT; M (" + res->name() + ") GeV/c^{2}; pT (" + d1->name() + ") GeV/c"; auto momax1 = o2::framework::AxisSpec(d1->nmomBins(), d1->momHistRange()[0], d1->momHistRange()[1]); fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH2F, {max, momax1}})}); - // M vs eta daughter + // M vs eta daughter hname = base; hname.append("Mvseta_").append(res->name()).append(d1->name()); annot = "M versus eta; M (" + res->name() + ") GeV/c^{2}; eta (" + d1->name() + ")"; @@ -1292,19 +1292,19 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) annot = "M versus dcaZ; M (" + res->name() + ") GeV/c^{2}; dca_{Z} (" + d1->name() + ") #mu m"; fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH2F, {max, dcazax}})}); - // M vs chi2 track + // M vs chi2 track hname = base; hname.append("Mvschi2_").append(res->name()).append(d1->name()); annot = "M versus chi2; M (" + res->name() + ") GeV/c^{2}; chi2 (" + d1->name() + ")"; fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH2F, {max, chi2ax}})}); - // M vs nCl track + // M vs nCl track hname = base; hname.append("MvsnCl_").append(res->name()).append(d1->name()); annot = "M versus nCl; M (" + res->name() + ") GeV/c^{2}; nCl (" + d1->name() + ")"; fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH2F, {max, nClax}})}); - // M versus detector hits + // M versus detector hits hname = base; hname.append("MvsdetHits_").append(res->name()).append(d1->name()); annot = "M versus detector hits; M (" + res->name() + ") GeV/c^{2}; ITS + 2*TPC + 4*TRD + 8*TOF (" + d1->name() + ")"; @@ -1319,7 +1319,7 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) } } - // daughters vs daughters + // daughters vs daughters for (auto i = 0; i < static_cast(ndaughs - 1); i++) { auto d1 = getResonance(daughs[i]); auto max1 = o2::framework::AxisSpec(d1->nmassBins(), d1->massHistRange()[0], d1->massHistRange()[1]); @@ -1327,25 +1327,25 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) auto d2 = getResonance(daughs[j]); auto max2 = o2::framework::AxisSpec(d2->nmassBins(), d2->massHistRange()[0], d2->massHistRange()[1]); - // M1 vs M2 + // M1 vs M2 hname = base; hname.append("MvsM_").append(d1->name()).append(d2->name()); annot = std::string("M versus M; M (").append(d1->name()).append(") GeV/c^{2}; M (").append(d2->name()).append(") GeV/c^{2}"); fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH2F, {max1, max2}})}); - // angle(d1, d2) + // angle(d1, d2) hname = base; hname.append("angle_").append(d1->name()).append(d2->name()); annot = std::string("angle; Angle (").append(d1->name()).append(", ").append(d2->name()).append(")"); fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH1F, {angax}})}); - // M vs angle(d1, d2) + // M vs angle(d1, d2) hname = base; hname.append("Mvsangle_").append(d1->name()).append(d2->name()); annot = std::string("M versus angle; M (").append(res->name()).append(") GeV/c^{2}; Angle (").append(d1->name()).append(", ").append(d2->name()).append(")"); fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH2F, {max, angax}})}); - // both daughters are finals + // both daughters are finals if (d1->isFinal() && d2->isFinal()) { hname = base; hname.append("TPCsignal_").append(d1->name()).append(d2->name()); @@ -1355,7 +1355,7 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) } } - // for finals only + // for finals only if (res->isFinal()) { // dca hname = base; @@ -1367,7 +1367,7 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) annot = std::string("dcaZ; dca_{Z}(").append(res->name()).append(")"); fhistPointers.insert({hname, registry.add(hname.c_str(), annot.c_str(), {o2::framework::HistType::kTH1F, {dcazax}})}); - // nSIgma[TPC, TOF] vs pT + // nSIgma[TPC, TOF] vs pT for (const auto& det : fdets) { for (const auto& part : fparts) { hname = base; @@ -1377,7 +1377,7 @@ void decayTree::createHistograms(o2::framework::HistogramRegistry& registry) } } - // detector hits + // detector hits hname = base; hname.append("detectorHits"); annot = std::string("detectorHits; Detector(").append(res->name()).append(")");