From f2580f623c7a2e25b803986dcdbd5e66b443d97f Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 4 Jun 2025 09:06:00 +0000 Subject: [PATCH] Please consider the following formatting changes --- Benchmarks/include/tables.h | 5 +++-- Benchmarks/src/produce-dynamic-extension-calib.cxx | 5 ++--- Benchmarks/src/produce-expression-calib.cxx | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Benchmarks/include/tables.h b/Benchmarks/include/tables.h index b83703622b5..42089fb2b4f 100644 --- a/Benchmarks/include/tables.h +++ b/Benchmarks/include/tables.h @@ -101,12 +101,13 @@ DECLARE_SOA_TABLE(ExtTracksIDM, "AOD", "TRKIDM", extensions::IndirectM); DECLARE_SOA_CONFIGURABLE_EXTENDED_TABLE(TracksE, TracksIU, "TRKE", extensions::Expr); // intermediate values for the realistic calculation -namespace intermediate { +namespace intermediate +{ DECLARE_SOA_COLUMN(HRate, hRate, float); DECLARE_SOA_COLUMN(ClampedTPCMult, clampedTPCmult, float); DECLARE_SOA_COLUMN(Occupancy, occupancy, float); DECLARE_SOA_COLUMN(Correction1, correction1, float); -} +} // namespace intermediate // intermediate table DECLARE_SOA_TABLE(TracksTemporaryExtra, "AOD", "TRKTEMPEX", diff --git a/Benchmarks/src/produce-dynamic-extension-calib.cxx b/Benchmarks/src/produce-dynamic-extension-calib.cxx index 2e41fc64464..9c937897776 100644 --- a/Benchmarks/src/produce-dynamic-extension-calib.cxx +++ b/Benchmarks/src/produce-dynamic-extension-calib.cxx @@ -18,15 +18,14 @@ #include "Framework/AnalysisTask.h" #include "Framework/runDataProcessing.h" - using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; float fReal_fTPCSignalN(float mbb0R, float a1pt, float atgl, float side, float occ, float fOccTPCN, float fTrackOccMeanN) { - return ((0.019869f * mbb0R) + (0.0012031f * a1pt) + (-0.0031766f * atgl) + (-0.0058023f * atgl * mbb0R) + (0.00087494f * a1pt * mbb0R) + (0.0020074f * side) + (-0.0010434f * a1pt * a1pt) + (0.011812f)) * occ / 1.e3f + // - ((0.009032f * mbb0R) + (0.0011737f * a1pt) + (-0.0010241f * atgl) + (-0.0075789f * atgl * mbb0R) + (0.00029324f * a1pt * mbb0R) + (0.00052475f * side) + (-0.00045413f * a1pt * a1pt) + (0.0024879f)) * fOccTPCN + // + return ((0.019869f * mbb0R) + (0.0012031f * a1pt) + (-0.0031766f * atgl) + (-0.0058023f * atgl * mbb0R) + (0.00087494f * a1pt * mbb0R) + (0.0020074f * side) + (-0.0010434f * a1pt * a1pt) + (0.011812f)) * occ / 1.e3f + // + ((0.009032f * mbb0R) + (0.0011737f * a1pt) + (-0.0010241f * atgl) + (-0.0075789f * atgl * mbb0R) + (0.00029324f * a1pt * mbb0R) + (0.00052475f * side) + (-0.00045413f * a1pt * a1pt) + (0.0024879f)) * fOccTPCN + // ((0.004255f * mbb0R) + (0.0011954f * a1pt) + (0.0054092f * atgl) + (-0.0033655f * atgl * mbb0R) + (0.00052243f * a1pt * mbb0R) + (-0.0002969f * side) + (-0.00074909f * a1pt * a1pt) + (-0.0075754f)) * fTrackOccMeanN + // ((-0.07925f * mbb0R) + (-0.03737f * a1pt) + (0.0017054f * atgl) + (0.093686f * atgl * mbb0R) + (0.023925f * a1pt * mbb0R) + (-0.0083407f * side) + (0.00336f * a1pt * a1pt) + (1.0461f)); }; diff --git a/Benchmarks/src/produce-expression-calib.cxx b/Benchmarks/src/produce-expression-calib.cxx index 6524f3211fc..841b2956ea8 100644 --- a/Benchmarks/src/produce-expression-calib.cxx +++ b/Benchmarks/src/produce-expression-calib.cxx @@ -24,8 +24,8 @@ using namespace o2::framework::expressions; float fReal_fTPCSignalN(float mbb0R, float a1pt, float atgl, float side, float occ, float fOccTPCN, float fTrackOccMeanN) { - return ((0.019869f * mbb0R) + (0.0012031f * a1pt) + (-0.0031766f * atgl) + (-0.0058023f * atgl * mbb0R) + (0.00087494f * a1pt * mbb0R) + (0.0020074f * side) + (-0.0010434f * a1pt * a1pt) + (0.011812f)) * occ / 1.e3f + // - ((0.009032f * mbb0R) + (0.0011737f * a1pt) + (-0.0010241f * atgl) + (-0.0075789f * atgl * mbb0R) + (0.00029324f * a1pt * mbb0R) + (0.00052475f * side) + (-0.00045413f * a1pt * a1pt) + (0.0024879f)) * fOccTPCN + // + return ((0.019869f * mbb0R) + (0.0012031f * a1pt) + (-0.0031766f * atgl) + (-0.0058023f * atgl * mbb0R) + (0.00087494f * a1pt * mbb0R) + (0.0020074f * side) + (-0.0010434f * a1pt * a1pt) + (0.011812f)) * occ / 1.e3f + // + ((0.009032f * mbb0R) + (0.0011737f * a1pt) + (-0.0010241f * atgl) + (-0.0075789f * atgl * mbb0R) + (0.00029324f * a1pt * mbb0R) + (0.00052475f * side) + (-0.00045413f * a1pt * a1pt) + (0.0024879f)) * fOccTPCN + // ((0.004255f * mbb0R) + (0.0011954f * a1pt) + (0.0054092f * atgl) + (-0.0033655f * atgl * mbb0R) + (0.00052243f * a1pt * mbb0R) + (-0.0002969f * side) + (-0.00074909f * a1pt * a1pt) + (-0.0075754f)) * fTrackOccMeanN + // ((-0.07925f * mbb0R) + (-0.03737f * a1pt) + (0.0017054f * atgl) + (0.093686f * atgl * mbb0R) + (0.023925f * a1pt * mbb0R) + (-0.0083407f * side) + (0.00336f * a1pt * a1pt) + (1.0461f)); }; @@ -99,7 +99,8 @@ struct LeftJoin { struct ProduceExpressionCalib { Defines qacor; - void init(InitContext&) { + void init(InitContext&) + { // realTPCSignal qacor.projectors[0] = ifnode(aod::track::tpcSignal < o2::constants::math::Almost0, LiteralNode{0.f},