Merge branch 'AliceO2Group:master' into SPC-nonflow-optimal

Author: nmallick19

Common/CCDB/AnalysisCCDBLinkDef.h

@@ -14,8 +14,7 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>
 
-#ifndef COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
-#define COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -24,5 +23,3 @@
 #pragma link C++ class EventSelectionParams + ;
 #pragma link C++ class TriggerAliases + ;
 #pragma link C++ class std::map < uint64_t, uint32_t> + ;
-
-#endif // COMMON_CCDB_ANALYSISCCDBLINKDEF_H_

Common/Core/AnalysisCoreLinkDef.h

@@ -9,8 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef COMMON_CORE_ANALYSISCORELINKDEF_H_
-#define COMMON_CORE_ANALYSISCORELINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -25,5 +24,3 @@
 #pragma link C++ class o2::pid::tpc::Response + ;
 
 #pragma link C++ class OrbitRange + ;
-
-#endif // COMMON_CORE_ANALYSISCORELINKDEF_H_

Common/Core/EventFilteringUtilsLinkDef.h

@@ -9,6 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// NOLINT(build/header_guard)
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;

Common/Core/FFitWeightsLinkDef.h

@@ -14,9 +14,6 @@
 ///
 /// \author Joachim C. K. B. Hansen
 
-#ifndef COMMON_CORE_FFITWEIGHTSLINKDEF_H_
-#define COMMON_CORE_FFITWEIGHTSLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link C++ class FFitWeights + ;
-
-#endif // COMMON_CORE_FFITWEIGHTSLINKDEF_H_

Common/DataModel/Centrality.h

@@ -100,18 +100,22 @@ using BCCentFT0C = BCCentFT0Cs::iterator;
 
 template <typename T>
 concept HasRun2Centrality = requires(T&& t) {
+  // NOLINTBEGIN(readability/braces)
   { t.centRun2V0M() };
   { t.centRun2CL0() };
   { t.centRun2CL1() };
+  // NOLINTEND(readability/braces)
 };
 
 template <typename T>
 concept HasCentrality = requires(T&& t) {
+  // NOLINTBEGIN(readability/braces)
   { t.centFV0A() };
   { t.centFT0M() };
   { t.centFT0A() };
   { t.centFT0C() };
   { t.centNTPV() };
+  // NOLINTEND(readability/braces)
 };
 
 } // namespace o2::aod

Common/TableProducer/propagationServiceV2.cxx

@@ -37,8 +37,8 @@
 #include <DetectorsBase/Propagator.h>
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
-#include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
+#include <Framework/Configurable.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/InitContext.h>
 #include <Framework/runDataProcessing.h>

Common/Tools/Multiplicity/multToolsLinkDef.h

@@ -9,6 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// NOLINT(build/header_guard)
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;

Common/Tools/trackSelectionRequestLinkDef.h

@@ -9,6 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// NOLINT(build/header_guard)
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;

DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx

@@ -1087,7 +1087,6 @@ struct DetectorOccupancyQaTask {
         // July 2025: more for data vs MC:
         if (track.hasTPC() && occupancy >= 0 && confAddBasicQAhistos) {
           float pt = track.pt();
-          // pt 0.2-0.5
           if (pt > 0.2 && pt < 0.5) {
             if (nPV >= 10 && nPV < 400) {
               histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFindable_vs_occup_pt_02_05"), track.tpcNClsFindable(), occupancy);
@@ -1098,9 +1097,7 @@ struct DetectorOccupancyQaTask {
               histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcNClsFound_vs_occup_pt_02_05"), track.tpcNClsFound(), occupancy);
               histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcChi2NCl_vs_occup_pt_02_05"), track.tpcChi2NCl(), occupancy);
             }
-          }
-          // pt 0.5-1.0
-          else if (pt > 0.5 && pt < 1.0) {
+          } else if (pt > 0.5 && pt < 1.0) {
             if (nPV >= 10 && nPV < 400) {
               histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFindable_vs_occup_pt_05_10"), track.tpcNClsFindable(), occupancy);
               histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFound_vs_occup_pt_05_10"), track.tpcNClsFound(), occupancy);
@@ -1110,9 +1107,7 @@ struct DetectorOccupancyQaTask {
               histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcNClsFound_vs_occup_pt_05_10"), track.tpcNClsFound(), occupancy);
               histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcChi2NCl_vs_occup_pt_05_10"), track.tpcChi2NCl(), occupancy);
             }
-          }
-          // pt > 1.0
-          else if (pt > 1.0) {
+          } else if (pt > 1.0) {
             if (nPV >= 10 && nPV < 400) {
               histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFindable_vs_occup_pt_above1_0"), track.tpcNClsFindable(), occupancy);
               histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFound_vs_occup_pt_above1_0"), track.tpcNClsFound(), occupancy);
@@ -1383,8 +1378,8 @@ struct DetectorOccupancyQaTask {
               int tpcNClsFound = track.tpcNClsFound();
               int tpcNClsCrossedRows = track.tpcNClsCrossedRows();
 
-              if (sign > 0) // positive tracks
-              {
+              if (sign > 0) {
+                // positive tracks
                 histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPt_pos"), pt, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hEta_pos"), eta, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPhi_pos"), phi, occupancy, pt);
@@ -1401,8 +1396,8 @@ struct DetectorOccupancyQaTask {
                   histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/QA_tpcNClsFound_pos"), tpcNClsFound);
                   histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/QA_tpcNClsCrossedRows_pos"), tpcNClsCrossedRows);
                 }
-              } else // negative tracks
-              {
+              } else {
+                // negative tracks
                 histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPt_neg"), pt, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hEta_neg"), eta, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPhi_neg"), phi, occupancy, pt);
@@ -1449,8 +1444,8 @@ struct DetectorOccupancyQaTask {
               } // end of TPC good global
 
               // July 2025: for data vs MC kine distr comparison
-              if (sign > 0) // positive tracks
-              {
+              if (sign > 0) {
+                // positive tracks
                 histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPt_pos"), pt, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hEta_pos"), eta, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPhi_pos"), phi, occupancy, pt);
@@ -1463,8 +1458,8 @@ struct DetectorOccupancyQaTask {
                     histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/hPhi_posModifiedQA"), phi);
                   }
                 }
-              } else // negative tracks
-              {
+              } else {
+                // negative tracks
                 histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPt_neg"), pt, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hEta_neg"), eta, occupancy);
                 histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPhi_neg"), phi, occupancy, pt);

DPG/Tasks/AOTEvent/lightIonsEvSelQa.cxx

@@ -991,9 +991,9 @@ struct LightIonsEvSelQa {
 
       // vZ diff (FT0 vs by tracks)
       bool badVzDiff = 0;
-      if (confUseDiffVzCutFromEvSel)
+      if (confUseDiffVzCutFromEvSel) {
         badVzDiff = !col.selection_bit(kIsGoodZvtxFT0vsPV);
-      else {                  // tune by hand
+      } else {                // tune by hand
         float meanDiff = 0.0; // cm
         // O-O
         if (lastRunNumber == 564356)