Skip to content

Commit f972016

Browse files
sawenzelclaude
andcommitted
Complete the FairRoot provenance notes and guard unused geometry import
This addresses review comments on the imported FairRoot sources. - AUTHORS and CONTRIBUTORS are copied from FairRoot, as COPYRIGHT refers to them. - Each modified file carries a short note below its licence header, and the README dates the changes. - FairModule stops with a message instead of crashing if the FairRoot geometry import is used, and an orphaned declaration is removed. - A duplicate link in Generators, a blank line in the CPV tests and a stale documentation link are removed. https://its.cern.ch/jira/browse/O2-7305 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 56a9ddb commit f972016

17 files changed

Lines changed: 67 additions & 20 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Al-Turany, Mohammad
2+
Karabowicz, Radoslaw
3+
Klein, Dennis
4+
Kresan, Dmytro
5+
Rybalchenko, Alexey
6+
Uhlig, Florian

‎Detectors/3rdparty/FairRootBase/CMakeLists.txt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,7 @@
99
# granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

12-
# FairRootBase: the FairRoot simulation base classes, vendored into O2.
13-
#
14-
# These files are copied verbatim from ALICE's own FairRoot fork
15-
# (alisw/FairRoot, v18.4.9-alice3) so that O2 no longer needs FairRoot as an
16-
# external package. They remain LGPLv3 (see the per-file headers), which is
17-
# compatible with O2's GPLv3.
18-
#
19-
# The classes deliberately keep their original names and header names in this
20-
# first step: that makes the move a pure relocation with no call-site changes,
21-
# so it can be validated as behaviour-preserving. Renaming them into an O2
22-
# namespace, and pruning the parts O2 does not use, are follow-up steps.
12+
# FairRootBase: the FairRoot simulation classes used by O2. Origin, licence and changes are in README.md.
2313

2414
# o2_target_root_dictionary requires paths relative to the current source dir
2515
file(GLOB FAIRROOTBASE_SOURCES CONFIGURE_DEPENDS
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Aphecetche, Laurent
2+
Babai, Arya
3+
Berzano, Dario
4+
Bertini, Denis
5+
Binet, Sebastien
6+
Costanza, Susanna
7+
Eulisse, Giulio
8+
Friese, Volker
9+
Gertsenberger, Konstantin
10+
Hřivnáčová, Ivana
11+
Klasen, Roman
12+
Kliemt, Ralf
13+
Klenze, Philipp
14+
Kollegger, Thorsten
15+
Koenig, Ilse
16+
Krzewicki, Mikolaj
17+
Lavezzi, Lia
18+
Lavrik, Evgeny
19+
Lantwin, Oliver
20+
Manafov, Anar
21+
Mayer, Jan
22+
Neskovic, Gvozden
23+
Neubert, Sebastian
24+
Ovcharenko, Egor
25+
Pellegrino,Carmelo
26+
Pierre-Alain, Loizeau
27+
Pflueger, Stefan
28+
Richter, Matthias
29+
Rademakers, Fons
30+
Rohr, David
31+
Shahoyan, Ruben
32+
Stockmanns, Tobias
33+
Tacke, Christian
34+
Ustyuzhanin, Andrey
35+
von Haller, Barthélémy
36+
Wenzel, Sandro
37+
Wielanek, Daniel
38+
Winckler, Nicolas
39+
Zanetti, Lorenzo

‎Detectors/3rdparty/FairRootBase/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ ALICE has been building against.
88

99
The files keep their original copyright and licence headers. FairRoot is distributed under the GNU
1010
Lesser General Public Licence version 3. The licence text is in [LICENSE](LICENSE) and the copyright
11-
statement in [COPYRIGHT](COPYRIGHT), both copied verbatim from FairRoot.
11+
statement in [COPYRIGHT](COPYRIGHT), with [AUTHORS](AUTHORS) and [CONTRIBUTORS](CONTRIBUTORS), all copied verbatim
12+
from FairRoot. Each modified file carries a note below its licence header.
1213

13-
Changes with respect to the upstream sources:
14+
Changes with respect to the upstream sources, made in 2026:
1415

1516
- Code paths that O2 does not use were removed. This covers the runtime parameter database and the
1617
geometry parameter containers, among others. The affected files are `FairMCApplication`,
1718
`FairModule`, `FairRun`, `FairRunSim`, `FairSink` and `FairField`.
19+
- `FairModule` stops with a clear message if its geometry import is used, since O2 does not set it up.
1820
- `FairRootBaseLinkDef.h` is new and builds one dictionary for the directory.
1921

2022
The sources keep their upstream formatting and are excluded from clang-format.

‎Detectors/3rdparty/FairRootBase/include/FairField.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* GNU Lesser General Public Licence (LGPL) version 3, *
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
8+
// Modified for ALICE O2 in 2026: parts not used by O2 were removed (see README.md in this directory).
89
// -------------------------------------------------------------------------
910
// ----- FairField header file -----
1011
// ----- Created 06/01/04 by M. Al-Turany -----

‎Detectors/3rdparty/FairRootBase/include/FairModule.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* GNU Lesser General Public Licence (LGPL) version 3, *
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
8+
// Modified for ALICE O2 in 2026: parts not used by O2 were removed (see README.md in this directory).
89
#ifndef FAIRMODULE_H
910
#define FAIRMODULE_H
1011

@@ -116,7 +117,6 @@ class FairModule : public TNamed
116117
**/
117118
void SetMotherVolume(TString volName) { fMotherVolumeName = volName; }
118119
/**called from ConstuctASCIIGeometry*/
119-
void ProcessNodes(TList* aList);
120120
/**Set the parameter containers*/
121121
virtual void SetParContainers() { ; }
122122
/** Initialize everything which has to be done before the construction and modification

‎Detectors/3rdparty/FairRootBase/include/FairRun.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* GNU Lesser General Public Licence (LGPL) version 3, *
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
8+
// Modified for ALICE O2 in 2026: parts not used by O2 were removed (see README.md in this directory).
89
#ifndef FAIRRUN_H
910
#define FAIRRUN_H
1011

‎Detectors/3rdparty/FairRootBase/include/FairRunSim.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* GNU Lesser General Public Licence (LGPL) version 3, *
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
8+
// Modified for ALICE O2 in 2026: parts not used by O2 were removed (see README.md in this directory).
89
#ifndef FAIRRUNSIM_H
910
#define FAIRRUNSIM_H
1011

‎Detectors/3rdparty/FairRootBase/include/FairSink.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* GNU Lesser General Public Licence version 3 (LGPL) version 3, *
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
8+
// Modified for ALICE O2 in 2026: parts not used by O2 were removed (see README.md in this directory).
89
// -----------------------------------------------------------------------------
910
// ----- -----
1011
// ----- FairSink -----

‎Detectors/3rdparty/FairRootBase/src/FairMCApplication.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* GNU Lesser General Public Licence (LGPL) version 3, *
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
8+
// Modified for ALICE O2 in 2026: parts not used by O2 were removed (see README.md in this directory).
89
// -------------------------------------------------------------------------
910
// ----- FairMCApplication source file -----
1011
// ----- Created 06/01/04 by M. Al-Turany -----

0 commit comments

Comments
 (0)