Skip to content

fixes for macOS warnings/errors #381

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
iarsene merged 5 commits into from
Dec 2, 2021
Merged

fixes for macOS warnings/errors #381

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
875bf36
Multi-process functions implemented in the analysis tasks table-reade…
iarsene Dec 2, 2021
2e0c39f
clang fixes
iarsene Dec 2, 2021
207ee97
small fix for compiler warnings
iarsene Dec 2, 2021
4e837b5
clang fixes
iarsene Dec 2, 2021
3fd4696
Merge branch 'master' of https://github.com/AliceO2Group/O2Physics
iarsene Dec 2, 2021
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
24 changes: 12 additions & 12 deletions PWGDQ/Tasks/dqEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ struct AnalysisEventSelection {
VarManager::ResetValues(0, VarManager::kNEventWiseVariables);

VarManager::FillEvent<TEventFillMap>(event);
if constexpr (TEventMCFillMap & VarManager::ObjTypes::ReducedEventMC) {
if constexpr ((TEventMCFillMap & VarManager::ObjTypes::ReducedEventMC) > 0) {
VarManager::FillEvent<TEventMCFillMap>(event.reducedMCevent());
}
if constexpr (TEventMCFillMap & VarManager::ObjTypes::CollisionMC) {
if constexpr ((TEventMCFillMap & VarManager::ObjTypes::CollisionMC) > 0) {
VarManager::FillEvent<TEventMCFillMap>(event.mcCollision());
}
if (fConfigQA) {
Expand Down Expand Up @@ -217,10 +217,10 @@ struct AnalysisTrackSelection {
VarManager::ResetValues(0, VarManager::kNMCParticleVariables);
// fill event information which might be needed in histograms that combine track and event properties
VarManager::FillEvent<TEventFillMap>(event);
if constexpr (TEventMCFillMap & VarManager::ObjTypes::ReducedEventMC) {
if constexpr ((TEventMCFillMap & VarManager::ObjTypes::ReducedEventMC) > 0) {
VarManager::FillEvent<TEventMCFillMap>(event.reducedMCevent());
}
if constexpr (TEventMCFillMap & VarManager::ObjTypes::CollisionMC) {
if constexpr ((TEventMCFillMap & VarManager::ObjTypes::CollisionMC) > 0) {
VarManager::FillEvent<TEventMCFillMap>(event.mcCollision());
}

Expand Down Expand Up @@ -265,12 +265,12 @@ struct AnalysisTrackSelection {
uint32_t mcDecision = 0;
int isig = 0;
for (auto sig = fMCSignals.begin(); sig != fMCSignals.end(); sig++, isig++) {
if constexpr (TTrackFillMap & VarManager::ObjTypes::ReducedTrack) {
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedTrack) > 0) {
if ((*sig).CheckSignal(false, tracksMC, track.reducedMCTrack())) {
mcDecision |= (uint32_t(1) << isig);
}
}
if constexpr (TTrackFillMap & VarManager::ObjTypes::Track) {
if constexpr ((TTrackFillMap & VarManager::ObjTypes::Track) > 0) {
if ((*sig).CheckSignal(false, tracksMC, track.mcParticle())) {
mcDecision |= (uint32_t(1) << isig);
}
Expand Down Expand Up @@ -372,10 +372,10 @@ struct AnalysisMuonSelection {
VarManager::ResetValues(0, VarManager::kNMCParticleVariables);
// fill event information which might be needed in histograms that combine track and event properties
VarManager::FillEvent<TEventFillMap>(event);
if constexpr (TEventMCFillMap & VarManager::ObjTypes::ReducedEventMC) {
if constexpr ((TEventMCFillMap & VarManager::ObjTypes::ReducedEventMC) > 0) {
VarManager::FillEvent<TEventMCFillMap>(event.reducedMCevent());
}
if constexpr (TEventMCFillMap & VarManager::ObjTypes::CollisionMC) {
if constexpr ((TEventMCFillMap & VarManager::ObjTypes::CollisionMC) > 0) {
VarManager::FillEvent<TEventMCFillMap>(event.mcCollision());
}

Expand All @@ -386,10 +386,10 @@ struct AnalysisMuonSelection {
VarManager::FillTrack<TMuonFillMap>(muon); // compute muon quantities

// compute MC matched quantities using either the DQ skimmed or the Framework data models
if constexpr (TMuonFillMap & VarManager::ObjTypes::ReducedMuon) {
if constexpr ((TMuonFillMap & VarManager::ObjTypes::ReducedMuon) > 0) {
VarManager::FillTrack<gkParticleMCFillMap>(muon.reducedMCTrack());
}
if constexpr (TMuonFillMap & VarManager::ObjTypes::Muon) {
if constexpr ((TMuonFillMap & VarManager::ObjTypes::Muon) > 0) {
VarManager::FillTrack<gkParticleMCFillMap>(muon.mcParticle());
}

Expand Down Expand Up @@ -423,12 +423,12 @@ struct AnalysisMuonSelection {
uint32_t mcDecision = 0;
int isig = 0;
for (auto sig = fMCSignals.begin(); sig != fMCSignals.end(); sig++, isig++) {
if constexpr (TMuonFillMap & VarManager::ObjTypes::ReducedMuon) {
if constexpr ((TMuonFillMap & VarManager::ObjTypes::ReducedMuon) > 0) {
if ((*sig).CheckSignal(false, muonsMC, muon.reducedMCTrack())) {
mcDecision |= (uint32_t(1) << isig);
}
}
if constexpr (TMuonFillMap & VarManager::ObjTypes::Muon) {
if constexpr ((TMuonFillMap & VarManager::ObjTypes::Muon) > 0) {
if ((*sig).CheckSignal(false, muonsMC, muon.mcParticle())) {
mcDecision |= (uint32_t(1) << isig);
}
Expand Down