Skip to content

Fix compiler warnings in TriggerAliases.h and EventSelection.h #270

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

Closed
victor-gonzalez wants to merge 1 commit into from
Closed

Fix compiler warnings in TriggerAliases.h and EventSelection.h #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions Common/CCDB/TriggerAliases.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
#include "Common/CCDB/TriggerAliases.h"
#include "Framework/Logger.h"

const char* aliasLabels[kNaliases] = {
"kINT7",
"kEMC7",
"kINT7inMUON",
"kMuonSingleLowPt7",
"kMuonSingleHighPt7",
"kMuonUnlikeLowPt7",
"kMuonLikeLowPt7",
"kCUP8",
"kCUP9",
"kMUP10",
"kMUP11",
"kALL"};

void TriggerAliases::AddClassIdToAlias(uint32_t aliasId, int classId)
{
if (classId < 0 || classId > 99) {
Expand Down
14 changes: 1 addition & 13 deletions Common/CCDB/TriggerAliases.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,7 @@ enum triggerAliases {
kNaliases
};

static const char* aliasLabels[kNaliases] = {
"kINT7",
"kEMC7",
"kINT7inMUON",
"kMuonSingleLowPt7",
"kMuonSingleHighPt7",
"kMuonUnlikeLowPt7",
"kMuonLikeLowPt7",
"kCUP8",
"kCUP9",
"kMUP10",
"kMUP11",
"kALL"};
extern const char* aliasLabels[kNaliases];

class TriggerAliases
{
Expand Down
27 changes: 0 additions & 27 deletions Common/DataModel/EventSelection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,33 +72,6 @@ enum EventSelectionFlags {
kNsel
};

static const char* eventSelectionLabels[kNsel] = {
"kIsBBV0A",
"kIsBBV0C",
"kIsBBFDA",
"kIsBBFDC",
"kNoBGV0A",
"kNoBGV0C",
"kNoBGFDA",
"kNoBGFDC",
"kIsBBT0A",
"kIsBBT0C",
"kIsBBZNA",
"kIsBBZNC",
"kNoBGZNA",
"kNoBGZNC",
"kNoV0MOnVsOfPileup",
"kNoSPDOnVsOfPileup",
"kNoV0Casymmetry",
"kIsGoodTimeRange",
"kNoIncompleteDAQ",
"kNoTPCLaserWarmUp",
"kNoTPCHVdip",
"kNoPileupFromSPD",
"kNoV0PFPileup",
"kNoSPDClsVsTklBG",
"kNoV0C012vsTklBG"};

// collision-joinable event selection decisions
namespace evsel
{
Expand Down
2 changes: 1 addition & 1 deletion Common/Tasks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ o2physics_add_dpl_workflow(validation

o2physics_add_dpl_workflow(event-selection-qa
SOURCES eventSelectionQa.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2::DetectorsBase
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(multiplicity-qa
Expand Down
4 changes: 2 additions & 2 deletions PWGDQ/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

o2physics_add_dpl_workflow(table-maker
SOURCES tableMaker.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCore O2Physics::PWGDQCore
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(table-maker-mc
SOURCES tableMakerMC.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCore O2Physics::PWGDQCore
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore
COMPONENT_NAME Analysis)
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

o2physics_add_dpl_workflow(track-index-skims-creator
SOURCES HFTrackIndexSkimsCreator.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsVertexing ROOT::EG
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2::DetectorsVertexing ROOT::EG
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-2prong
Expand Down