Skip to content

[PWGCF] FemtoUniverse: Fixing same event fillings for pp system @prchakra #9566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prchakra merged 3 commits into from
Jan 28, 2025
Merged

[PWGCF] FemtoUniverse: Fixing same event fillings for pp system @prchakra #9566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
429fcf7
Fixing same event fillings for pp system
prchakra Jan 28, 2025
5e931ee
Fixing same event fillings for pp system
prchakra Jan 28, 2025
2c738d0
Fixing o2-linter and white spaces
prchakra Jan 28, 2025
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
80 changes: 50 additions & 30 deletions PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2022 CERN and copyright holders of ALICE O2.

Check warning on line 1 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-process] 

Use constant references for table subscriptions in process functions.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -63,10 +63,10 @@

/// Table for both particles
struct : o2::framework::ConfigurableGroup {
Configurable<float> ConfNsigmaCombined{"ConfNsigmaCombined", 3.0f, "TPC and TOF Pion Sigma (combined) for momentum > ConfTOFPtMin"};

Check warning on line 66 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.
Configurable<float> ConfNsigmaTPC{"ConfNsigmaTPC", 3.0f, "TPC Pion Sigma for momentum < ConfTOFPtMin"};

Check warning on line 67 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.
Configurable<float> ConfTOFPtMin{"ConfTOFPtMin", 0.5f, "Min. Pt for which TOF is required for PID."};

Check warning on line 68 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.
Configurable<float> ConfEtaMax{"ConfEtaMax", 0.8f, "Higher limit for |Eta| (the same for both particles)"};

Check warning on line 69 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.

Configurable<LabeledArray<float>> ConfCutTable{"ConfCutTable", {cutsTable[0], nPart, nCuts, partNames, cutNames}, "Particle selections"};
Configurable<int> ConfNspecies{"ConfNspecies", 2, "Number of particle spieces with PID info"};
Expand Down Expand Up @@ -574,8 +574,8 @@
/// process function for to call doSameEvent with Data
/// \param col subscribe to the collision table (Data)
/// \param parts subscribe to the femtoUniverseParticleTable
void processSameEvent(FilteredFDCollision& col,
FilteredFemtoFullParticles& parts)
void processSameEvent(FilteredFDCollision const& col,
FilteredFemtoFullParticles const& parts)
{
fillCollision(col, ConfIsCent);

Expand All @@ -585,16 +585,26 @@
bool fillQA = true;
randgen = new TRandom2(0);

if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}

if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}

if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
if (ConfIsCent) {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
}
} else {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
}
}
delete randgen;
}
Expand All @@ -604,9 +614,9 @@
/// \param col subscribe to the collision table (Monte Carlo Reconstructed reconstructed)
/// \param parts subscribe to joined table FemtoUniverseParticles and FemtoUniverseMCLables to access Monte Carlo truth
/// \param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
void processSameEventMC(o2::aod::FdCollision& col,
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
o2::aod::FdMCParticles&)
void processSameEventMC(o2::aod::FdCollision const& col,
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels> const& parts,
o2::aod::FdMCParticles const&)
{
fillCollision(col, ConfIsCent);

Expand All @@ -616,16 +626,26 @@
bool fillQA = true;
randgen = new TRandom2(0);

if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}

if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}

if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
if (ConfIsCent) {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
}
} else {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
}
}
delete randgen;
}
Expand Down Expand Up @@ -736,8 +756,8 @@
/// process function for to call doMixedEvent with Data
/// @param cols subscribe to the collisions table (Data)
/// @param parts subscribe to the femtoUniverseParticleTable
void processMixedEventCent(FilteredFDCollisions& cols,
FilteredFemtoFullParticles& parts)
void processMixedEventCent(FilteredFDCollisions const& cols,
FilteredFemtoFullParticles const& parts)
{
randgen = new TRandom2(0);

Expand Down Expand Up @@ -777,9 +797,9 @@
/// @param cols subscribe to the collisions table (Monte Carlo Reconstructed reconstructed)
/// @param parts subscribe to joined table FemtoUniverseParticles and FemtoUniverseMCLables to access Monte Carlo truth
/// @param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
void processMixedEventMCCent(o2::aod::FdCollisions& cols,
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
o2::aod::FdMCParticles&)
void processMixedEventMCCent(o2::aod::FdCollisions const& cols,
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels> const& parts,
o2::aod::FdMCParticles const&)
{
randgen = new TRandom2(0);

Expand Down Expand Up @@ -821,7 +841,7 @@
/// @param cols subscribe to the collisions table (Data)
/// @param parts subscribe to the femtoUniverseParticleTable
void processMixedEventNtr(FilteredFDCollisions& cols,
FilteredFemtoFullParticles& parts)

Check warning on line 844 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-process] 

Argument FilteredFDCollisions& cols is not const&.

Check warning on line 844 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-process] 

Argument FilteredFemtoFullParticles& parts is not const&.
{
randgen = new TRandom2(0);

Expand Down Expand Up @@ -863,7 +883,7 @@
/// @param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
void processMixedEventMCNtr(o2::aod::FdCollisions& cols,
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
o2::aod::FdMCParticles&)

Check warning on line 886 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-process] 

Argument o2::aod::FdCollisions& cols is not const&.

Check warning on line 886 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-process] 

Argument soa::Join<FilteredFemtoFullParticles__aod::FDMCLabels>& parts is not const&.

Check warning on line 886 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-process] 

Argument o2::aod::FdMCParticles& is not const&.
{
randgen = new TRandom2(0);

Expand Down
60 changes: 40 additions & 20 deletions PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,16 +558,26 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
bool fillQA = true;
randgen = new TRandom2(0);

if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}

if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}

if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
if (ConfIsCent) {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
}
} else {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
}
}
delete randgen;
}
Expand All @@ -588,16 +598,26 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
bool fillQA = true;
randgen = new TRandom2(0);

if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}

if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}

if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
if (ConfIsCent) {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
}
} else {
if (cfgProcessPM) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
}
if (cfgProcessPP) {
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
}
if (cfgProcessMM) {
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
}
}
delete randgen;
}
Expand Down
Loading