From f91af70f8075e34951b4eb06baba25a4d1c244b8 Mon Sep 17 00:00:00 2001 From: Fan Si Date: Tue, 5 May 2026 18:10:13 +0800 Subject: [PATCH] [PWGCF] Update saving derived data --- PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx b/PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx index 62544deb592..ed52213971c 100644 --- a/PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx +++ b/PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx @@ -91,7 +91,7 @@ using JoinedCollisionsWithMc = soa::Join; using JoinedTracksWithMc = soa::Join; using JoinedMcCollisions = soa::Join; -namespace derived_collision +namespace mini_collision { DECLARE_SOA_COLUMN(Vz, vz, std::int8_t); DECLARE_SOA_COLUMN(Centrality, centrality, std::uint16_t); @@ -99,28 +99,28 @@ DECLARE_SOA_COLUMN(NChargedParticlesAll, nChargedParticlesAll, std::uint16_t); DECLARE_SOA_COLUMN(NChargedParticlesIn, nChargedParticlesIn, std::uint16_t); DECLARE_SOA_COLUMN(NTracksAll, nTracksAll, std::uint16_t); DECLARE_SOA_COLUMN(NTracksIn, nTracksIn, std::uint16_t); -} // namespace derived_collision +} // namespace mini_collision -DECLARE_SOA_TABLE(DerivedCollisions, "AOD", "DERIVEDCOLLISION", o2::soa::Index<>, derived_collision::Vz, derived_collision::Centrality, derived_collision::NChargedParticlesAll, derived_collision::NChargedParticlesIn, derived_collision::NTracksAll, derived_collision::NTracksIn); -using DerivedCollision = DerivedCollisions::iterator; +DECLARE_SOA_TABLE(MiniCollisions, "AOD", "MINICOLLISION", soa::Index<>, mini_collision::Vz, mini_collision::Centrality, mini_collision::NChargedParticlesAll, mini_collision::NChargedParticlesIn, mini_collision::NTracksAll, mini_collision::NTracksIn); +using MiniCollision = MiniCollisions::iterator; -namespace derived_particle +namespace mini_particle { -DECLARE_SOA_INDEX_COLUMN(DerivedCollision, derivedCollision); +DECLARE_SOA_INDEX_COLUMN(MiniCollision, miniCollision); DECLARE_SOA_COLUMN(SignedEfficiency, signedEfficiency, std::int16_t); -} // namespace derived_particle +} // namespace mini_particle -DECLARE_SOA_TABLE(DerivedParticles, "AOD", "DERIVEDPARTICLE", o2::soa::Index<>, derived_particle::DerivedCollisionId, derived_particle::SignedEfficiency); -using DerivedParticle = DerivedParticles::iterator; +DECLARE_SOA_TABLE(MiniParticles, "AOD", "MINIPARTICLE", soa::Index<>, mini_particle::MiniCollisionId, mini_particle::SignedEfficiency); +using MiniParticle = MiniParticles::iterator; -namespace derived_track +namespace mini_track { -DECLARE_SOA_INDEX_COLUMN(DerivedCollision, derivedCollision); +DECLARE_SOA_INDEX_COLUMN(MiniCollision, miniCollision); DECLARE_SOA_COLUMN(SignedEfficiency, signedEfficiency, std::int16_t); -} // namespace derived_track +} // namespace mini_track -DECLARE_SOA_TABLE(DerivedTracks, "AOD", "DERIVEDTRACK", o2::soa::Index<>, derived_track::DerivedCollisionId, derived_track::SignedEfficiency); -using DerivedTrack = DerivedTracks::iterator; +DECLARE_SOA_TABLE(MiniTracks, "AOD", "MINITRACK", soa::Index<>, mini_track::MiniCollisionId, mini_track::SignedEfficiency); +using MiniTrack = MiniTracks::iterator; } // namespace o2::aod namespace @@ -811,12 +811,12 @@ struct PartNumFluc { return std::numeric_limits::min() <= value && value <= std::numeric_limits::max() ? std::round(value) : (std::is_signed_v ? std::numeric_limits::min() : std::numeric_limits::max()); } - aod::derived_collision::NChargedParticlesAll::type nChargedParticlesAll{}; - aod::derived_collision::NChargedParticlesIn::type nChargedParticlesIn{}; - aod::derived_collision::NTracksAll::type nTracksAll{}; - aod::derived_collision::NTracksIn::type nTracksIn{}; - std::vector signedEfficienciesParticle{[] {std::vector v{}; v.reserve(256); return v; }()}; - std::vector signedEfficienciesTrack{[] {std::vector v{}; v.reserve(256); return v; }()}; + aod::mini_collision::NChargedParticlesAll::type nChargedParticlesAll{}; + aod::mini_collision::NChargedParticlesIn::type nChargedParticlesIn{}; + aod::mini_collision::NTracksAll::type nTracksAll{}; + aod::mini_collision::NTracksIn::type nTracksIn{}; + std::vector signedEfficienciesParticle{[] {std::vector v{}; v.reserve(256); return v; }()}; + std::vector signedEfficienciesTrack{[] {std::vector v{}; v.reserve(256); return v; }()}; void clear() { @@ -916,9 +916,9 @@ struct PartNumFluc { Preslice presliceTracksPerCollision{aod::track::collisionId}; - Produces derivedCollision; - Produces derivedParticle; - Produces derivedTrack; + Produces miniCollision; + Produces miniParticle; + Produces miniTrack; void init(InitContext&) { @@ -1962,11 +1962,11 @@ struct PartNumFluc { ++holderMcEvent.numbersEff[toI(particleNumber)][toI(chargeSpecies)]; fill(); } - holderDerivedData.signedEfficienciesParticle.push_back(HolderDerivedData::convertRound(std::copysign(std::numeric_limits::max(), chargeSign) * efficiency)); + holderDerivedData.signedEfficienciesParticle.push_back(HolderDerivedData::convertRound(std::copysign(std::numeric_limits::max(), chargeSign) * efficiency)); } else { ++holderEvent.numbers[toI(particleNumber)][toI(chargeSpecies)]; fill(); - holderDerivedData.signedEfficienciesTrack.push_back(HolderDerivedData::convertRound(std::copysign(std::numeric_limits::max(), chargeSign) * efficiency)); + holderDerivedData.signedEfficienciesTrack.push_back(HolderDerivedData::convertRound(std::copysign(std::numeric_limits::max(), chargeSign) * efficiency)); } }; // NOLINT(readability/braces) @@ -2388,9 +2388,9 @@ struct PartNumFluc { fillCalculationFluctuationByParticleNumber(); fillCalculationFluctuationByParticleNumber(); fillCalculationFluctuationByParticleNumber(); - derivedCollision(HolderDerivedData::convertFloor(holderEvent.vz * 10.), HolderDerivedData::convertFloor(holderEvent.centrality * 500.), holderDerivedData.nChargedParticlesAll, holderDerivedData.nChargedParticlesIn, holderDerivedData.nTracksAll, holderDerivedData.nTracksIn); + miniCollision(HolderDerivedData::convertFloor(holderEvent.vz * 10.), HolderDerivedData::convertFloor(holderEvent.centrality * 500.), holderDerivedData.nChargedParticlesAll, holderDerivedData.nChargedParticlesIn, holderDerivedData.nTracksAll, holderDerivedData.nTracksIn); for (auto const& signedEfficiency : holderDerivedData.signedEfficienciesTrack) { - derivedTrack(derivedCollision.lastIndex(), signedEfficiency); + miniTrack(miniCollision.lastIndex(), signedEfficiency); } } } @@ -2529,12 +2529,12 @@ struct PartNumFluc { fillCalculationFluctuationByParticleNumber(); fillCalculationFluctuationByParticleNumber(); fillCalculationFluctuationByParticleNumber(); - derivedCollision(HolderDerivedData::convertFloor(holderEvent.vz * 10.), HolderDerivedData::convertFloor(holderEvent.centrality * 500.), holderDerivedData.nChargedParticlesAll, holderDerivedData.nChargedParticlesIn, holderDerivedData.nTracksAll, holderDerivedData.nTracksIn); + miniCollision(HolderDerivedData::convertFloor(holderEvent.vz * 10.), HolderDerivedData::convertFloor(holderEvent.centrality * 500.), holderDerivedData.nChargedParticlesAll, holderDerivedData.nChargedParticlesIn, holderDerivedData.nTracksAll, holderDerivedData.nTracksIn); for (auto const& signedEfficiency : holderDerivedData.signedEfficienciesParticle) { - derivedParticle(derivedCollision.lastIndex(), signedEfficiency); + miniParticle(miniCollision.lastIndex(), signedEfficiency); } for (auto const& signedEfficiency : holderDerivedData.signedEfficienciesTrack) { - derivedTrack(derivedCollision.lastIndex(), signedEfficiency); + miniTrack(miniCollision.lastIndex(), signedEfficiency); } } }