Merge branch 'master' into changes_mftReasso

Author: AlexianL

.github/workflows/o2-linter.yml

@@ -2,7 +2,7 @@
 # Find issues in O2 code
 name: O2 linter
 
-#"on": [pull_request_target, push]
+"on": [pull_request_target, push]
 permissions: {}
 env:
   BRANCH_MAIN: master
@@ -20,12 +20,12 @@ jobs:
     steps:
       - name: Set branches
         run: |
-          if [[ "${{ github.event_name }}" == "push" ]]; then
+          if [[ "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "pull_request" ]]; then
             branch_head="${{ github.ref }}"
-            branch_base="${{ env.BRANCH_MAIN }}"
+            branch_base="origin/${{ env.BRANCH_MAIN }}"
           else
             branch_head="refs/pull/${{ github.event.pull_request.number }}/merge"
-            branch_base="${{ github.event.pull_request.base.ref }}"
+            branch_base="origin/${{ github.event.pull_request.base.ref }}"
           fi
           echo BRANCH_HEAD="$branch_head" >> "$GITHUB_ENV"
           echo BRANCH_BASE="$branch_base" >> "$GITHUB_ENV"
@@ -37,9 +37,10 @@ jobs:
       - name: Run tests
         id: linter
         run: |
+          git log -n 1 --pretty='format:%ci %h %s %d%n'
           # Diff against the common ancestor of the source (head) branch and the target (base) branch.
           echo "Diffing ${{ env.BRANCH_HEAD }} against ${{ env.BRANCH_BASE }}."
-          readarray -t files < <(git diff --diff-filter d --name-only origin/${{ env.BRANCH_BASE }}...)
+          readarray -t files < <(git diff --diff-filter d --name-only ${{ env.BRANCH_BASE }}...)
           if [ ${#files[@]} -eq 0 ]; then
               echo "::notice::No files to lint."
               echo "linter_ran=0" >> "$GITHUB_OUTPUT"

ALICE3/Core/Decayer.h

@@ -21,18 +21,18 @@
 
 #include "ALICE3/Core/TrackUtilities.h"
 
-#include "ReconstructionDataFormats/Track.h"
+#include <CommonConstants/PhysicsConstants.h>
+#include <MathUtils/Primitive2D.h>
+#include <ReconstructionDataFormats/Track.h>
 
-#include <TDatabasePDG.h>
-#include <TDecayChannel.h>
+#include <TDecayChannel.h> // IWYU pragma: keep
 #include <TGenPhaseSpace.h>
 #include <TLorentzVector.h>
-#include <TParticlePDG.h>
 #include <TRandom3.h>
 
 #include <array>
 #include <cmath>
-#include <string>
+#include <cstddef>
 #include <vector>
 
 namespace o2

ALICE3/Core/DelphesO2LutWriter.cxx

@@ -25,14 +25,27 @@
 #include "ALICE3/Core/FastTracker.h"
 #include "ALICE3/Core/TrackUtilities.h"
 
-#include "TAxis.h"
-#include "TDatabasePDG.h"
-#include "TLorentzVector.h"
-#include "TMatrixD.h"
-#include "TMatrixDSymEigen.h"
-#include "TVectorD.h"
-
+#include <Framework/Logger.h>
+#include <ReconstructionDataFormats/Track.h>
+
+#include <TAxis.h>
+#include <TDatabasePDG.h>
+#include <TGraph.h>
+#include <TLorentzVector.h>
+#include <TMatrixD.h> // IWYU pragma: keep (do not replace with TMatrixDfwd.h)
+#include <TMatrixDSymEigen.h>
+#include <TMatrixDSymfwd.h>
+#include <TMatrixDfwd.h>
+#include <TParticlePDG.h>
+#include <TString.h>
+#include <TVectorDfwd.h>
+
+#include <Rtypes.h>
+
+#include <cmath>
 #include <cstdio>
+#include <cstdlib>
+#include <fstream>
 #include <string>
 
 // #define USE_FWD_PARAM

ALICE3/Core/DelphesO2LutWriter.h

@@ -23,10 +23,13 @@
 #include "ALICE3/Core/DelphesO2TrackSmearer.h"
 #include "ALICE3/Core/FastTracker.h"
 
-#include "ReconstructionDataFormats/PID.h"
+#include <ReconstructionDataFormats/PID.h>
 
-#include "TGraph.h"
+#include <TGraph.h>
 
+#include <Rtypes.h>
+
+#include <cstddef>
 #include <string>
 
 namespace o2::fastsim

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -28,20 +28,18 @@
 /// @author: Roberto Preghenella
 /// @email: preghenella@bo.infn.it
 
-// #include "TrackSmearer.hh"
-// #include "TrackUtils.hh"
-// #include "TRandom.h"
-// #include <iostream>
-// #include <fstream>
-
 #include "ALICE3/Core/DelphesO2TrackSmearer.h"
 
 #include "ALICE3/Core/GeometryContainer.h"
 
 #include <CommonConstants/PhysicsConstants.h>
 #include <Framework/Logger.h>
 
-#include <map>
+#include <TRandom.h>
+
+#include <cmath>
+#include <fstream>
+#include <ostream>
 #include <string>
 
 namespace o2

ALICE3/Core/DelphesO2TrackSmearer.h

@@ -27,22 +27,14 @@
 #include <CCDB/BasicCCDBManager.h>
 #include <ReconstructionDataFormats/Track.h>
 
-#include <TRandom.h>
-
+#include <cmath>
 #include <cstdio>
-#include <fstream>
-#include <iostream>
-#include <map>
-#include <string>
+#include <cstdlib>
 
 ///////////////////////////////
 /// DelphesO2/src/lutCovm.hh //
 ///////////////////////////////
 
-/// @author: Roberto Preghenella
-/// @email: preghenella@bo.infn.it
-
-// #pragma // once
 #define LUTCOVM_VERSION 20210801
 
 struct map_t {
@@ -154,17 +146,6 @@ struct lutEntry_t {
 /// DelphesO2/src/TrackSmearer.hh //
 ////////////////////////////////////
 
-/// @author: Roberto Preghenella
-/// @email: preghenella@bo.infn.it
-
-// #ifndef _DelphesO2_TrackSmearer_h_
-// #define _DelphesO2_TrackSmearer_h_
-
-// #include "ReconstructionDataFormats/Track.h"
-// #include "classes/DelphesClasses.h"
-// #include "lutCovm.hh"
-// #include <map>
-
 using O2Track = o2::track::TrackParCov;
 
 namespace o2
@@ -269,10 +250,9 @@ class TrackSmearer
 } // namespace delphes
 } // namespace o2
 
-// #endif /** _DelphesO2_TrackSmearer_h_ **/
-
 namespace o2::delphes
 {
 using DelphesO2TrackSmearer = TrackSmearer;
 }
+
 #endif // ALICE3_CORE_DELPHESO2TRACKSMEARER_H_

ALICE3/Core/DetLayer.cxx

@@ -21,8 +21,10 @@
 #include <CommonConstants/MathConstants.h>
 #include <Framework/Logger.h>
 
+#include <TGraph.h>
+#include <TString.h>
+
 #include <string>
-#include <vector>
 
 namespace o2::fastsim
 {

ALICE3/Core/DetLayer.h

@@ -22,6 +22,7 @@
 #include <TGraph.h>
 #include <TString.h>
 
+#include <ostream>
 #include <string>
 
 namespace o2::fastsim

ALICE3/Core/FastTracker.cxx

@@ -11,24 +11,37 @@
 
 #include "FastTracker.h"
 
-#include "Common/Core/TableHelper.h"
-
+#include "DetLayer.h"
+#include "GeometryContainer.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/MathConstants.h>
+#include <Framework/Logger.h>
+#include <MathUtils/Utils.h>
+#include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/TrackParametrization.h>
 
-#include <TEnv.h>
-#include <THashList.h>
-#include <TMath.h>
-#include <TMatrixD.h>
+#include <TFile.h>
+#include <TGraph.h>
+#include <TMathBase.h>
+#include <TMatrixD.h> // IWYU pragma: keep (do not replace with TMatrixDfwd.h)
 #include <TMatrixDSymEigen.h>
+#include <TMatrixDSymfwd.h>
+#include <TMatrixDfwd.h>
 #include <TObject.h>
 #include <TRandom.h>
-#include <TSystem.h>
+#include <TString.h>
+#include <TVectorDfwd.h>
+
+#include <Rtypes.h>
+#include <RtypesCore.h>
 
-#include <chrono>
-#include <fstream>
-#include <map>
+#include <array>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <string>
-#include <thread>
 #include <vector>
 
 namespace o2

ALICE3/Core/FastTracker.h

@@ -16,11 +16,14 @@
 #include "GeometryContainer.h"
 
 #include <CCDB/BasicCCDBManager.h>
-#include <Framework/InitContext.h>
-#include <Framework/Logger.h>
 #include <ReconstructionDataFormats/Track.h>
 
-#include <map>
+#include <TString.h>
+
+#include <Rtypes.h>
+
+#include <cstddef>
+#include <cstdint>
 #include <string>
 #include <vector>