Skip to content

Commit 66b724f

Browse files
jackal1-66jackal1-66
committed
Replaced O2DPG_ROOT with O2DPG_MC_CONFIG_ROOT in remaining config files
1 parent e09b9ba commit 66b724f

37 files changed

+110
-110
lines changed

‎MC/config/ALICE3/pythia8/generator_pythia8_gun_PbPb.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public:
113113
cout << "Initalizing extra PYTHIA object " << endl;
114114

115115
// Read settings from external file.
116-
std::string O2DPG_ROOT(getenv("O2DPG_ROOT"));
116+
std::string O2DPG_ROOT(getenv("O2DPG_MC_CONFIG_ROOT"));
117117
std::string infile = O2DPG_ROOT + "/MC/config/ALICE3/pythia8/generator/pythia8_hi.cmnd";
118118
pythiaObject.readFile(infile);
119119

‎MC/config/ALICE3/pythia8/generator_pythia8_gun_pp.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public:
115115
cout << "Initalizing extra PYTHIA object " << endl;
116116

117117
// Read settings from external file.
118-
std::string O2DPG_ROOT(getenv("O2DPG_ROOT"));
118+
std::string O2DPG_ROOT(getenv("O2DPG_MC_CONFIG_ROOT"));
119119
std::string infile = O2DPG_ROOT + "/MC/config/ALICE3/pythia8/generator/pythia8_pp.cmnd";
120120
pythiaObject.readFile(infile);
121121

‎MC/config/PWGDQ/EvtGen/GeneratorEvtGen.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ class GeneratorEvtGen : public T
264264
// different decay table. case kAll read the default decay table only
265265
//
266266
DecayModeEvt decay = mDecayMode;
267-
TString pathO2 = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
267+
TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
268268
switch (decay) {
269269
case kEvtAll: // particles decayed "naturally" according to $ALICE_ROOT/TEvtGen/EvtGen/DECAY.DEC
270270
break;

‎MC/config/PWGDQ/external/generator/GeneratorBeautyToJpsi_EvtGen.C‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini
55
//
66
//
7-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
8-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
7+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen)
8+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator)
99
#include "GeneratorEvtGen.C"
1010
#include "GeneratorHF.C"
1111

@@ -15,7 +15,7 @@ FairGenerator*
1515
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
1616
gen->setRapidity(rapidityMin, rapidityMax);
1717
gen->setPDG(5);
18-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
18+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
1919
gen->readFile(pathO2table.Data());
2020

2121
gen->setVerbose(verbose);
@@ -53,7 +53,7 @@ FairGenerator*
5353
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
5454
gen->setRapidity(rapidityMin, rapidityMax);
5555
gen->setPDG(5);
56-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
56+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
5757
gen->readFile(pathO2table.Data());
5858

5959
gen->setVerbose(verbose);

‎MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
//o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini
55
//
66
//
7-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
8-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
7+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen)
8+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator)
99
#include "GeneratorEvtGen.C"
1010
#include "GeneratorHF.C"
1111

@@ -16,7 +16,7 @@ GeneratorBeautyToMu_EvtGenFwdY(double rapidityMin = -4.3, double rapidityMax = -
1616
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
1717
gen->setRapidity(rapidityMin,rapidityMax);
1818
gen->setPDG(5);
19-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
19+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
2020
gen->readFile(pathO2table.Data());
2121

2222
gen->setVerbose(verbose);

‎MC/config/PWGDQ/external/generator/GeneratorBeautyToPsiAndJpsi_EvtGen.C‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_PsiAndJpsi_fwdy.ini
55
//
66
//
7-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
8-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
7+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen)
8+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator)
99
#include "GeneratorEvtGen.C"
1010
#include "GeneratorHF.C"
1111

@@ -15,7 +15,7 @@ FairGenerator*
1515
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
1616
gen->setRapidity(rapidityMin, rapidityMax);
1717
gen->setPDG(5);
18-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
18+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
1919
gen->readFile(pathO2table.Data());
2020

2121
gen->setVerbose(verbose);
@@ -53,7 +53,7 @@ FairGenerator*
5353
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
5454
gen->setRapidity(rapidityMin, rapidityMax);
5555
gen->setPDG(5);
56-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
56+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
5757
gen->readFile(pathO2table.Data());
5858

5959
gen->setVerbose(verbose);

‎MC/config/PWGDQ/external/generator/GeneratorBeautyToPsi_EvtGen.C‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_Psi2S_midy.ini
55
//
66
//
7-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
8-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
7+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen)
8+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator)
99
#include "GeneratorEvtGen.C"
1010
#include "GeneratorHF.C"
1111

@@ -15,7 +15,7 @@ FairGenerator*
1515
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
1616
gen->setRapidity(rapidityMin, rapidityMax);
1717
gen->setPDG(5);
18-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
18+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
1919
gen->readFile(pathO2table.Data());
2020

2121
gen->setVerbose(verbose);
@@ -51,7 +51,7 @@ FairGenerator*
5151
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
5252
gen->setRapidity(rapidityMin, rapidityMax);
5353
gen->setPDG(5);
54-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
54+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
5555
gen->readFile(pathO2table.Data());
5656

5757
gen->setVerbose(verbose);

‎MC/config/PWGDQ/external/generator/GeneratorBottomonia.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// generators for bottomonia considering at midrapidity and forward rapidity
33
//
44

5-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
5+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen)
66
R__LOAD_LIBRARY(libpythia6)
77
#include "GeneratorCocktail.C"
88
#include "GeneratorEvtGen.C"

‎MC/config/PWGDQ/external/generator/GeneratorBplusToJpsiKaon_EvtGen.C‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// o2-sim -j 1 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configKeyValues "GeneratorExternal.fileName=GeneratorBplusToJpsiKaon_EvtGen.C;GeneratorExternal.funcName=GeneratorBplusToJpsiKaon_EvtGen()" --configFile GeneratorHF_bbbarToBplus_midy.ini
22
//
33
//
4-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
5-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
4+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen)
5+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator)
66
#include "GeneratorEvtGen.C"
77
#include "GeneratorHF.C"
88

@@ -12,7 +12,7 @@ FairGenerator*
1212
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
1313
gen->setRapidity(rapidityMin, rapidityMax);
1414
gen->setPDG(5);
15-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBplus.cfg");
15+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBplus.cfg");
1616
gen->readFile(pathO2table.Data());
1717

1818
gen->setVerbose(verbose);
@@ -29,7 +29,7 @@ FairGenerator*
2929
printf("PDG %d \n", std::stoi(spdg));
3030
}
3131

32-
TString pathO2 = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
32+
TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
3333
gen->SetDecayTable(Form("%s/BPLUSTOKAONJPSITOELE.DEC", pathO2.Data()));
3434
// print debug
3535
// gen->PrintDebug();

‎MC/config/PWGDQ/external/generator/GeneratorCharmToMu_EvtGen.C‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
//o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini
55
//
66
//
7-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
8-
R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
7+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen)
8+
R__ADD_INCLUDE_PATH(${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator)
99
#include "GeneratorEvtGen.C"
1010
#include "GeneratorHF.C"
1111

@@ -16,7 +16,7 @@ GeneratorCharmToMu_EvtGenFwdY(double rapidityMin = -4.3, double rapidityMax = -2
1616
auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
1717
gen->setRapidity(rapidityMin,rapidityMax);
1818
gen->setPDG(4);
19-
TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
19+
TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
2020
gen->readFile(pathO2table.Data());
2121

2222
gen->setVerbose(verbose);

0 commit comments

Comments
 (0)