Skip to content

PWGHF: make uniform event selection #5261

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
fgrosa merged 20 commits into from
Mar 20, 2024
Merged

PWGHF: make uniform event selection #5261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ea65985
PWGHF: make uniform event selection
fgrosa Mar 20, 2024
044c2d7
Please consider the following formatting changes
alibuild Mar 20, 2024
af0d988
Merge pull request #69 from alibuild/alibot-cleanup-5261
fgrosa Mar 20, 2024
0ff35f5
Implement Vit's comments and restore possibility to select Run2 trigg…
fgrosa Mar 20, 2024
f0dede0
Please consider the following formatting changes
alibuild Mar 20, 2024
94e1d8d
Merge pull request #70 from alibuild/alibot-cleanup-5261
fgrosa Mar 20, 2024
fe5be41
Implement Vit's comments
fgrosa Mar 20, 2024
548ac82
Please consider the following formatting changes
alibuild Mar 20, 2024
2f6a327
Merge pull request #71 from alibuild/alibot-cleanup-5261
fgrosa Mar 20, 2024
799cf0c
Update PWGHF/Utils/utilsEvSelHf.h
fgrosa Mar 20, 2024
a8a39aa
Fix copy-paste mistake
fgrosa Mar 20, 2024
ae9d07f
Trivial commit
fgrosa Mar 20, 2024
b7f0602
Change type in data model
fgrosa Mar 20, 2024
b2a7c71
Improve histo title
fgrosa Mar 20, 2024
3f4d802
Document template parameters
fgrosa Mar 20, 2024
c7247cf
Update PWGHF/Utils/utilsEvSelHf.h
fgrosa Mar 20, 2024
8a23f02
Update PWGHF/Utils/utilsEvSelHf.h
fgrosa Mar 20, 2024
86976ca
Please consider the following formatting changes
alibuild Mar 20, 2024
64566f7
Merge pull request #72 from alibuild/alibot-cleanup-5261
fgrosa Mar 20, 2024
2ce2b5c
Update PWGHF/Utils/utilsEvSelHf.h
fgrosa Mar 20, 2024
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
Prev Previous commit
Next Next commit
Implement Vit's comments
  • Loading branch information
@fgrosa
fgrosa committed Mar 20, 2024
commit fe5be4123174a30a96aaa97d6e14e5f596a09430
12 changes: 6 additions & 6 deletions PWGHF/TableProducer/candidateCreator2Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct HfCandidateCreator2Prong {
Configurable<float> centralityMax{"centralityMax", 100., "Maximum centrality"};
// event selection
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};
// vertexing
Configurable<bool> constrainKfToPv{"constrainKfToPv", true, "constraint KFParticle to PV"};
Expand Down Expand Up @@ -185,7 +185,7 @@ struct HfCandidateCreator2Prong {
/// reject candidates not satisfying the event selections
auto collision = rowTrackIndexProng2.template collision_as<Coll>();
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
if (rejectionMask != 0) {
/// at least one event selection not satisfied --> reject the candidate
continue;
Expand Down Expand Up @@ -315,7 +315,7 @@ struct HfCandidateCreator2Prong {
/// reject candidates in collisions not satisfying the event selections
auto collision = rowTrackIndexProng2.template collision_as<Coll>();
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
if (rejectionMask != 0) {
/// at least one event selection not satisfied --> reject the candidate
continue;
Expand Down Expand Up @@ -596,7 +596,7 @@ struct HfCandidateCreator2Prong {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -613,7 +613,7 @@ struct HfCandidateCreator2Prong {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -630,7 +630,7 @@ struct HfCandidateCreator2Prong {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand Down
10 changes: 5 additions & 5 deletions PWGHF/TableProducer/candidateCreator3Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct HfCandidateCreator3Prong {
Configurable<float> centralityMax{"centralityMax", 100., "Maximum centrality"};
// event selection
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};
// vertexing
Configurable<bool> propagateToPCA{"propagateToPCA", true, "create tracks version propagated to PCA"};
Expand Down Expand Up @@ -178,7 +178,7 @@ struct HfCandidateCreator3Prong {
/// reject candidates in collisions not satisfying the event selections
auto collision = rowTrackIndexProng3.template collision_as<Coll>();
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
if (rejectionMask != 0) {
/// at least one event selection not satisfied --> reject the candidate
continue;
Expand Down Expand Up @@ -399,7 +399,7 @@ struct HfCandidateCreator3Prong {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -416,7 +416,7 @@ struct HfCandidateCreator3Prong {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -433,7 +433,7 @@ struct HfCandidateCreator3Prong {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand Down
10 changes: 5 additions & 5 deletions PWGHF/TableProducer/candidateCreatorCascade.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct HfCandidateCreatorCascade {
Configurable<float> centralityMax{"centralityMax", 100., "Maximum centrality"};
// event selection
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};
// vertexing
// Configurable<double> bz{"bz", 5., "magnetic field"};
Expand Down Expand Up @@ -157,7 +157,7 @@ struct HfCandidateCreatorCascade {
/// reject candidates in collisions not satisfying the event selections
auto collision = casc.template collision_as<Coll>();
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
if (rejectionMask != 0) {
/// at least one event selection not satisfied --> reject the candidate
continue;
Expand Down Expand Up @@ -379,7 +379,7 @@ struct HfCandidateCreatorCascade {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -396,7 +396,7 @@ struct HfCandidateCreatorCascade {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -413,7 +413,7 @@ struct HfCandidateCreatorCascade {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand Down
10 changes: 5 additions & 5 deletions PWGHF/TableProducer/candidateCreatorDstar.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct HfCandidateCreatorDstar {

// event selection
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};

// vertexing
Expand Down Expand Up @@ -191,7 +191,7 @@ struct HfCandidateCreatorDstar {
/// reject candidates in collisions not satisfying the event selections
auto collision = rowTrackIndexDstar.template collision_as<Coll>();
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
if (rejectionMask != 0) {
/// at least one event selection not satisfied --> reject the candidate
continue;
Expand Down Expand Up @@ -447,7 +447,7 @@ struct HfCandidateCreatorDstar {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -464,7 +464,7 @@ struct HfCandidateCreatorDstar {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand All @@ -481,7 +481,7 @@ struct HfCandidateCreatorDstar {

/// bitmask with event. selection info
float centrality{-1.f};
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);

/// monitor the satisfied event selections
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
Expand Down