Fixing some warnings (#302)

jgrosseo · web-flow · commit 2bf01ea3dfd2 · 2021-11-18T22:40:02.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,30 +117,29 @@ 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),
                                                                                                         bkgPhiMin(phi_Min),
                                                                                                         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),
                                                                                                         areaType(fastjet::active_area),
                                                                                                         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,19 +159,19 @@ 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<fastjet::PseudoJet>& inputParticles, std::vector<fastjet::PseudoJet>& jets); //ideally find a way of passing the cluster sequence as a reeference
+  fastjet::ClusterSequenceArea findJets(std::vector<fastjet::PseudoJet>& inputParticles, std::vector<fastjet::PseudoJet>& 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<fastjet::BackgroundEstimatorBase> bkgE;
   std::unique_ptr<fastjet::Subtractor> sub;
   std::unique_ptr<fastjet::contrib::ConstituentSubtractor> constituentSub;
 
   ClassDefNV(JetFinder, 1);
 };
 
-//does this belong here?
+// does this belong here?
 template <typename T>
 void fillConstituents(const T& constituent, std::vector<fastjet::PseudoJet>& constituents)
 {
diff --git 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
@@ -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
@@ -50,9 +50,9 @@ struct HashTask {
   // Calculate hash for an element based on 2 properties and their bins.
   int getHash(const std::vector<float>& xBins, const std::vector<float>& 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);
       }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ struct AllTracks {`
`48`	`48`	`// count the tracks contained in each data frame`
`49`	`49`	`count = 0;`
`50`	`50`	`for (auto& track : tracks) {`
	`51`	`+ LOGF(debug, "Track with momentum %f", track.pt());`
`51`	`52`	`count++;`
`52`	`53`	`}`
`53`	`54`	`totalCount += count;`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ struct HashTask {`
`50`	`50`	`// Calculate hash for an element based on 2 properties and their bins.`
`51`	`51`	`int getHash(const std::vector<float>& xBins, const std::vector<float>& yBins, float colX, float colY)`
`52`	`52`	`{`
`53`		`- for (int i = 0; i < xBins.size(); i++) {`
	`53`	`+ for (unsigned int i = 0; i < xBins.size(); i++) {`
`54`	`54`	`if (colX < xBins[i]) {`
`55`		`- for (int j = 0; j < yBins.size(); j++) {`
	`55`	`+ for (unsigned int j = 0; j < yBins.size(); j++) {`
`56`	`56`	`if (colY < yBins[j]) {`
`57`	`57`	`return i + j * (xBins.size() + 1);`
`58`	`58`	`}`
`@@ -63,7 +63,7 @@ struct HashTask {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// overflow for xBins only`
`66`		`- for (int j = 0; j < yBins.size(); j++) {`
	`66`	`+ for (unsigned int j = 0; j < yBins.size(); j++) {`
`67`	`67`	`if (colY < yBins[j]) {`
`68`	`68`	`return xBins.size() + j * (xBins.size() + 1);`
`69`	`69`	`}`