Skip to content

Commit be96984

Browse files
fsiifsii
committed
[PWGCF] Update saving derived data
1 parent 8f47229 commit be96984

1 file changed

Lines changed: 42 additions & 42 deletions

File tree

‎PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -91,36 +91,36 @@ using JoinedCollisionsWithMc = soa::Join<McCollisionLabels, JoinedCollisions>;
9191
using JoinedTracksWithMc = soa::Join<McTrackLabels, JoinedTracks>;
9292
using JoinedMcCollisions = soa::Join<McCollisions, McCollsExtra, MultMCExtras>;
9393

94-
namespace derived_collision
94+
namespace mini_collision
9595
{
9696
DECLARE_SOA_COLUMN(Vz, vz, std::int8_t);
9797
DECLARE_SOA_COLUMN(Centrality, centrality, std::uint16_t);
9898
DECLARE_SOA_COLUMN(NChargedParticlesAll, nChargedParticlesAll, std::uint16_t);
9999
DECLARE_SOA_COLUMN(NChargedParticlesIn, nChargedParticlesIn, std::uint16_t);
100100
DECLARE_SOA_COLUMN(NTracksAll, nTracksAll, std::uint16_t);
101101
DECLARE_SOA_COLUMN(NTracksIn, nTracksIn, std::uint16_t);
102-
} // namespace derived_collision
102+
} // namespace mini_collision
103103

104-
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);
105-
using DerivedCollision = DerivedCollisions::iterator;
104+
DECLARE_SOA_TABLE(MiniCollisions, "AOD", "MINICOLLISION", o2::soa::Index<>, mini_collision::Vz, mini_collision::Centrality, mini_collision::NChargedParticlesAll, mini_collision::NChargedParticlesIn, mini_collision::NTracksAll, mini_collision::NTracksIn);
105+
using MiniCollision = MiniCollisions::iterator;
106106

107-
namespace derived_particle
107+
namespace mini_particle
108108
{
109-
DECLARE_SOA_INDEX_COLUMN(DerivedCollision, derivedCollision);
109+
DECLARE_SOA_INDEX_COLUMN(MiniCollision, miniCollision);
110110
DECLARE_SOA_COLUMN(SignedEfficiency, signedEfficiency, std::int16_t);
111-
} // namespace derived_particle
111+
} // namespace mini_particle
112112

113-
DECLARE_SOA_TABLE(DerivedParticles, "AOD", "DERIVEDPARTICLE", o2::soa::Index<>, derived_particle::DerivedCollisionId, derived_particle::SignedEfficiency);
114-
using DerivedParticle = DerivedParticles::iterator;
113+
DECLARE_SOA_TABLE(MiniParticles, "AOD", "MINIPARTICLE", o2::soa::Index<>, mini_particle::MiniCollisionId, mini_particle::SignedEfficiency);
114+
using MiniParticle = MiniParticles::iterator;
115115

116-
namespace derived_track
116+
namespace mini_track
117117
{
118-
DECLARE_SOA_INDEX_COLUMN(DerivedCollision, derivedCollision);
118+
DECLARE_SOA_INDEX_COLUMN(MiniCollision, miniCollision);
119119
DECLARE_SOA_COLUMN(SignedEfficiency, signedEfficiency, std::int16_t);
120-
} // namespace derived_track
120+
} // namespace mini_track
121121

122-
DECLARE_SOA_TABLE(DerivedTracks, "AOD", "DERIVEDTRACK", o2::soa::Index<>, derived_track::DerivedCollisionId, derived_track::SignedEfficiency);
123-
using DerivedTrack = DerivedTracks::iterator;
122+
DECLARE_SOA_TABLE(MiniTracks, "AOD", "MINITRACK", o2::soa::Index<>, mini_track::MiniCollisionId, mini_track::SignedEfficiency);
123+
using MiniTrack = MiniTracks::iterator;
124124
} // namespace o2::aod
125125

126126
namespace
@@ -799,7 +799,7 @@ struct PartNumFluc {
799799
void clear() { *this = {}; }
800800
} holderTrack;
801801

802-
struct HolderDerivedData {
802+
struct HolderMiniData {
803803
template <std::integral T>
804804
static constexpr T convertFloor(const double value)
805805
{
@@ -811,12 +811,12 @@ struct PartNumFluc {
811811
return std::numeric_limits<T>::min() <= value && value <= std::numeric_limits<T>::max() ? std::round(value) : (std::is_signed_v<T> ? std::numeric_limits<T>::min() : std::numeric_limits<T>::max());
812812
}
813813

814-
aod::derived_collision::NChargedParticlesAll::type nChargedParticlesAll{};
815-
aod::derived_collision::NChargedParticlesIn::type nChargedParticlesIn{};
816-
aod::derived_collision::NTracksAll::type nTracksAll{};
817-
aod::derived_collision::NTracksIn::type nTracksIn{};
818-
std::vector<aod::derived_particle::SignedEfficiency::type> signedEfficienciesParticle{[] {std::vector<aod::derived_particle::SignedEfficiency::type> v{}; v.reserve(256); return v; }()};
819-
std::vector<aod::derived_track::SignedEfficiency::type> signedEfficienciesTrack{[] {std::vector<aod::derived_track::SignedEfficiency::type> v{}; v.reserve(256); return v; }()};
814+
aod::mini_collision::NChargedParticlesAll::type nChargedParticlesAll{};
815+
aod::mini_collision::NChargedParticlesIn::type nChargedParticlesIn{};
816+
aod::mini_collision::NTracksAll::type nTracksAll{};
817+
aod::mini_collision::NTracksIn::type nTracksIn{};
818+
std::vector<aod::mini_particle::SignedEfficiency::type> signedEfficienciesParticle{[] {std::vector<aod::mini_particle::SignedEfficiency::type> v{}; v.reserve(256); return v; }()};
819+
std::vector<aod::mini_track::SignedEfficiency::type> signedEfficienciesTrack{[] {std::vector<aod::mini_track::SignedEfficiency::type> v{}; v.reserve(256); return v; }()};
820820

821821
void clear()
822822
{
@@ -827,7 +827,7 @@ struct PartNumFluc {
827827
signedEfficienciesParticle.clear();
828828
signedEfficienciesTrack.clear();
829829
}
830-
} holderDerivedData;
830+
} holderMiniData;
831831

832832
std::array<std::array<std::unique_ptr<FluctuationCalculatorTrack>, NEs<ChargeNumber>>, NEs<ParticleNumber>> fluctuationCalculatorTrack{};
833833

@@ -916,9 +916,9 @@ struct PartNumFluc {
916916

917917
Preslice<aod::JoinedTracksWithMc> presliceTracksPerCollision{aod::track::collisionId};
918918

919-
Produces<aod::DerivedCollisions> derivedCollision;
920-
Produces<aod::DerivedParticles> derivedParticle;
921-
Produces<aod::DerivedTracks> derivedTrack;
919+
Produces<aod::MiniCollisions> miniCollision;
920+
Produces<aod::MiniParticles> miniParticle;
921+
Produces<aod::MiniTracks> miniTrack;
922922

923923
void init(InitContext&)
924924
{
@@ -1921,9 +1921,9 @@ struct PartNumFluc {
19211921
}
19221922

19231923
if constexpr (dataMode == DataMode::kMcMcParticle) {
1924-
++holderDerivedData.nChargedParticlesIn;
1924+
++holderMiniData.nChargedParticlesIn;
19251925
} else {
1926-
++holderDerivedData.nTracksIn;
1926+
++holderMiniData.nTracksIn;
19271927
}
19281928

19291929
const auto calculateByParticleSpecies = [&]<ParticleSpecies particleSpecies>
@@ -1962,11 +1962,11 @@ struct PartNumFluc {
19621962
++holderMcEvent.numbersEff[toI(particleNumber)][toI(chargeSpecies)];
19631963
fill();
19641964
}
1965-
holderDerivedData.signedEfficienciesParticle.push_back(HolderDerivedData::convertRound<aod::derived_particle::SignedEfficiency::type>(std::copysign(std::numeric_limits<aod::derived_particle::SignedEfficiency::type>::max(), chargeSign) * efficiency));
1965+
holderMiniData.signedEfficienciesParticle.push_back(HolderMiniData::convertRound<aod::mini_particle::SignedEfficiency::type>(std::copysign(std::numeric_limits<aod::mini_particle::SignedEfficiency::type>::max(), chargeSign) * efficiency));
19661966
} else {
19671967
++holderEvent.numbers[toI(particleNumber)][toI(chargeSpecies)];
19681968
fill();
1969-
holderDerivedData.signedEfficienciesTrack.push_back(HolderDerivedData::convertRound<aod::derived_track::SignedEfficiency::type>(std::copysign(std::numeric_limits<aod::derived_track::SignedEfficiency::type>::max(), chargeSign) * efficiency));
1969+
holderMiniData.signedEfficienciesTrack.push_back(HolderMiniData::convertRound<aod::mini_track::SignedEfficiency::type>(std::copysign(std::numeric_limits<aod::mini_track::SignedEfficiency::type>::max(), chargeSign) * efficiency));
19701970
}
19711971
}; // NOLINT(readability/braces)
19721972

@@ -2341,7 +2341,7 @@ struct PartNumFluc {
23412341
if (isEnabled(groupAnalysis.cfgFlagCalculationFluctuation)) {
23422342
holderEvent.subgroupIndex = gRandom->Integer(groupEvent.cfgNSubgroups.value);
23432343
initCalculationFluctuation();
2344-
holderDerivedData.clear();
2344+
holderMiniData.clear();
23452345
}
23462346

23472347
for (const auto& track : tracks) {
@@ -2351,7 +2351,7 @@ struct PartNumFluc {
23512351

23522352
const bool isGood{initTrack<false, false>(track, tracksIu)};
23532353
if (isEnabled(groupAnalysis.cfgFlagCalculationFluctuation) && holderTrack.sign != 0) {
2354-
++holderDerivedData.nTracksAll;
2354+
++holderMiniData.nTracksAll;
23552355
}
23562356
if (!isGood) {
23572357
continue;
@@ -2388,9 +2388,9 @@ struct PartNumFluc {
23882388
fillCalculationFluctuationByParticleNumber<DataMode::kRawTrack, ParticleNumber::kCharge>();
23892389
fillCalculationFluctuationByParticleNumber<DataMode::kRawTrack, ParticleNumber::kKaon>();
23902390
fillCalculationFluctuationByParticleNumber<DataMode::kRawTrack, ParticleNumber::kProton>();
2391-
derivedCollision(HolderDerivedData::convertFloor<aod::derived_collision::Vz::type>(holderEvent.vz * 10.), HolderDerivedData::convertFloor<aod::derived_collision::Centrality::type>(holderEvent.centrality * 500.), holderDerivedData.nChargedParticlesAll, holderDerivedData.nChargedParticlesIn, holderDerivedData.nTracksAll, holderDerivedData.nTracksIn);
2392-
for (auto const& signedEfficiency : holderDerivedData.signedEfficienciesTrack) {
2393-
derivedTrack(derivedCollision.lastIndex(), signedEfficiency);
2391+
miniCollision(HolderMiniData::convertFloor<aod::mini_collision::Vz::type>(holderEvent.vz * 10.), HolderMiniData::convertFloor<aod::mini_collision::Centrality::type>(holderEvent.centrality * 500.), holderMiniData.nChargedParticlesAll, holderMiniData.nChargedParticlesIn, holderMiniData.nTracksAll, holderMiniData.nTracksIn);
2392+
for (auto const& signedEfficiency : holderMiniData.signedEfficienciesTrack) {
2393+
miniTrack(miniCollision.lastIndex(), signedEfficiency);
23942394
}
23952395
}
23962396
}
@@ -2422,7 +2422,7 @@ struct PartNumFluc {
24222422
if (isEnabled(groupAnalysis.cfgFlagCalculationFluctuation)) {
24232423
holderEvent.subgroupIndex = gRandom->Integer(groupEvent.cfgNSubgroups.value);
24242424
initCalculationFluctuation();
2425-
holderDerivedData.clear();
2425+
holderMiniData.clear();
24262426
}
24272427

24282428
for (const auto& mcParticle : mcParticles) {
@@ -2432,7 +2432,7 @@ struct PartNumFluc {
24322432

24332433
const bool isGood{initMcParticle<true>(mcParticle)};
24342434
if (isEnabled(groupAnalysis.cfgFlagCalculationFluctuation) && holderMcParticle.charge != 0) {
2435-
++holderDerivedData.nChargedParticlesAll;
2435+
++holderMiniData.nChargedParticlesAll;
24362436
}
24372437
if (!isGood) {
24382438
continue;
@@ -2475,7 +2475,7 @@ struct PartNumFluc {
24752475

24762476
const bool isGood{initTrack<true, false>(track, tracksIu) && initMcParticle<false>(mcParticle)};
24772477
if (isEnabled(groupAnalysis.cfgFlagCalculationFluctuation) && holderTrack.sign != 0) {
2478-
++holderDerivedData.nTracksAll;
2478+
++holderMiniData.nTracksAll;
24792479
}
24802480
if (!isGood) {
24812481
continue;
@@ -2529,12 +2529,12 @@ struct PartNumFluc {
25292529
fillCalculationFluctuationByParticleNumber<DataMode::kMcTrack, ParticleNumber::kCharge>();
25302530
fillCalculationFluctuationByParticleNumber<DataMode::kMcTrack, ParticleNumber::kKaon>();
25312531
fillCalculationFluctuationByParticleNumber<DataMode::kMcTrack, ParticleNumber::kProton>();
2532-
derivedCollision(HolderDerivedData::convertFloor<aod::derived_collision::Vz::type>(holderEvent.vz * 10.), HolderDerivedData::convertFloor<aod::derived_collision::Centrality::type>(holderEvent.centrality * 500.), holderDerivedData.nChargedParticlesAll, holderDerivedData.nChargedParticlesIn, holderDerivedData.nTracksAll, holderDerivedData.nTracksIn);
2533-
for (auto const& signedEfficiency : holderDerivedData.signedEfficienciesParticle) {
2534-
derivedParticle(derivedCollision.lastIndex(), signedEfficiency);
2532+
miniCollision(HolderMiniData::convertFloor<aod::mini_collision::Vz::type>(holderEvent.vz * 10.), HolderMiniData::convertFloor<aod::mini_collision::Centrality::type>(holderEvent.centrality * 500.), holderMiniData.nChargedParticlesAll, holderMiniData.nChargedParticlesIn, holderMiniData.nTracksAll, holderMiniData.nTracksIn);
2533+
for (auto const& signedEfficiency : holderMiniData.signedEfficienciesParticle) {
2534+
miniParticle(miniCollision.lastIndex(), signedEfficiency);
25352535
}
2536-
for (auto const& signedEfficiency : holderDerivedData.signedEfficienciesTrack) {
2537-
derivedTrack(derivedCollision.lastIndex(), signedEfficiency);
2536+
for (auto const& signedEfficiency : holderMiniData.signedEfficienciesTrack) {
2537+
miniTrack(miniCollision.lastIndex(), signedEfficiency);
25382538
}
25392539
}
25402540
}

0 commit comments

Comments
 (0)