Skip to content

Commit 648bb6a

Browse files
pkurashpkurash
authored
Merge branch 'AliceO2Group:dev' into new-detector4
2 parents f03d62c + 434fb27 commit 648bb6a

File tree

89 files changed

+1591
-1340
lines changed

Some content is hidden

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

89 files changed

+1591
-1340
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@v3
14+
- uses: actions/checkout@v4
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@v3
13+
uses: actions/checkout@v4
1414
with:
1515
path: O2
1616
persist-credentials: false
1717

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

2525
- name: Checkout documentation
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
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@v2
43+
uses: actions/setup-python@v5
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@v3
16+
- uses: actions/checkout@v4
1717
with:
1818
ref: "dev"
1919
persist-credentials: false

‎.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@v3
21+
- uses: actions/checkout@v4
2222
with:
2323
ref: "dev"
2424
- name: Tag branch (or create one before tagging if does not exists)

‎.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@v1
10+
- uses: actions/stale@v9
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.'

‎CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
/DataFormats/Detectors/Common @shahor02
2929
/DataFormats/Detectors/CPV @peressounko @kharlov
3030
/DataFormats/Detectors/CTP @lietava
31-
/DataFormats/Detectors/EMCAL @mfasDa @jokonig
31+
/DataFormats/Detectors/EMCAL @nstrangm @jokonig
3232
/DataFormats/Detectors/FIT @jotwinow @afurs @andreasmolander @sahilupadhyaya92
33-
/DataFormats/Detectors/FOCAL @maxrauch @mfasDa @iarsene @matthiasrichter
33+
/DataFormats/Detectors/FOCAL @maxrauch @iarsene @matthiasrichter
3434
/DataFormats/Detectors/GlobalTracking @shahor02
3535
/DataFormats/Detectors/GlobalTrackingWorkflow @shahor02
3636
/DataFormats/Detectors/HMPID @gvolpe79
@@ -58,9 +58,9 @@
5858
/Detectors/Base @sawenzel @shahor02
5959
/Detectors/Calibration @chiarazampolli @shahor02
6060
/Detectors/CPV @peressounko @kharlov
61-
/Detectors/EMCAL @mfasDa @jokonig
61+
/Detectors/EMCAL @nstrangm @jokonig
6262
/Detectors/FIT @jotwinow @afurs @andreasmolander @sahilupadhyaya92
63-
/Detectors/FOCAL @maxrauch @mfasDa @iarsene @matthiasrichter
63+
/Detectors/FOCAL @maxrauch @iarsene @matthiasrichter
6464
/Detectors/Geometry @sawenzel @shahor02
6565
/Detectors/GlobalTracking @shahor02
6666
/Detectors/GlobalTrackingWorkflow @shahor02

‎Common/Utils/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ o2_add_library(CommonUtils
2626
src/DebugStreamer.cxx
2727
src/DLLoaderBase.cxx
2828
PUBLIC_LINK_LIBRARIES ROOT::Hist ROOT::Tree Boost::iostreams O2::CommonDataFormat O2::Headers
29-
FairLogger::FairLogger O2::MathUtils TBB::tbb)
29+
FairLogger::FairLogger O2::MathUtils TBB::tbb O2::GPUCommon)
3030

3131
o2_target_root_dictionary(CommonUtils
3232
HEADERS include/CommonUtils/TreeStream.h

‎Common/Utils/include/CommonUtils/StringUtils.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
#include <sstream>
2121
#include <vector>
2222
#include <algorithm>
23-
#include <fmt/format.h>
24-
#include <Rtypes.h>
23+
#include "GPUCommonRtypes.h"
2524

2625
namespace o2
2726
{

‎Common/Utils/src/StringUtils.cxx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
#include "CommonUtils/StringUtils.h"
1313
#include <cstdlib>
1414
#include <filesystem>
15+
#ifndef GPUCA_STANDALONE
1516
#include <TGrid.h>
17+
#include <fmt/format.h>
18+
#endif
1619
#include <unistd.h>
1720

1821
using namespace o2::utils;
@@ -77,6 +80,7 @@ std::string Str::getFullPath(const std::string_view p)
7780
return std::filesystem::canonical(std::string{p}).string();
7881
}
7982

83+
#ifndef GPUCA_STANDALONE
8084
std::string Str::rectifyDirectory(const std::string_view p)
8185
{
8286
std::string dir(p);
@@ -104,6 +108,7 @@ std::string Str::rectifyDirectory(const std::string_view p)
104108
}
105109
return dir;
106110
}
111+
#endif
107112

108113
// Create unique non-existing path name starting with prefix. Loose equivalent of boost::filesystem::unique_path()
109114
// The prefix can be either existing directory or just a string to add in front of the random part

‎DataFormats/Detectors/ITSMFT/common/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@ o2_add_library(DataFormatsITSMFT
1818
src/ClusterPattern.cxx
1919
src/ClusterTopology.cxx
2020
src/TopologyDictionary.cxx
21+
src/TimeDeadMap.cxx
2122
src/CTF.cxx
2223
PUBLIC_LINK_LIBRARIES O2::ITSMFTBase
2324
O2::ReconstructionDataFormats
2425
Microsoft.GSL::GSL)
2526

2627
o2_target_root_dictionary(DataFormatsITSMFT
2728
HEADERS include/DataFormatsITSMFT/ROFRecord.h
28-
include/DataFormatsITSMFT/Digit.h
29-
include/DataFormatsITSMFT/GBTCalibData.h
30-
include/DataFormatsITSMFT/NoiseMap.h
31-
include/DataFormatsITSMFT/TimeDeadMap.h
29+
include/DataFormatsITSMFT/Digit.h
30+
include/DataFormatsITSMFT/GBTCalibData.h
31+
include/DataFormatsITSMFT/NoiseMap.h
32+
include/DataFormatsITSMFT/TimeDeadMap.h
3233
include/DataFormatsITSMFT/Cluster.h
3334
include/DataFormatsITSMFT/CompCluster.h
3435
include/DataFormatsITSMFT/ClusterPattern.h

0 commit comments

Comments
 (0)