diff --git a/Common/CCDB/TriggerAliases.cxx b/Common/CCDB/TriggerAliases.cxx index c58d6a95c6f..a6c4c4f47fc 100644 --- a/Common/CCDB/TriggerAliases.cxx +++ b/Common/CCDB/TriggerAliases.cxx @@ -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) { diff --git a/Common/CCDB/TriggerAliases.h b/Common/CCDB/TriggerAliases.h index 85a94826c6d..c1e0cf8bec1 100644 --- a/Common/CCDB/TriggerAliases.h +++ b/Common/CCDB/TriggerAliases.h @@ -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 { diff --git a/Common/DataModel/EventSelection.h b/Common/DataModel/EventSelection.h index 972d8867b83..c1968f07130 100644 --- a/Common/DataModel/EventSelection.h +++ b/Common/DataModel/EventSelection.h @@ -72,32 +72,35 @@ 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"}; +// In a struct to avoid warnings if that is not used in all executables which include this file +struct EventSelectionLabels { + static constexpr const char* labels[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 diff --git a/Common/Tasks/CMakeLists.txt b/Common/Tasks/CMakeLists.txt index a481f005db9..3676289d1c9 100644 --- a/Common/Tasks/CMakeLists.txt +++ b/Common/Tasks/CMakeLists.txt @@ -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 diff --git a/PWGDQ/TableProducer/CMakeLists.txt b/PWGDQ/TableProducer/CMakeLists.txt index 3c87491dc34..afcc614f333 100644 --- a/PWGDQ/TableProducer/CMakeLists.txt +++ b/PWGDQ/TableProducer/CMakeLists.txt @@ -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) diff --git a/PWGHF/TableProducer/CMakeLists.txt b/PWGHF/TableProducer/CMakeLists.txt index 4c22a29513f..b97060d5a3f 100644 --- a/PWGHF/TableProducer/CMakeLists.txt +++ b/PWGHF/TableProducer/CMakeLists.txt @@ -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 diff --git a/PWGJE/Core/JetFinder.h b/PWGJE/Core/JetFinder.h index fb955ae7558..5e4e0794ea2 100644 --- a/PWGJE/Core/JetFinder.h +++ b/PWGJE/Core/JetFinder.h @@ -101,7 +101,8 @@ class JetFinder fastjet::Selector selRho; /// Default constructor - JetFinder(float eta_Min = -0.9, float eta_Max = 0.9, float phi_Min = 0.0, float phi_Max = 2 * M_PI) : phiMin(phi_Min), + JetFinder(float eta_Min = -0.9, float eta_Max = 0.9, float phi_Min = 0.0, float phi_Max = 2 * M_PI) : bkgSubMode(BkgSubMode::none), + phiMin(phi_Min), phiMax(phi_Max), etaMin(eta_Min), etaMax(eta_Max), @@ -116,7 +117,7 @@ class JetFinder ghostEtaMax(eta_Max), ghostArea(0.005), ghostRepeatN(1), - ghostktMean(1e-100), //is float precise enough? + ghostktMean(1e-100), // is float precise enough? gridScatter(1.0), ktScatter(0.1), jetBkgR(0.2), @@ -124,6 +125,9 @@ class JetFinder bkgPhiMax(phi_Max), bkgEtaMin(eta_Min), bkgEtaMax(eta_Max), + constSubAlpha(1.0), + constSubRMax(0.6), + isReclustering(false), algorithm(fastjet::antikt_algorithm), recombScheme(fastjet::E_scheme), strategy(fastjet::Best), @@ -131,15 +135,11 @@ class JetFinder algorithmBkg(fastjet::JetAlgorithm(fastjet::kt_algorithm)), recombSchemeBkg(fastjet::RecombinationScheme(fastjet::E_scheme)), strategyBkg(fastjet::Best), - areaTypeBkg(fastjet::active_area), - bkgSubMode(BkgSubMode::none), - constSubAlpha(1.0), - constSubRMax(0.6), - isReclustering(false) + areaTypeBkg(fastjet::active_area) { - //default constructor + // default constructor } /// Default destructor @@ -159,11 +159,11 @@ class JetFinder /// \param inputParticles vector of input particles/tracks /// \param jets veector of jets to be filled /// \return ClusterSequenceArea object needed to access constituents - fastjet::ClusterSequenceArea findJets(std::vector& inputParticles, std::vector& jets); //ideally find a way of passing the cluster sequence as a reeference + fastjet::ClusterSequenceArea findJets(std::vector& inputParticles, std::vector& jets); // ideally find a way of passing the cluster sequence as a reeference private: - //void setParams(); - //void setBkgSub(); + // void setParams(); + // void setBkgSub(); std::unique_ptr bkgE; std::unique_ptr sub; std::unique_ptr constituentSub; @@ -171,7 +171,7 @@ class JetFinder ClassDefNV(JetFinder, 1); }; -//does this belong here? +// does this belong here? template void fillConstituents(const T& constituent, std::vector& constituents) { diff --git a/Tutorials/src/eventMixing.cxx b/Tutorials/src/eventMixing.cxx index 88530ff3580..0d28b4e3e66 100644 --- a/Tutorials/src/eventMixing.cxx +++ b/Tutorials/src/eventMixing.cxx @@ -44,9 +44,9 @@ struct HashTask { if (colX < xBins[0] || colY < yBins[0]) { return -1; } - for (int i = 1; i < xBins.size(); i++) { + for (unsigned int i = 1; i < xBins.size(); i++) { if (colX < xBins[i]) { - for (int j = 1; j < yBins.size(); j++) { + for (unsigned int j = 1; j < yBins.size(); j++) { if (colY < yBins[j]) { return i + j * (xBins.size() + 1); } @@ -125,7 +125,7 @@ struct MixedEventsPartitionedTracks { // Strictly upper categorised collisions for (auto& [c1, c2] : selfCombinations("fBin", 5, -1, join(hashes, collisions), join(hashes, collisions))) { - //LOGF(info, "Collisions bin: %d pair: %d (%f, %f, %f), %d (%f, %f, %f)", c1.bin(), c1.index(), c1.posX(), c1.posY(), c1.posZ(), c2.index(), c2.posX(), c2.posY(), c2.posZ()); + // LOGF(info, "Collisions bin: %d pair: %d (%f, %f, %f), %d (%f, %f, %f)", c1.bin(), c1.index(), c1.posX(), c1.posY(), c1.posZ(), c2.index(), c2.posX(), c2.posY(), c2.posZ()); auto it1 = slicer.begin(); auto it2 = slicer.begin(); diff --git a/Tutorials/src/trackIteration.cxx b/Tutorials/src/trackIteration.cxx index d1c9c9500c9..ff3271d90c0 100644 --- a/Tutorials/src/trackIteration.cxx +++ b/Tutorials/src/trackIteration.cxx @@ -48,6 +48,7 @@ struct AllTracks { // count the tracks contained in each data frame count = 0; for (auto& track : tracks) { + LOGF(debug, "Track with momentum %f", track.pt()); count++; } totalCount += count; diff --git a/Tutorials/src/tracksCombinations.cxx b/Tutorials/src/tracksCombinations.cxx index c2810bc9eb0..9e0cfc32ec4 100644 --- a/Tutorials/src/tracksCombinations.cxx +++ b/Tutorials/src/tracksCombinations.cxx @@ -50,9 +50,9 @@ struct HashTask { // Calculate hash for an element based on 2 properties and their bins. int getHash(const std::vector& xBins, const std::vector& yBins, float colX, float colY) { - for (int i = 0; i < xBins.size(); i++) { + for (unsigned int i = 0; i < xBins.size(); i++) { if (colX < xBins[i]) { - for (int j = 0; j < yBins.size(); j++) { + for (unsigned int j = 0; j < yBins.size(); j++) { if (colY < yBins[j]) { return i + j * (xBins.size() + 1); } @@ -63,7 +63,7 @@ struct HashTask { } // overflow for xBins only - for (int j = 0; j < yBins.size(); j++) { + for (unsigned int j = 0; j < yBins.size(); j++) { if (colY < yBins[j]) { return xBins.size() + j * (xBins.size() + 1); }