Merge branch 'master' into fix-enrichedOO

Author: romainschotter

.github/workflows/clean-test.yml

@@ -24,11 +24,6 @@ name: Clean PR checks
         type: boolean
         default: true
 
-      'check_build/O2Physics/o2/macOS':
-        description: build/O2Physics/o2/macOS
-        type: boolean
-        default: true
-
       'check_build/O2Physics/o2':
         description: build/O2Physics/o2
         type: boolean

ALICE3/Core/ALICE3CoreLinkDef.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;

ALICE3/Core/FastTrackerLinkDef.h

@@ -9,8 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef ALICE3_CORE_FASTTRACKERLINKDEF_H_
-#define ALICE3_CORE_FASTTRACKERLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -19,5 +18,3 @@
 #pragma link C++ class o2::fastsim::GeometryContainer + ;
 #pragma link C++ class o2::fastsim::FastTracker + ;
 #pragma link C++ class o2::fastsim::FlatLutWriter + ;
-
-#endif // ALICE3_CORE_FASTTRACKERLINKDEF_H_

CODEOWNERS

@@ -78,7 +78,7 @@
 /PWGUD @alibuild @amatyja @rolavick
 /PWGJE @alibuild @nzardosh @fjonasALICE @jaimenorman @mhemmer-cern
 /Tools/PIDML @alibuild @saganatt
-/Tools/ML @alibuild @fcatalan92 @fmazzasc
+/Tools/ML @alibuild @fcatalan92 @fmazzasc @ChSonnabend
 /Tutorials/PWGCF @alibuild @jgrosseo @victor-gonzalez @zchochul
 /Tutorials/PWGDQ @alibuild @iarsene @mcoquet642 @XiaozhiBai @mguilbau
 /Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu

CPPLINT.cfg

@@ -1 +1,2 @@
-filter=-build/c++11,-build/c++17,-build/include_order,-build/namespaces,-readability/fn_size,-readability/nolint,-readability/todo,-runtime/references,-whitespace/blank_line,-whitespace/braces,-whitespace/comments,-whitespace/indent_namespace,-whitespace/line_length,-whitespace/semicolon,-whitespace/todo
+filter=-build/c++11,-build/c++17,-build/include_order,-build/namespaces,-readability/alt_tokens,-readability/fn_size,-readability/nolint,-readability/todo,-runtime/references,-whitespace/blank_line,-whitespace/braces,-whitespace/comments,-whitespace/indent_namespace,-whitespace/line_length,-whitespace/newline,-whitespace/parens,-whitespace/semicolon,-whitespace/todo
+extensions=C,c,c++,cc,cl,cpp,cu,cuh,cxx,cxx.in,h,h++,hh,h.in,hpp,hxx,inc,inl,macro

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