Skip to content

Commit aa27f41

Browse files
jjungIKFjjungIKF
authored
Merge branch 'master' into master
2 parents c8f6826 + 22b46bb commit aa27f41

File tree

336 files changed

+9901
-6619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+9901
-6619
lines changed

‎.github/workflows/o2-linter.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Find issues in O2 code
33
name: O2 linter
44

5-
#"on": [pull_request_target, push]
5+
"on": [pull_request_target, push]
66
permissions: {}
77
env:
88
BRANCH_MAIN: master
@@ -20,12 +20,12 @@ jobs:
2020
steps:
2121
- name: Set branches
2222
run: |
23-
if [[ "${{ github.event_name }}" == "push" ]]; then
23+
if [[ "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "pull_request" ]]; then
2424
branch_head="${{ github.ref }}"
25-
branch_base="${{ env.BRANCH_MAIN }}"
25+
branch_base="origin/${{ env.BRANCH_MAIN }}"
2626
else
2727
branch_head="refs/pull/${{ github.event.pull_request.number }}/merge"
28-
branch_base="${{ github.event.pull_request.base.ref }}"
28+
branch_base="origin/${{ github.event.pull_request.base.ref }}"
2929
fi
3030
echo BRANCH_HEAD="$branch_head" >> "$GITHUB_ENV"
3131
echo BRANCH_BASE="$branch_base" >> "$GITHUB_ENV"
@@ -37,9 +37,10 @@ jobs:
3737
- name: Run tests
3838
id: linter
3939
run: |
40+
git log -n 1 --pretty='format:%ci %h %s %d%n'
4041
# Diff against the common ancestor of the source (head) branch and the target (base) branch.
4142
echo "Diffing ${{ env.BRANCH_HEAD }} against ${{ env.BRANCH_BASE }}."
42-
readarray -t files < <(git diff --diff-filter d --name-only origin/${{ env.BRANCH_BASE }}...)
43+
readarray -t files < <(git diff --diff-filter d --name-only ${{ env.BRANCH_BASE }}...)
4344
if [ ${#files[@]} -eq 0 ]; then
4445
echo "::notice::No files to lint."
4546
echo "linter_ran=0" >> "$GITHUB_OUTPUT"

‎DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,29 @@
1414
///
1515
/// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
1616

17-
#include <vector>
18-
#include <map>
19-
20-
#include "Framework/runDataProcessing.h"
21-
#include "Framework/AnalysisTask.h"
22-
#include "Framework/AnalysisDataModel.h"
23-
#include "Common/DataModel/EventSelection.h"
24-
#include "Common/CCDB/EventSelectionParams.h"
2517
#include "Common/CCDB/ctpRateFetcher.h"
26-
#include "CCDB/BasicCCDBManager.h"
27-
#include "Framework/HistogramRegistry.h"
28-
#include "CommonDataFormat/BunchFilling.h"
29-
#include "DataFormatsParameters/GRPLHCIFData.h"
30-
#include "DataFormatsParameters/GRPECSObject.h"
31-
#include "Common/Core/TrackSelection.h"
32-
#include "Common/Core/TrackSelectionDefaults.h"
33-
#include "Common/DataModel/TrackSelectionTables.h"
18+
#include "Common/DataModel/EventSelection.h"
3419
#include "Common/DataModel/Multiplicity.h"
35-
#include "Common/DataModel/Centrality.h"
36-
#include "DataFormatsParameters/AggregatedRunInfo.h"
20+
#include "Common/DataModel/TrackSelectionTables.h"
3721

38-
#include "TH1F.h"
39-
#include "TH2F.h"
40-
#include "TH3.h"
22+
#include <CCDB/BasicCCDBManager.h>
23+
#include <CommonConstants/LHCConstants.h>
24+
#include <DataFormatsParameters/AggregatedRunInfo.h>
25+
#include <Framework/AnalysisDataModel.h>
26+
#include <Framework/AnalysisHelpers.h>
27+
#include <Framework/AnalysisTask.h>
28+
#include <Framework/Configurable.h>
29+
#include <Framework/HistogramRegistry.h>
30+
#include <Framework/HistogramSpec.h>
31+
#include <Framework/InitContext.h>
32+
#include <Framework/OutputObjHeader.h>
33+
#include <Framework/runDataProcessing.h>
34+
35+
#include <cmath>
36+
#include <cstddef>
37+
#include <cstdint>
38+
#include <cstdlib>
39+
#include <vector>
4140

4241
using namespace o2;
4342
using namespace o2::framework;

‎DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,32 @@
1616

1717
#include "Common/CCDB/EventSelectionParams.h"
1818
#include "Common/CCDB/ctpRateFetcher.h"
19-
#include "Common/Core/TrackSelection.h"
20-
#include "Common/Core/TrackSelectionDefaults.h"
2119
#include "Common/DataModel/Centrality.h"
2220
#include "Common/DataModel/EventSelection.h"
2321
#include "Common/DataModel/Multiplicity.h"
2422
#include "Common/DataModel/TrackSelectionTables.h"
2523

26-
#include "CCDB/BasicCCDBManager.h"
27-
#include "CommonDataFormat/BunchFilling.h"
28-
#include "DataFormatsParameters/AggregatedRunInfo.h"
29-
#include "DataFormatsParameters/GRPECSObject.h"
30-
#include "DataFormatsParameters/GRPLHCIFData.h"
31-
#include "Framework/AnalysisDataModel.h"
32-
#include "Framework/AnalysisTask.h"
33-
#include "Framework/HistogramRegistry.h"
34-
#include "Framework/runDataProcessing.h"
35-
36-
#include "TH1F.h"
37-
#include "TH2F.h"
38-
#include "TH3.h"
39-
24+
#include <CCDB/BasicCCDBManager.h>
25+
#include <CommonConstants/LHCConstants.h>
26+
#include <DataFormatsParameters/AggregatedRunInfo.h>
27+
#include <Framework/AnalysisDataModel.h>
28+
#include <Framework/AnalysisHelpers.h>
29+
#include <Framework/AnalysisTask.h>
30+
#include <Framework/Configurable.h>
31+
#include <Framework/HistogramRegistry.h>
32+
#include <Framework/HistogramSpec.h>
33+
#include <Framework/InitContext.h>
34+
#include <Framework/OutputObjHeader.h>
35+
#include <Framework/runDataProcessing.h>
36+
37+
#include <TAxis.h>
38+
#include <TH1.h>
39+
#include <TH2.h>
40+
#include <TMath.h>
41+
42+
#include <cmath>
43+
#include <cstddef>
44+
#include <cstdint>
4045
#include <map>
4146
#include <vector>
4247

‎DPG/Tasks/AOTEvent/lightIonsEvSelQa.cxx‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,28 @@
1515
/// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
1616

1717
#include "Common/CCDB/EventSelectionParams.h"
18-
#include "Common/Core/TrackSelection.h"
19-
#include "Common/Core/TrackSelectionDefaults.h"
20-
// #include "Common/DataModel/Centrality.h"
2118
#include "Common/DataModel/EventSelection.h"
22-
#include "Common/DataModel/FT0Corrected.h"
2319
#include "Common/DataModel/Multiplicity.h"
24-
#include "Common/DataModel/TrackSelectionTables.h"
25-
26-
#include "CCDB/BasicCCDBManager.h"
27-
#include "CommonDataFormat/BunchFilling.h"
28-
#include "DataFormatsFT0/Digit.h"
29-
#include "DataFormatsFT0/RecPoints.h"
30-
#include "DataFormatsParameters/AggregatedRunInfo.h"
31-
#include "DataFormatsParameters/GRPECSObject.h"
32-
#include "DataFormatsParameters/GRPLHCIFData.h"
33-
#include "Framework/AnalysisDataModel.h"
34-
#include "Framework/AnalysisTask.h"
35-
#include "Framework/HistogramRegistry.h"
36-
#include "Framework/runDataProcessing.h"
37-
38-
#include "TH1F.h"
39-
#include "TH2F.h"
40-
#include "TH3.h"
4120

21+
#include <CCDB/BasicCCDBManager.h>
22+
#include <CommonConstants/LHCConstants.h>
23+
#include <DataFormatsFT0/RecPoints.h>
24+
#include <DataFormatsParameters/AggregatedRunInfo.h>
25+
#include <Framework/AnalysisDataModel.h>
26+
#include <Framework/AnalysisHelpers.h>
27+
#include <Framework/AnalysisTask.h>
28+
#include <Framework/Configurable.h>
29+
#include <Framework/HistogramRegistry.h>
30+
#include <Framework/HistogramSpec.h>
31+
#include <Framework/InitContext.h>
32+
#include <Framework/OutputObjHeader.h>
33+
#include <Framework/runDataProcessing.h>
34+
35+
#include <bitset>
36+
#include <cmath>
37+
#include <cstddef>
38+
#include <cstdint>
39+
#include <cstdlib>
4240
#include <map>
4341
#include <vector>
4442

‎DPG/Tasks/AOTEvent/lumiQa.cxx‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,31 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include "CCDB/BasicCCDBManager.h"
13-
#include "DataFormatsFT0/Digit.h"
14-
#include "DataFormatsParameters/GRPLHCIFData.h"
15-
#include "Framework/AnalysisDataModel.h"
16-
#include "Framework/AnalysisTask.h"
17-
#include "Framework/HistogramRegistry.h"
18-
#include "Framework/runDataProcessing.h"
12+
#include <CCDB/BasicCCDBManager.h>
13+
#include <CommonConstants/LHCConstants.h>
14+
#include <DataFormatsFIT/Triggers.h>
15+
#include <DataFormatsFT0/Digit.h>
1916
#include <DataFormatsParameters/AggregatedRunInfo.h>
20-
21-
#include "TH1.h"
22-
#include "TList.h"
17+
#include <DataFormatsParameters/GRPLHCIFData.h>
18+
#include <Framework/AnalysisDataModel.h>
19+
#include <Framework/AnalysisHelpers.h>
20+
#include <Framework/AnalysisTask.h>
21+
#include <Framework/Configurable.h>
22+
#include <Framework/HistogramRegistry.h>
23+
#include <Framework/HistogramSpec.h>
24+
#include <Framework/InitContext.h>
25+
#include <Framework/OutputObjHeader.h>
26+
#include <Framework/runDataProcessing.h>
27+
28+
#include <TH1.h>
29+
#include <TList.h>
30+
#include <TString.h>
31+
32+
#include <Rtypes.h>
33+
34+
#include <bitset>
35+
#include <cmath>
36+
#include <cstdint>
2337

2438
using namespace o2;
2539
using namespace o2::framework;

‎DPG/Tasks/AOTEvent/matchingQa.cxx‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,34 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include "Framework/runDataProcessing.h"
13-
#include "Framework/AnalysisTask.h"
14-
#include "Framework/AnalysisDataModel.h"
15-
#include "Framework/HistogramRegistry.h"
16-
#include "CCDB/BasicCCDBManager.h"
17-
#include "DataFormatsFT0/Digit.h"
18-
#include "DataFormatsParameters/GRPLHCIFData.h"
19-
#include "MetadataHelper.h"
12+
#include "Common/Core/MetadataHelper.h"
13+
14+
#include <CCDB/BasicCCDBManager.h>
15+
#include <CommonConstants/LHCConstants.h>
16+
#include <DataFormatsFT0/Digit.h>
17+
#include <DataFormatsParameters/GRPLHCIFData.h>
18+
#include <Framework/AnalysisDataModel.h>
19+
#include <Framework/AnalysisHelpers.h>
20+
#include <Framework/AnalysisTask.h>
21+
#include <Framework/Configurable.h>
22+
#include <Framework/HistogramRegistry.h>
23+
#include <Framework/HistogramSpec.h>
24+
#include <Framework/InitContext.h>
25+
#include <Framework/OutputObjHeader.h>
26+
#include <Framework/runDataProcessing.h>
27+
28+
#include <TMath.h>
29+
30+
#include <Rtypes.h>
31+
#include <RtypesCore.h>
32+
33+
#include <algorithm>
34+
#include <bitset>
35+
#include <cmath>
36+
#include <cstdint>
37+
#include <cstdlib>
38+
#include <map>
39+
#include <vector>
2040

2141
using namespace o2;
2242
using namespace o2::framework;

‎DPG/Tasks/AOTEvent/rofOccupancyQa.cxx‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,27 @@
1414
///
1515
/// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
1616

17-
#include <vector>
18-
19-
#include "Framework/ConfigParamSpec.h"
20-
#include "Framework/runDataProcessing.h"
21-
#include "Framework/AnalysisTask.h"
22-
#include "Framework/AnalysisDataModel.h"
23-
#include "Common/DataModel/EventSelection.h"
2417
#include "Common/CCDB/EventSelectionParams.h"
25-
#include "CCDB/BasicCCDBManager.h"
26-
#include "CommonConstants/LHCConstants.h"
27-
#include "Framework/HistogramRegistry.h"
28-
// #include "DataFormatsParameters/GRPLHCIFData.h"
29-
#include "ITSMFTBase/DPLAlpideParam.h"
30-
#include "DataFormatsParameters/AggregatedRunInfo.h"
18+
#include "Common/DataModel/EventSelection.h"
19+
20+
#include <CCDB/BasicCCDBManager.h>
21+
#include <CommonConstants/LHCConstants.h>
22+
#include <DataFormatsParameters/AggregatedRunInfo.h>
23+
#include <Framework/AnalysisDataModel.h>
24+
#include <Framework/AnalysisHelpers.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/Configurable.h>
27+
#include <Framework/DataTypes.h>
28+
#include <Framework/HistogramRegistry.h>
29+
#include <Framework/HistogramSpec.h>
30+
#include <Framework/InitContext.h>
31+
#include <Framework/OutputObjHeader.h>
32+
#include <Framework/runDataProcessing.h>
33+
#include <ITSMFTBase/DPLAlpideParam.h>
34+
35+
#include <cmath>
36+
#include <cstdint>
37+
#include <vector>
3138

3239
using namespace o2;
3340
using namespace o2::framework;

‎DPG/Tasks/AOTTrack/D0CalibTables.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
#ifndef DPG_TASKS_AOTTRACK_D0CALIBTABLES_H_
1717
#define DPG_TASKS_AOTTRACK_D0CALIBTABLES_H_
1818

19-
#include "Common/DataModel/EventSelection.h"
2019
#include "Common/DataModel/TrackSelectionTables.h"
2120

2221
#include <Framework/ASoA.h>
2322
#include <Framework/AnalysisDataModel.h>
2423

25-
#include <sys/types.h>
26-
24+
#include <algorithm>
25+
#include <cmath>
2726
#include <cstdint>
28-
#include <limits>
2927
#include <string>
3028
#include <vector>
3129

‎DPG/Tasks/AOTTrack/MonitorFilterBit.cxx‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,29 @@
1515
/// \brief Task performing basic checks on filter-bit selections.
1616
///
1717

18-
#include "Framework/runDataProcessing.h"
19-
#include "Framework/AnalysisTask.h"
20-
#include "Common/DataModel/TrackSelectionTables.h"
2118
#include "Common/Core/RecoDecay.h"
22-
#include "Framework/ASoAHelpers.h"
23-
#include "Framework/ASoA.h"
19+
#include "Common/DataModel/TrackSelectionTables.h"
20+
21+
#include <Framework/ASoA.h>
22+
#include <Framework/ASoAHelpers.h>
23+
#include <Framework/AnalysisDataModel.h>
24+
#include <Framework/AnalysisHelpers.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/Configurable.h>
27+
#include <Framework/DataTypes.h>
28+
#include <Framework/HistogramRegistry.h>
29+
#include <Framework/HistogramSpec.h>
30+
#include <Framework/InitContext.h>
31+
#include <Framework/runDataProcessing.h>
32+
33+
#include <RtypesCore.h>
34+
35+
#include <cmath>
36+
#include <cstdint>
37+
#include <cstdlib>
38+
#include <vector>
39+
40+
#include <math.h>
2441

2542
using namespace o2;
2643
using namespace o2::framework;

‎DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,21 @@
1818

1919
#include "PWGLF/DataModel/LFStrangenessTables.h"
2020

21-
#include "Common/Core/RecoDecay.h"
22-
#include "Common/Core/TrackSelection.h"
23-
#include "Common/Core/trackUtilities.h"
2421
#include "Common/DataModel/EventSelection.h"
2522
#include "Common/DataModel/PIDResponseTOF.h"
2623
#include "Common/DataModel/PIDResponseTPC.h"
2724
#include "Common/DataModel/TrackSelectionTables.h"
2825

29-
#include "Framework/ASoAHelpers.h"
30-
#include "Framework/AnalysisDataModel.h"
31-
#include "Framework/AnalysisTask.h"
32-
#include "Framework/runDataProcessing.h"
33-
#include "ReconstructionDataFormats/Track.h"
26+
#include <Framework/AnalysisDataModel.h>
27+
#include <Framework/AnalysisTask.h>
28+
#include <Framework/Configurable.h>
29+
#include <Framework/HistogramRegistry.h>
30+
#include <Framework/HistogramSpec.h>
31+
#include <Framework/InitContext.h>
32+
#include <Framework/runDataProcessing.h>
33+
34+
#include <TH1.h>
35+
#include <TH2.h>
3436

3537
using namespace o2;
3638
using namespace o2::framework;

0 commit comments

Comments
 (0)