Skip to content

Commit ab94ead

Browse files
authored
[PWGCF] fix initialisation in some process paths in twoParticleCorrelationsMp… (#18040)
1 parent 0fc735b commit ab94ead

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

‎PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
#include <cstdlib>
7272
#include <iomanip>
7373
#include <ios>
74+
#include <iterator>
7475
#include <map>
7576
#include <memory>
7677
#include <sstream>
@@ -939,7 +940,7 @@ struct FlowGenericFramework {
939940
if (corrconfigsV0.empty()) {
940941
LOGF(error, "Radial (V0) configuration contains vectors of different size - check the GFWCorrConfig configurable");
941942
}
942-
const size_t requiredChargedConfigs = static_cast<size_t>(SpeciesCount);
943+
const auto requiredChargedConfigs = static_cast<size_t>(SpeciesCount);
943944
const size_t requiredResonanceConfigs = requiredChargedConfigs + static_cast<size_t>(ResonanceCount);
944945
if (cfgFill.cfgAnalyseChargedHadrons && (corrconfigsV02.size() < requiredChargedConfigs || corrconfigsV0.size() < requiredChargedConfigs)) {
945946
LOGF(fatal, "Charged-hadron analysis requires at least %zu V02 and V0 correlation configurations", requiredChargedConfigs);
@@ -2362,6 +2363,10 @@ struct FlowGenericFramework {
23622363
if (!track.isPhysicalPrimary()) {
23632364
return;
23642365
}
2366+
auto pdgParticle = pdgDB->GetParticle(track.pdgCode());
2367+
if (!pdgParticle || pdgParticle->Charge() == 0.) {
2368+
return;
2369+
}
23652370
if (cfgFill.cfgFillQA) {
23662371
fillTrackQA<Gen, Before>(track, vtxz);
23672372
}

‎PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelationsMpi.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ struct TwoParticleCorrelationsMpi {
367367
if (cfgFillAcceptanceWeights && !cfgAcceptance.value.empty()) {
368368
LOGF(fatal, "cfgFillAcceptanceWeights and cfgAcceptance are mutually exclusive: produce and apply acceptance weights in separate jobs");
369369
}
370-
if (cfgFillAcceptanceWeights && !(doprocessSameDerived || doprocessSameDerivedMultSet || doprocessMCSameDerived)) {
370+
if (cfgFillAcceptanceWeights && !(doprocessSameDerived || doprocessSameDerivedCorrected || doprocessSameDerivedMultSet || doprocessSameDerivedMultSetCorrected || doprocessMCSameDerived)) {
371371
LOGF(fatal, "cfgFillAcceptanceWeights requires a reconstructed derived same-event process");
372372
}
373373
if (cfgAcceptancePhiBins < 1 || cfgAcceptanceEtaBins < 1) {
@@ -655,7 +655,7 @@ struct TwoParticleCorrelationsMpi {
655655
++nPtPtSubevents;
656656
}
657657

658-
if (!cfgFillAcceptanceWeights && (doprocessMCSameDerived || doprocessSameDerived || doprocessSameDerivedMultSet)) {
658+
if (!cfgFillAcceptanceWeights && (doprocessMCSameDerived || doprocessSameDerived || doprocessSameDerivedCorrected || doprocessSameDerivedMultSet || doprocessSameDerivedMultSetCorrected)) {
659659
auto recoProfiles = std::make_unique<TObjArray>();
660660
addConfigObjectsToObjArray(recoProfiles.get(), mCorrConfigs, cfgUserAxis == EventSeedAxis && eventClassifierPercentileAxisEnabled);
661661
fFC.setObject(new FlowContainer("FlowContainer"));

0 commit comments

Comments
 (0)