Skip to content

Commit 607f2f6

Browse files
Merge branch 'AliceO2Group:master' into master
2 parents c885d07 + c5f409c commit 607f2f6

630 files changed

Lines changed: 82944 additions & 23556 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ExperimentalAutoDetectBinPacking: false
2424
IndentCaseLabels: true
2525
IndentFunctionDeclarationAfterType: true
2626
IndentWidth: 2
27+
InsertNewlineAtEOF: true
2728
# It is broken on windows. Breaks all #include "header.h"
2829
---
2930
Language: Cpp

.github/labeler.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
alice3:
3+
- changed-files:
4+
- any-glob-to-any-file: ['ALICE3/**']
5+
6+
common:
7+
- changed-files:
8+
- any-glob-to-any-file: ['Common/**']
9+
10+
infrastructure:
11+
- changed-files:
12+
- any-glob-to-any-file: ['.github/**', 'cmake/**', 'dependencies/**', 'packaging/**']
13+
14+
dpg:
15+
- changed-files:
16+
- any-glob-to-any-file: ['DPG/**']
17+
18+
pwgcf:
19+
- changed-files:
20+
- any-glob-to-any-file: ['PWGCF/**', '*/PWGCF/**']
21+
22+
pwgdq:
23+
- changed-files:
24+
- any-glob-to-any-file: ['PWGDQ/**', '*/PWGDQ/**']
25+
26+
pwgem:
27+
- changed-files:
28+
- any-glob-to-any-file: ['PWGEM/**', '*/PWGEM/**']
29+
30+
pwghf:
31+
- changed-files:
32+
- any-glob-to-any-file: ['PWGHF/**', '*/PWGHF/**']
33+
34+
pwgje:
35+
- changed-files:
36+
- any-glob-to-any-file: ['PWGJE/**', '*/PWGJE/**']
37+
38+
pwglf:
39+
- changed-files:
40+
- any-glob-to-any-file: ['PWGLF/**', '*/PWGLF/**', 'PWGMM/**', '*/PWGMM/**']
41+
42+
pwgud:
43+
- changed-files:
44+
- any-glob-to-any-file: ['PWGUD/**', '*/PWGUD/**']
45+
46+
trigger:
47+
- changed-files:
48+
- any-glob-to-any-file: ['EventFiltering/**']
49+
50+
tutorial:
51+
- changed-files:
52+
- any-glob-to-any-file: ['Tutorials/**']

.github/workflows/codeowner-self-approval.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
approve:
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-22.04
1717
# Only run if the PR author enabled auto-merge, not someone else.
1818
# Also run if a new approval was created, as this affects whether we can
1919
# auto-approve. There is a risk of infinite loops here, though -- when we

.github/workflows/labeler.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: "Pull Request Labeler"
3+
on:
4+
- pull_request_target
5+
permissions: read-all
6+
7+
jobs:
8+
labeler:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: read
12+
pull-requests: write
13+
steps:
14+
- uses: actions/labeler@v5
15+
with:
16+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/mega-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: ml
3939
# You can override MegaLinter flavor used to have faster performances
4040
# More info at https://megalinter.io/flavors/
41-
uses: oxsecurity/megalinter@v7
41+
uses: oxsecurity/megalinter@v8
4242
env:
4343
# All available variables are described in documentation:
4444
# https://megalinter.io/configuration/

ALICE3/Core/CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ o2physics_add_library(ALICE3Core
1515
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
1616

1717
o2physics_target_root_dictionary(ALICE3Core
18-
HEADERS TOFResoALICE3.h
19-
DelphesO2TrackSmearer.h
20-
LINKDEF ALICE3CoreLinkDef.h)
18+
HEADERS TOFResoALICE3.h
19+
DelphesO2TrackSmearer.h
20+
LINKDEF ALICE3CoreLinkDef.h)
21+
22+
o2physics_add_library(FastTracker
23+
SOURCES FastTracker.cxx
24+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
25+
26+
o2physics_target_root_dictionary(FastTracker
27+
HEADERS FastTracker.h
28+
LINKDEF FastTrackerLinkDef.h)

ALICE3/Core/DetLayer.h

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
///
13+
/// \file DetLayer.h
14+
/// \author David Dobrigkeit Chinellato
15+
/// \since 11/03/2021
16+
/// \brief Basic struct to hold information regarding a detector layer to be used in fast simulation
17+
///
18+
19+
#ifndef ALICE3_CORE_DETLAYER_H_
20+
#define ALICE3_CORE_DETLAYER_H_
21+
22+
#include "TString.h"
23+
24+
namespace o2::fastsim
25+
{
26+
27+
struct DetLayer {
28+
// TString for holding name
29+
TString name;
30+
31+
// position variables
32+
float r; // radius in centimeters
33+
float z; // z dimension in centimeters
34+
35+
// material variables
36+
float x0; // radiation length
37+
float xrho; // density
38+
39+
// resolution variables for active layers
40+
float resRPhi; // RPhi resolution in centimeters
41+
float resZ; // Z resolution in centimeters
42+
43+
// efficiency
44+
float eff; // detection efficiency
45+
46+
// layer type
47+
int type; // 0: undefined/inert, 1: silicon, 2: gas/tpc
48+
};
49+
50+
} // namespace o2::fastsim
51+
52+
#endif // ALICE3_CORE_DETLAYER_H_

0 commit comments

Comments
 (0)