Skip to content

Commit bfcc37a

Browse files
authored
Merge branch 'master' into master
2 parents a3412e9 + 6b619db commit bfcc37a

File tree

146 files changed

+9169
-5682
lines changed

Some content is hidden

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

146 files changed

+9169
-5682
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ repos:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- repo: https://github.com/pre-commit/mirrors-clang-format
10-
rev: v18.1.3 # clang-format version
10+
rev: v20.1.5 # clang-format version
1111
hooks:
1212
- id: clang-format
1313
- repo: https://github.com/cpplint/cpplint
14-
rev: 2.0.0
14+
rev: 2.0.2
1515
hooks:
1616
- id: cpplint

ALICE3/Core/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@ o2physics_target_root_dictionary(ALICE3Core
2424
o2physics_add_library(FastTracker
2525
SOURCES FastTracker.cxx
2626
DetLayer.cxx
27+
DelphesO2LutWriter.cxx
2728
PUBLIC_LINK_LIBRARIES O2::Framework
28-
O2Physics::AnalysisCore)
29+
O2Physics::AnalysisCore
30+
O2Physics::ALICE3Core)
2931

3032
o2physics_target_root_dictionary(FastTracker
3133
HEADERS FastTracker.h
3234
DetLayer.h
35+
DelphesO2LutWriter.h
3336
LINKDEF FastTrackerLinkDef.h)

0 commit comments

Comments
 (0)