Skip to content

Commit 5e04fa8

Browse files
[PWGHF] Add UPC event selection (#11518)
Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 6c47c04 commit 5e04fa8

File tree

10 files changed

+388
-105
lines changed

10 files changed

+388
-105
lines changed

PWGHF/D2H/DataModel/ReducedDataModel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace aod
5050
namespace hf_reduced_collision
5151
{
5252
DECLARE_SOA_COLUMN(Bz, bz, float); //! Magnetic field in z-direction
53-
DECLARE_SOA_COLUMN(HfCollisionRejectionMap, hfCollisionRejectionMap, uint16_t); //! Bitmask with failed selection criteria
53+
DECLARE_SOA_COLUMN(HfCollisionRejectionMap, hfCollisionRejectionMap, uint32_t); //! Bitmask with failed selection criteria
5454
// keep track of the number of studied events (for normalization purposes)
5555
DECLARE_SOA_COLUMN(OriginalCollisionCount, originalCollisionCount, int); //! Size of COLLISION table processed
5656
DECLARE_SOA_COLUMN(ZvtxSelectedCollisionCount, zvtxSelectedCollisionCount, int); //! Number of COLLISIONS with |zvtx| < zvtxMax

PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ struct HfDataCreatorCharmHadPiReduced {
12581258
}
12591259
registry.fill(HIST("hEvents"), 1 + Event::CharmHadPiSelected);
12601260
float centrality = -1.f;
1261-
uint16_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
1261+
uint32_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
12621262
// fill collision table if it contains a DPi pair a minima
12631263
hfReducedCollision(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), hfRejMap, bz);
12641264
hfReducedCollExtra(collision.covXX(), collision.covXY(), collision.covYY(),

PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ struct HfDataCreatorCharmResoReduced {
13071307
}
13081308
registry.fill(HIST("hEvents"), 1 + Event::DV0Selected);
13091309
float centrality = -1.f;
1310-
uint16_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
1310+
uint32_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
13111311
// fill collision table if it contains a DPi pair a minima
13121312
hfReducedCollision(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), hfRejMap, bz);
13131313
} // end of runDataCreation function

PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ struct HfTaskFlowCharmHadrons {
343343

344344
/// Get the event selection flags
345345
/// \param hfevselflag is the event selection flag
346-
std::vector<int> getEventSelectionFlags(uint16_t hfevselflag)
346+
std::vector<int> getEventSelectionFlags(uint32_t hfevselflag)
347347
{
348348
return {
349349
TESTBIT(hfevselflag, o2::hf_evsel::EventRejection::NoSameBunchPileup),
@@ -373,7 +373,7 @@ struct HfTaskFlowCharmHadrons {
373373
float& sp,
374374
std::vector<float>& outputMl,
375375
float& occupancy,
376-
uint16_t& hfevselflag)
376+
uint32_t& hfevselflag)
377377
{
378378
if (occEstimator != 0) {
379379
std::vector<int> evtSelFlags = getEventSelectionFlags(hfevselflag);
@@ -491,7 +491,7 @@ struct HfTaskFlowCharmHadrons {
491491
return;
492492
}
493493
float occupancy = 0.;
494-
uint16_t hfevflag{};
494+
uint32_t hfevflag{};
495495
if (occEstimator != 0) {
496496
occupancy = getOccupancyColl(collision, occEstimator);
497497
registry.fill(HIST("trackOccVsFT0COcc"), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
@@ -784,7 +784,7 @@ struct HfTaskFlowCharmHadrons {
784784
float occupancy{-1.f};
785785
occupancy = getOccupancyColl(collision, occEstimator);
786786
registry.fill(HIST("trackOccVsFT0COcc"), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
787-
uint16_t hfevflag = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
787+
uint32_t hfevflag = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
788788
std::vector<int> evtSelFlags = getEventSelectionFlags(hfevflag);
789789
registry.fill(HIST("spReso/hSparseReso"), centrality, xQVecFT0c * xQVecFV0a + yQVecFT0c * yQVecFV0a,
790790
xQVecFT0c * xQVecBTot + yQVecFT0c * yQVecBTot,

PWGHF/DataModel/CandidateReconstructionTables.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
namespace o2::aod
4040
{
4141
// Table aliases
42+
using BcFullInfos = soa::Join<aod::BCsWithTimestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
4243

4344
using TracksWCov = soa::Join<Tracks, TracksCov>;
4445
using TracksWDca = soa::Join<Tracks, TracksDCA>;
@@ -191,7 +192,7 @@ DECLARE_SOA_TABLE(PidTpcTofTinyPr, "AOD", "PIDTPCTOFTINYPR", //! Table of the TP
191192

192193
namespace hf_sel_collision
193194
{
194-
DECLARE_SOA_COLUMN(WhyRejectColl, whyRejectColl, uint16_t); //!
195+
DECLARE_SOA_COLUMN(WhyRejectColl, whyRejectColl, uint32_t); //!
195196
} // namespace hf_sel_collision
196197

197198
DECLARE_SOA_TABLE(HfSelCollision, "AOD", "HFSELCOLLISION", //!

PWGHF/TableProducer/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
o2physics_add_dpl_workflow(track-index-skim-creator
1515
SOURCES trackIndexSkimCreator.cxx
16-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsVertexing O2::DCAFitter O2Physics::AnalysisCCDB O2Physics::MLCore O2Physics::EventFilteringUtils
16+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsVertexing O2::DCAFitter O2Physics::AnalysisCCDB O2Physics::MLCore O2Physics::EventFilteringUtils O2Physics::SGCutParHolder
1717
COMPONENT_NAME Analysis)
1818

1919
# Helpers
@@ -37,12 +37,12 @@ o2physics_add_dpl_workflow(mc-pid-tof
3737

3838
o2physics_add_dpl_workflow(candidate-creator-2prong
3939
SOURCES candidateCreator2Prong.cxx
40-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils
40+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils O2Physics::SGCutParHolder
4141
COMPONENT_NAME Analysis)
4242

4343
o2physics_add_dpl_workflow(candidate-creator-3prong
4444
SOURCES candidateCreator3Prong.cxx
45-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils
45+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils O2Physics::SGCutParHolder
4646
COMPONENT_NAME Analysis)
4747

4848
o2physics_add_dpl_workflow(candidate-creator-b0

0 commit comments

Comments
 (0)