Skip to content

Commit 51f7078

Browse files
authored
Merge branch 'AliceO2Group:master' into master
2 parents d33387b + b768f7f commit 51f7078

88 files changed

Lines changed: 4997 additions & 3333 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ IncludeCategories:
5151
Priority: 3
5252
CaseSensitive: true
5353
# O2
54-
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MFT|MCH|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
54+
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|FDD|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MCH|MFT|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
5555
Priority: 4
5656
CaseSensitive: true
5757
# ROOT

.github/workflows/clean-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ name: Clean PR checks
3434
type: boolean
3535
default: true
3636

37+
'check_build/O2Physics/staging':
38+
description: build/O2Physics/staging
39+
type: boolean
40+
default: true
41+
3742
permissions: {}
3843

3944
jobs:

ALICE3/Core/ALICE3CoreLinkDef.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
#pragma link off all classes;
1414
#pragma link off all functions;
1515

16-
#pragma link C++ class o2::pid::tof::TOFResoALICE3 + ;
1716
#pragma link C++ class std::vector < std::vector < unsigned int>> + ;
1817
#pragma link C++ class std::vector < std::vector < std::uint32_t>> + ;

ALICE3/Core/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@
1010
# or submit itself to any jurisdiction.
1111

1212
o2physics_add_library(ALICE3Core
13-
SOURCES TOFResoALICE3.cxx
14-
TrackUtilities.cxx
13+
SOURCES TrackUtilities.cxx
1514
FlatLutEntry.cxx
1615
FlatTrackSmearer.cxx
1716
GeometryContainer.cxx
1817
PUBLIC_LINK_LIBRARIES O2::Framework
1918
O2Physics::AnalysisCore)
2019

2120
o2physics_target_root_dictionary(ALICE3Core
22-
HEADERS TOFResoALICE3.h
23-
TrackUtilities.h
21+
HEADERS TrackUtilities.h
2422
FlatLutEntry.h
2523
GeometryContainer.h
2624
LINKDEF ALICE3CoreLinkDef.h)

ALICE3/Core/Decayer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <TLorentzVector.h>
3131
#include <TRandom3.h>
3232

33-
#include <array>
3433
#include <cmath>
3534
#include <cstddef>
3635
#include <vector>

ALICE3/Core/TOFResoALICE3.cxx

Lines changed: 0 additions & 43 deletions
This file was deleted.

ALICE3/Core/TOFResoALICE3.h

Lines changed: 0 additions & 79 deletions
This file was deleted.

ALICE3/Core/TrackUtilities.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include <TLorentzVector.h>
2424

25+
#include <cmath>
2526
#include <vector>
2627

2728
namespace o2::upgrade

ALICE3/DataModel/ECAL.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

ALICE3/DataModel/FTOF.h

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)