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
2 changes: 1 addition & 1 deletion PWGHF/D2H/DataModel/ReducedDataModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace aod
namespace hf_reduced_collision
{
DECLARE_SOA_COLUMN(Bz, bz, float); //! Magnetic field in z-direction
DECLARE_SOA_COLUMN(HfCollisionRejectionMap, hfCollisionRejectionMap, uint16_t); //! Bitmask with failed selection criteria
DECLARE_SOA_COLUMN(HfCollisionRejectionMap, hfCollisionRejectionMap, uint32_t); //! Bitmask with failed selection criteria
// keep track of the number of studied events (for normalization purposes)
DECLARE_SOA_COLUMN(OriginalCollisionCount, originalCollisionCount, int); //! Size of COLLISION table processed
DECLARE_SOA_COLUMN(ZvtxSelectedCollisionCount, zvtxSelectedCollisionCount, int); //! Number of COLLISIONS with |zvtx| < zvtxMax
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,7 @@ struct HfDataCreatorCharmHadPiReduced {
}
registry.fill(HIST("hEvents"), 1 + Event::CharmHadPiSelected);
float centrality = -1.f;
uint16_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
uint32_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
// fill collision table if it contains a DPi pair a minima
hfReducedCollision(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), hfRejMap, bz);
hfReducedCollExtra(collision.covXX(), collision.covXY(), collision.covYY(),
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ struct HfDataCreatorCharmResoReduced {
}
registry.fill(HIST("hEvents"), 1 + Event::DV0Selected);
float centrality = -1.f;
uint16_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
uint32_t hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
// fill collision table if it contains a DPi pair a minima
hfReducedCollision(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), hfRejMap, bz);
} // end of runDataCreation function
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ struct HfTaskFlowCharmHadrons {

/// Get the event selection flags
/// \param hfevselflag is the event selection flag
std::vector<int> getEventSelectionFlags(uint16_t hfevselflag)
std::vector<int> getEventSelectionFlags(uint32_t hfevselflag)
{
return {
TESTBIT(hfevselflag, o2::hf_evsel::EventRejection::NoSameBunchPileup),
Expand Down Expand Up @@ -373,7 +373,7 @@ struct HfTaskFlowCharmHadrons {
float& sp,
std::vector<float>& outputMl,
float& occupancy,
uint16_t& hfevselflag)
uint32_t& hfevselflag)
{
if (occEstimator != 0) {
std::vector<int> evtSelFlags = getEventSelectionFlags(hfevselflag);
Expand Down Expand Up @@ -491,7 +491,7 @@ struct HfTaskFlowCharmHadrons {
return;
}
float occupancy = 0.;
uint16_t hfevflag{};
uint32_t hfevflag{};
if (occEstimator != 0) {
occupancy = getOccupancyColl(collision, occEstimator);
registry.fill(HIST("trackOccVsFT0COcc"), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
Expand Down Expand Up @@ -784,7 +784,7 @@ struct HfTaskFlowCharmHadrons {
float occupancy{-1.f};
occupancy = getOccupancyColl(collision, occEstimator);
registry.fill(HIST("trackOccVsFT0COcc"), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
uint16_t hfevflag = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
uint32_t hfevflag = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
std::vector<int> evtSelFlags = getEventSelectionFlags(hfevflag);
registry.fill(HIST("spReso/hSparseReso"), centrality, xQVecFT0c * xQVecFV0a + yQVecFT0c * yQVecFV0a,
xQVecFT0c * xQVecBTot + yQVecFT0c * yQVecBTot,
Expand Down
3 changes: 2 additions & 1 deletion PWGHF/DataModel/CandidateReconstructionTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
namespace o2::aod
{
// Table aliases
using BcFullInfos = soa::Join<aod::BCsWithTimestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;

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

namespace hf_sel_collision
{
DECLARE_SOA_COLUMN(WhyRejectColl, whyRejectColl, uint16_t); //!
DECLARE_SOA_COLUMN(WhyRejectColl, whyRejectColl, uint32_t); //!
} // namespace hf_sel_collision

DECLARE_SOA_TABLE(HfSelCollision, "AOD", "HFSELCOLLISION", //!
Expand Down
6 changes: 3 additions & 3 deletions PWGHF/TableProducer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

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

# Helpers
Expand All @@ -37,12 +37,12 @@ o2physics_add_dpl_workflow(mc-pid-tof

o2physics_add_dpl_workflow(candidate-creator-2prong
SOURCES candidateCreator2Prong.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils O2Physics::SGCutParHolder
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-3prong
SOURCES candidateCreator3Prong.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::EventFilteringUtils O2Physics::SGCutParHolder
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-b0
Expand Down
Loading
Loading