Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
#include <cstdlib>
#include <iomanip>
#include <ios>
#include <iterator>
#include <map>
#include <memory>
#include <sstream>
Expand Down Expand Up @@ -939,7 +940,7 @@ struct FlowGenericFramework {
if (corrconfigsV0.empty()) {
LOGF(error, "Radial (V0) configuration contains vectors of different size - check the GFWCorrConfig configurable");
}
const size_t requiredChargedConfigs = static_cast<size_t>(SpeciesCount);
const auto requiredChargedConfigs = static_cast<size_t>(SpeciesCount);
const size_t requiredResonanceConfigs = requiredChargedConfigs + static_cast<size_t>(ResonanceCount);
if (cfgFill.cfgAnalyseChargedHadrons && (corrconfigsV02.size() < requiredChargedConfigs || corrconfigsV0.size() < requiredChargedConfigs)) {
LOGF(fatal, "Charged-hadron analysis requires at least %zu V02 and V0 correlation configurations", requiredChargedConfigs);
Expand Down Expand Up @@ -2362,6 +2363,10 @@ struct FlowGenericFramework {
if (!track.isPhysicalPrimary()) {
return;
}
auto pdgParticle = pdgDB->GetParticle(track.pdgCode());
if (!pdgParticle || pdgParticle->Charge() == 0.) {
return;
}
if (cfgFill.cfgFillQA) {
fillTrackQA<Gen, Before>(track, vtxz);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ struct TwoParticleCorrelationsMpi {
if (cfgFillAcceptanceWeights && !cfgAcceptance.value.empty()) {
LOGF(fatal, "cfgFillAcceptanceWeights and cfgAcceptance are mutually exclusive: produce and apply acceptance weights in separate jobs");
}
if (cfgFillAcceptanceWeights && !(doprocessSameDerived || doprocessSameDerivedMultSet || doprocessMCSameDerived)) {
if (cfgFillAcceptanceWeights && !(doprocessSameDerived || doprocessSameDerivedCorrected || doprocessSameDerivedMultSet || doprocessSameDerivedMultSetCorrected || doprocessMCSameDerived)) {
LOGF(fatal, "cfgFillAcceptanceWeights requires a reconstructed derived same-event process");
}
if (cfgAcceptancePhiBins < 1 || cfgAcceptanceEtaBins < 1) {
Expand Down Expand Up @@ -655,7 +655,7 @@ struct TwoParticleCorrelationsMpi {
++nPtPtSubevents;
}

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