Skip to content

Commit 8457c65

Browse files
authored
Merge branch 'AliceO2Group:dev' into loopers
2 parents f60eb58 + 1b04a9a commit 8457c65

File tree

190 files changed

+4152
-3524
lines changed

Some content is hidden

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

190 files changed

+4152
-3524
lines changed

.github/workflows/code-transformations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
ref: ${{ github.event.pull_request.head.sha }}
1717
persist-credentials: false

.github/workflows/datamodel-doc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ jobs:
1010
steps:
1111

1212
- name: Checkout O2
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
path: O2
1616
persist-credentials: false
1717

1818
- name: Checkout O2Physics
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
repository: AliceO2Group/O2Physics
2222
path: O2Physics
2323
persist-credentials: false
2424

2525
- name: Checkout documentation
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
repository: AliceO2Group/analysis-framework
2929
path: analysis-framework
@@ -40,7 +40,7 @@ jobs:
4040
git checkout -B auto-datamodel-doc
4141
4242
- name: Set up Python
43-
uses: actions/setup-python@v5
43+
uses: actions/setup-python@v6
4444
with:
4545
python-version: 3.x
4646

.github/workflows/doxygen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
run: |
1414
sudo apt-get update -y
1515
sudo apt-get install -y doxygen doxygen-doc doxygen-latex doxygen-gui graphviz cmake
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
with:
1818
ref: "dev"
1919
persist-credentials: false

.github/workflows/first-timer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
nag_first_timer:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/first-interaction@v1
11+
- uses: actions/first-interaction@v3
1212
with:
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}
1414
pr-message: 'This seems to be your first PR. You will need a positive review in order for tests to start.'

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
branch=$(echo ${{ github.event.inputs.tag }}-patches | tr . - | sed -e's/-[0-9]*-patches$/-patches/')
1919
EOF
2020
id: decide_release_branch
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
with:
2323
ref: "dev"
2424
- name: Tag branch (or create one before tagging if does not exists)

.github/workflows/reports.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
if: github.repository == 'AliceO2Group/AliceO2'
1818

1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: Set up Python 3.10
22-
uses: actions/setup-python@v5
22+
uses: actions/setup-python@v6
2323
with:
2424
python-version: '3.10'
2525
- uses: actions/cache@v4

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v9
10+
- uses: actions/stale@v10
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
stale-pr-message: 'This PR did not have any update in the last 30 days. Is it still needed? Unless further action in will be closed in 5 days.'

Common/ML/src/OrtInterface.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void OrtModel::initOptions(std::unordered_map<std::string, std::string> optionsM
5454

5555
// Load from options map
5656
if (!optionsMap.contains("model-path")) {
57-
LOG(fatal) << "(ORT) Model path cannot be empty!";
57+
LOG(fatal) << "(ORT) Model path must be contained in options map!";
5858
}
5959

6060
if (!optionsMap["model-path"].empty()) {

Common/SimConfig/include/SimConfig/SimParams.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ struct SimCutParams : public o2::conf::ConfigurableParamHelper<SimCutParams> {
4444
struct SimMaterialParams : public o2::conf::ConfigurableParamHelper<SimMaterialParams> {
4545
// Local density value takes precedence over global density value, i.e. local values overwrite the global value.
4646
float globalDensityFactor = 1.f; // global factor that scales all material densities for systematic studies
47-
std::string localDensityFactor; // Expected format: "SimMaterialParams.localDensityFactor=<mod1>:<value1>,<mod2>:<value2>,..."
47+
// String to set densities on module or material level. Expected format:
48+
// "SimMaterialParams.localDensityFactor=<mod1/matname>:<value1>,<mod2>:<value2>,..."
49+
// Example: "SimMaterialParams.localDensityFactor=TPC/Air:1.2,ITS:5." will scale the density of the Air in TPC
50+
// with 1.2 and to 5.0 for all materials in ITS".
51+
std::string localDensityFactor;
4852

4953
O2ParamDef(SimMaterialParams, "SimMaterialParams");
5054
};

Common/Utils/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,6 @@ o2_add_executable(treemergertool
9191
COMPONENT_NAME CommonUtils
9292
SOURCES src/TreeMergerTool.cxx
9393
PUBLIC_LINK_LIBRARIES O2::CommonUtils Boost::program_options ROOT::Core)
94+
95+
add_library(fpu_support OBJECT src/fpu.cxx)
96+
add_library(O2::fpu_support ALIAS fpu_support)

0 commit comments

Comments
 (0)