Skip to content

Commit 95c186e

Browse files
committed
Deprecate (T)Pythia6
The Pythia6 generator interface and use of Pythia6Decayer is deprecated following the decision of ROOT to take the same step (https://root.cern/doc/v630/release-notes.html) In any case, Pythia6 was no longer actively used in the code and we now use Pythia8 as a complete replacement. Fixes https://alice.its.cern.ch/jira/browse/O2-4542
1 parent ddfbaf7 commit 95c186e

File tree

14 files changed

+3
-502
lines changed

14 files changed

+3
-502
lines changed

Detectors/gconfig/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ o2_add_library(G3Setup
1616

1717
o2_add_library(G4Setup
1818
SOURCES src/G4Config.cxx
19-
PUBLIC_LINK_LIBRARIES MC::Geant4VMC MC::Geant4 FairRoot::Base O2::SimulationDataFormat O2::Generators O2::SimSetup ROOT::EGPythia6
19+
PUBLIC_LINK_LIBRARIES MC::Geant4VMC MC::Geant4 FairRoot::Base O2::SimulationDataFormat O2::Generators O2::SimSetup
2020
)
2121

2222
o2_add_library(FLUKASetup
2323
SOURCES src/FlukaConfig.cxx
24-
PUBLIC_LINK_LIBRARIES FairRoot::Base O2::SimulationDataFormat O2::Generators ROOT::EGPythia6 O2::SimSetup
24+
PUBLIC_LINK_LIBRARIES FairRoot::Base O2::SimulationDataFormat O2::Generators O2::SimSetup
2525
)
2626

2727
o2_add_library(MCReplaySetup
@@ -44,9 +44,6 @@ o2_target_root_dictionary(SimSetup
4444
include/SimSetup/FlukaParam.h
4545
include/SimSetup/MCReplayParam.h
4646
LINKDEF src/GConfLinkDef.h)
47-
o2_add_test_root_macro(DecayConfig.C
48-
PUBLIC_LINK_LIBRARIES O2::SimSetup
49-
LABELS simsetup)
5047

5148
o2_add_test_root_macro(UserDecay.C
5249
PUBLIC_LINK_LIBRARIES O2::SimSetup

Detectors/gconfig/DecayConfig.C

Lines changed: 0 additions & 105 deletions
This file was deleted.

Detectors/gconfig/src/G4Config.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <fairlogger/Logger.h>
1717
#include "TGeant4.h"
1818
#include "TG4RunConfiguration.h"
19-
#include "TPythia6Decayer.h"
2019
#include "FairModule.h"
2120
#include "SimConfig/G4Params.h"
2221
#include "SimConfig/SimParams.h"

Generators/CMakeLists.txt

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

12-
if(pythia6_FOUND)
13-
set(pythia6Target ROOT::EGPythia6 MC::Pythia6)
14-
endif()
15-
1612
if(pythia_FOUND)
1713
set(pythiaTarget MC::Pythia)
1814
endif()
@@ -43,8 +39,6 @@ o2_add_library(Generators
4339
src/GeneratorTParticle.cxx
4440
src/GeneratorTParticleParam.cxx
4541
src/GeneratorService.cxx
46-
$<$<BOOL:${pythia6_FOUND}>:src/GeneratorPythia6.cxx>
47-
$<$<BOOL:${pythia6_FOUND}>:src/GeneratorPythia6Param.cxx>
4842
$<$<BOOL:${pythia_FOUND}>:src/GeneratorPythia8.cxx>
4943
$<$<BOOL:${pythia_FOUND}>:src/DecayerPythia8.cxx>
5044
$<$<BOOL:${pythia_FOUND}>:src/GeneratorPythia8Param.cxx>
@@ -53,14 +47,10 @@ o2_add_library(Generators
5347
$<$<BOOL:${HepMC3_FOUND}>:src/GeneratorHepMCParam.cxx>
5448
$<$<BOOL:${HepMC3_FOUND}>:src/AODToHepMC.cxx>
5549
PUBLIC_LINK_LIBRARIES FairRoot::Base O2::SimConfig O2::CommonUtils O2::DetectorsBase O2::ZDCBase
56-
O2::SimulationDataFormat ${pythia6Target} ${pythiaTarget} ${hepmcTarget}
50+
O2::SimulationDataFormat ${pythiaTarget} ${hepmcTarget}
5751
FairRoot::Gen
5852
TARGETVARNAME targetName)
5953

60-
if(pythia6_FOUND)
61-
target_compile_definitions(${targetName} PUBLIC GENERATORS_WITH_PYTHIA6)
62-
endif()
63-
6454
if(pythia_FOUND)
6555
target_compile_definitions(${targetName} PUBLIC GENERATORS_WITH_PYTHIA8)
6656
endif()
@@ -92,11 +82,6 @@ set(headers
9282
include/Generators/GeneratorService.h
9383
)
9484

95-
if (pythia6_FOUND)
96-
list(APPEND headers include/Generators/GeneratorPythia6.h
97-
include/Generators/GeneratorPythia6Param.h)
98-
endif()
99-
10085
if(pythia_FOUND)
10186
list(APPEND headers
10287
include/Generators/GeneratorPythia8.h
@@ -116,11 +101,6 @@ o2_target_root_dictionary(Generators HEADERS ${headers})
116101
o2_add_test_root_macro(share/external/extgen.C
117102
PUBLIC_LINK_LIBRARIES O2::Generators FairRoot::Base
118103
LABELS generators COMPILE_ONLY)
119-
if(pythia6_FOUND)
120-
o2_add_test_root_macro(share/external/pythia6.C
121-
PUBLIC_LINK_LIBRARIES O2::Generators
122-
LABELS generators COMPILE_ONLY)
123-
endif()
124104

125105
if(doBuildSimulation)
126106
o2_add_test_root_macro(share/external/QEDLoader.C

Generators/include/Generators/GeneratorPythia6.h

Lines changed: 0 additions & 79 deletions
This file was deleted.

Generators/include/Generators/GeneratorPythia6Param.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

Generators/share/external/pythia6.C

Lines changed: 0 additions & 53 deletions
This file was deleted.

Generators/share/external/trigger_mpi.C

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include "Generators/Trigger.h"
99
#include "Pythia8/Pythia.h"
10-
#include "TPythia6.h"
1110
#include <fairlogger/Logger.h>
1211

1312
o2::eventgen::DeepTrigger
@@ -18,9 +17,6 @@ o2::eventgen::DeepTrigger
1817
if (!name.compare("pythia8")) {
1918
auto py8 = reinterpret_cast<Pythia8::Pythia*>(interface);
2019
nMPI = py8->info.nMPI();
21-
} else if (!name.compare("pythia6")) {
22-
auto py6 = reinterpret_cast<TPythia6*>(interface);
23-
nMPI = py6->GetMSTI(31);
2420
} else
2521
LOG(fatal) << "Cannot define MPI for generator interface \'" << name << "\'";
2622
return nMPI >= mpiMin;

0 commit comments

Comments
 (0)