From 1bc77fd048480603c693cf8085fa72aabe543de3 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 2 May 2024 17:25:39 +0000 Subject: [PATCH] Please consider the following formatting changes --- Common/DataModel/Multiplicity.h | 8 ++++---- .../TableProducer/multiplicityExtraTable.cxx | 18 +++++++++++------- Common/Tasks/centralityStudy.cxx | 7 +++---- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index afb2b5eca0c..44097a15f6b 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -77,9 +77,9 @@ DECLARE_SOA_COLUMN(BCNumber, bcNumber, int); //! // even further QA: timing information for neighboring events DECLARE_SOA_COLUMN(TimeToPrePrevious, timeToPrePrevious, float); //! -DECLARE_SOA_COLUMN(TimeToPrevious, timeToPrevious, float); //! -DECLARE_SOA_COLUMN(TimeToNext, timeToNext, float); //! -DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float); //! +DECLARE_SOA_COLUMN(TimeToPrevious, timeToPrevious, float); //! +DECLARE_SOA_COLUMN(TimeToNext, timeToNext, float); //! +DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float); //! } // namespace mult DECLARE_SOA_TABLE(FV0Mults, "AOD", "FV0MULT", //! Multiplicity with the FV0 detector @@ -116,7 +116,7 @@ DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //! mult::BCNumber); DECLARE_SOA_TABLE(MultNeighs, "AOD", "MULTNEIGH", //! - mult::TimeToPrePrevious, mult::TimeToPrevious, + mult::TimeToPrePrevious, mult::TimeToPrevious, mult::TimeToNext, mult::TimeToNeNext); // for QA purposes diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index ba4df56b08b..fcbacf7b80e 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -161,18 +161,22 @@ struct MultiplicityExtraTable { timeArray.resize(collisions.size(), 1e+3); for (const auto& collision : collisions) { - timeArray[collision.globalIndex()] = collision.collisionTime(); + timeArray[collision.globalIndex()] = collision.collisionTime(); } - float deltaPrevious = 1e+6, deltaPrePrevious = 1e+6; - float deltaNext = 1e+6, deltaNeNext = 1e+6; + float deltaPrevious = 1e+6, deltaPrePrevious = 1e+6; + float deltaNext = 1e+6, deltaNeNext = 1e+6; for (const auto& collision : collisions) { int ii = collision.globalIndex(); - if(ii-1>=0) deltaPrevious = timeArray[ii]-timeArray[ii-1]; - if(ii-2>=0) deltaPrePrevious = timeArray[ii]-timeArray[ii-2]; - if(ii+1= 0) + deltaPrevious = timeArray[ii] - timeArray[ii - 1]; + if (ii - 2 >= 0) + deltaPrePrevious = timeArray[ii] - timeArray[ii - 2]; + if (ii + 1 < collisions.size()) + deltaNext = timeArray[ii + 1] - timeArray[ii]; + if (ii + 2 < collisions.size()) + deltaNeNext = timeArray[ii + 2] - timeArray[ii]; multNeigh(deltaPrePrevious, deltaPrevious, deltaNext, deltaNeNext); } diff --git a/Common/Tasks/centralityStudy.cxx b/Common/Tasks/centralityStudy.cxx index f3bdd4bd4b9..b48d2a3c90f 100644 --- a/Common/Tasks/centralityStudy.cxx +++ b/Common/Tasks/centralityStudy.cxx @@ -156,14 +156,13 @@ struct centralityStudy { } histos.fill(HIST("hCollisionSelection"), 9 /* Not at same bunch pile-up */); - //do this only if information is available + // do this only if information is available if constexpr (requires { collision.timeToNext(); }) { float timeToNeighbour = TMath::Min( std::abs(collision.timeToNext()), - std::abs(collision.timeToPrevious()) - ); + std::abs(collision.timeToPrevious())); histos.fill(HIST("hDeltaTimeVsCentrality"), collision.centFT0C(), timeToNeighbour); - if(timeToNeighbour