Skip to content

Commit b1c5320

Browse files
aimeric-landouaimeric-landou
committed
mDebug now fetched from config .json
1 parent d4211f1 commit b1c5320

9 files changed

Lines changed: 116 additions & 109 deletions

‎MC/config/PWGGAJE/external/generator/parametrisedJetModel/generator_pythia8_box_parametrisedModel_pythia6Fragmentation.C‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ using namespace Pythia8;
4646
class GeneratorParametrisedJetModel : public o2::eventgen::GeneratorPythia8 {
4747
public:
4848
/// constructor
49-
GeneratorParametrisedJetModel(std::string inputSimParametersPath, std::string inputSimParametersFileName, bool generateUE = true, bool debug = false) : mInputSimParametersPath{inputSimParametersPath}, mInputSimParametersFileName{inputSimParametersFileName}, mGenerateUE{generateUE}, mDebug{debug} {
49+
GeneratorParametrisedJetModel(std::string inputSimParametersPath, std::string inputSimParametersFileName, bool generateUE = true) : mInputSimParametersPath{inputSimParametersPath}, mInputSimParametersFileName{inputSimParametersFileName}, mGenerateUE{generateUE} {
5050

5151
std::string inputFilePathName = "alien://" + inputSimParametersPath + inputSimParametersFileName;
5252
if (!gGrid) {
@@ -100,6 +100,10 @@ public:
100100

101101
// write log of simulation?
102102
std::string writeLog("simLog");
103+
if (!jsonDocument.HasMember(writeLog.c_str())) {
104+
cout << "Check the sim parameters file! Item " << writeLog.c_str() << " is missing!" << endl;
105+
exit(1);
106+
}
103107
mDebug = jsonDocument[writeLog.c_str()].GetBool();
104108

105109
// get parameters for sim
@@ -182,7 +186,7 @@ public:
182186

183187
if (mDebug) {
184188
cout << "####################### creating partons signal #######################" << endl;
185-
cout << "AIMERIC: signal, count " << nJets << " for mNJetsAverage = " << mNJetsAverage << "" << endl;
189+
cout << "signal: count " << nJets << " for mNJetsAverage = " << mNJetsAverage << "" << endl;
186190
}
187191

188192
TClonesArray *genParticlesArray = new TClonesArray("TParticle", 1000);
@@ -388,7 +392,6 @@ private:
388392
///___________________________________________________________
389393
FairGenerator *generateParametrisedJetModel(std::string inputSimParametersPath,
390394
std::string inputSimParametersFileName,
391-
bool generateUE = true,
392-
bool debug = false) {
393-
return new GeneratorParametrisedJetModel(inputSimParametersPath, inputSimParametersFileName, generateUE, debug);
395+
bool generateUE = true) {
396+
return new GeneratorParametrisedJetModel(inputSimParametersPath, inputSimParametersFileName, generateUE);
394397
}

‎MC/config/PWGGAJE/ini/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent0010_noBkg.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### bkg production using pythia8 box generator, to embed jet-jet production into
22
[GeneratorExternal]
33
fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/generator/parametrisedJetModel/generator_pythia8_box_parametrisedModel_pythia6Fragmentation.C
4-
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent0010.json", false)
4+
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent0010.json")
55

66
[GeneratorPythia8]
77
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/pythia8/generator/pythia8box_parametrisedModel.cfg

‎MC/config/PWGGAJE/ini/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent0010_withBkg.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### bkg production using pythia8 box generator, to embed jet-jet production into
22
[GeneratorExternal]
33
fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/generator/parametrisedJetModel/generator_pythia8_box_parametrisedModel_pythia6Fragmentation.C
4-
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent0010.json", true)
4+
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent0010.json")
55

66
[GeneratorPythia8]
77
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/pythia8/generator/pythia8box_parametrisedModel.cfg

‎MC/config/PWGGAJE/ini/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent5080_noBkg.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### bkg production using pythia8 box generator, to embed jet-jet production into
22
[GeneratorExternal]
33
fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/generator/parametrisedJetModel/generator_pythia8_box_parametrisedModel_pythia6Fragmentation.C
4-
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent5080.json", false)
4+
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent5080.json")
55

66
[GeneratorPythia8]
77
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/pythia8/generator/pythia8box_parametrisedModel.cfg

‎MC/config/PWGGAJE/ini/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent5080_withBkg.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### bkg production using pythia8 box generator, to embed jet-jet production into
22
[GeneratorExternal]
33
fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/generator/parametrisedJetModel/generator_pythia8_box_parametrisedModel_pythia6Fragmentation.C
4-
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent5080.json", true)
4+
funcName = generateParametrisedJetModel("/alice/cern.ch/user/a/alandou/Analysis/PWGJE/simSettings/combinatorialBkgClosure/", "parametrisedModel_PbPb_5p36TeV_cent5080.json")
55

66
[GeneratorPythia8]
77
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/pythia8/generator/pythia8box_parametrisedModel.cfg

‎MC/config/PWGGAJE/ini/tests/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent0010_noBkg.C‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
int External() {
2-
std::string path{"o2sim_Kine.root"};
2+
std::string path{"o2sim_Kine.root"};
33

4-
TFile file(path.c_str(), "READ");
5-
if (file.IsZombie()) {
6-
std::cerr << "Cannot open ROOT file " << path << "\n";
7-
return 1;
8-
}
4+
TFile file(path.c_str(), "READ");
5+
if (file.IsZombie()) {
6+
std::cerr << "Cannot open ROOT file " << path << "\n";
7+
return 1;
8+
}
99

10-
auto tree = (TTree *)file.Get("o2sim");
11-
std::vector<o2::MCTrack> *tracks{};
12-
tree->SetBranchAddress("MCTrack", &tracks);
13-
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14-
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
10+
auto tree = (TTree *)file.Get("o2sim");
11+
std::vector<o2::MCTrack> *tracks{};
12+
tree->SetBranchAddress("MCTrack", &tracks);
13+
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14+
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
1515

16-
int sumTracks{};
17-
auto nEvents = tree->GetEntries();
16+
int sumTracks{};
17+
auto nEvents = tree->GetEntries();
1818

19-
for (int i = 0; i < nEvents; i++) {
20-
tree->GetEntry(i);
21-
sumTracks += tracks->size();
22-
}
19+
for (int i = 0; i < nEvents; i++) {
20+
tree->GetEntry(i);
21+
sumTracks += tracks->size();
22+
}
2323

24-
std::cout << "--------------------------------\n";
25-
std::cout << "# Events: " << nEvents << "\n";
26-
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks << "\n";
24+
std::cout << "--------------------------------\n";
25+
std::cout << "# Events: " << nEvents << "\n";
26+
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks
27+
<< "\n";
2728

28-
if(sumTracks < 1) {
29-
std::cerr << "No tracks in simulated events\n";
30-
return 1;
31-
}
32-
return 0;
29+
if (sumTracks < 1) {
30+
std::cerr << "No tracks in simulated events\n";
31+
return 1;
32+
}
33+
return 0;
3334
}

‎MC/config/PWGGAJE/ini/tests/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent0010_withBkg.C‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
int External() {
2-
std::string path{"o2sim_Kine.root"};
2+
std::string path{"o2sim_Kine.root"};
33

4-
TFile file(path.c_str(), "READ");
5-
if (file.IsZombie()) {
6-
std::cerr << "Cannot open ROOT file " << path << "\n";
7-
return 1;
8-
}
4+
TFile file(path.c_str(), "READ");
5+
if (file.IsZombie()) {
6+
std::cerr << "Cannot open ROOT file " << path << "\n";
7+
return 1;
8+
}
99

10-
auto tree = (TTree *)file.Get("o2sim");
11-
std::vector<o2::MCTrack> *tracks{};
12-
tree->SetBranchAddress("MCTrack", &tracks);
13-
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14-
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
10+
auto tree = (TTree *)file.Get("o2sim");
11+
std::vector<o2::MCTrack> *tracks{};
12+
tree->SetBranchAddress("MCTrack", &tracks);
13+
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14+
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
1515

16-
int sumTracks{};
17-
auto nEvents = tree->GetEntries();
16+
int sumTracks{};
17+
auto nEvents = tree->GetEntries();
1818

19-
for (int i = 0; i < nEvents; i++) {
20-
tree->GetEntry(i);
21-
sumTracks += tracks->size();
22-
}
19+
for (int i = 0; i < nEvents; i++) {
20+
tree->GetEntry(i);
21+
sumTracks += tracks->size();
22+
}
2323

24-
std::cout << "--------------------------------\n";
25-
std::cout << "# Events: " << nEvents << "\n";
26-
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks << "\n";
24+
std::cout << "--------------------------------\n";
25+
std::cout << "# Events: " << nEvents << "\n";
26+
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks
27+
<< "\n";
2728

28-
if(sumTracks < 1) {
29-
std::cerr << "No tracks in simulated events\n";
30-
return 1;
31-
}
32-
return 0;
29+
if (sumTracks < 1) {
30+
std::cerr << "No tracks in simulated events\n";
31+
return 1;
32+
}
33+
return 0;
3334
}

‎MC/config/PWGGAJE/ini/tests/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent5080_noBkg.C‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
int External() {
2-
std::string path{"o2sim_Kine.root"};
2+
std::string path{"o2sim_Kine.root"};
33

4-
TFile file(path.c_str(), "READ");
5-
if (file.IsZombie()) {
6-
std::cerr << "Cannot open ROOT file " << path << "\n";
7-
return 1;
8-
}
4+
TFile file(path.c_str(), "READ");
5+
if (file.IsZombie()) {
6+
std::cerr << "Cannot open ROOT file " << path << "\n";
7+
return 1;
8+
}
99

10-
auto tree = (TTree *)file.Get("o2sim");
11-
std::vector<o2::MCTrack> *tracks{};
12-
tree->SetBranchAddress("MCTrack", &tracks);
13-
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14-
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
10+
auto tree = (TTree *)file.Get("o2sim");
11+
std::vector<o2::MCTrack> *tracks{};
12+
tree->SetBranchAddress("MCTrack", &tracks);
13+
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14+
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
1515

16-
int sumTracks{};
17-
auto nEvents = tree->GetEntries();
16+
int sumTracks{};
17+
auto nEvents = tree->GetEntries();
1818

19-
for (int i = 0; i < nEvents; i++) {
20-
tree->GetEntry(i);
21-
sumTracks += tracks->size();
22-
}
19+
for (int i = 0; i < nEvents; i++) {
20+
tree->GetEntry(i);
21+
sumTracks += tracks->size();
22+
}
2323

24-
std::cout << "--------------------------------\n";
25-
std::cout << "# Events: " << nEvents << "\n";
26-
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks << "\n";
24+
std::cout << "--------------------------------\n";
25+
std::cout << "# Events: " << nEvents << "\n";
26+
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks
27+
<< "\n";
2728

28-
if(sumTracks < 1) {
29-
std::cerr << "No tracks in simulated events\n";
30-
return 1;
31-
}
32-
return 0;
29+
if (sumTracks < 1) {
30+
std::cerr << "No tracks in simulated events\n";
31+
return 1;
32+
}
33+
return 0;
3334
}

‎MC/config/PWGGAJE/ini/tests/GeneratorPythia8Box_parametrisedModel_pythia6Fragmentation_PbPb_cent5080_withBkg.C‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
int External() {
2-
std::string path{"o2sim_Kine.root"};
2+
std::string path{"o2sim_Kine.root"};
33

4-
TFile file(path.c_str(), "READ");
5-
if (file.IsZombie()) {
6-
std::cerr << "Cannot open ROOT file " << path << "\n";
7-
return 1;
8-
}
4+
TFile file(path.c_str(), "READ");
5+
if (file.IsZombie()) {
6+
std::cerr << "Cannot open ROOT file " << path << "\n";
7+
return 1;
8+
}
99

10-
auto tree = (TTree *)file.Get("o2sim");
11-
std::vector<o2::MCTrack> *tracks{};
12-
tree->SetBranchAddress("MCTrack", &tracks);
13-
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14-
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
10+
auto tree = (TTree *)file.Get("o2sim");
11+
std::vector<o2::MCTrack> *tracks{};
12+
tree->SetBranchAddress("MCTrack", &tracks);
13+
o2::dataformats::MCEventHeader *eventHeader = nullptr;
14+
tree->SetBranchAddress("MCEventHeader.", &eventHeader);
1515

16-
int sumTracks{};
17-
auto nEvents = tree->GetEntries();
16+
int sumTracks{};
17+
auto nEvents = tree->GetEntries();
1818

19-
for (int i = 0; i < nEvents; i++) {
20-
tree->GetEntry(i);
21-
sumTracks += tracks->size();
22-
}
19+
for (int i = 0; i < nEvents; i++) {
20+
tree->GetEntry(i);
21+
sumTracks += tracks->size();
22+
}
2323

24-
std::cout << "--------------------------------\n";
25-
std::cout << "# Events: " << nEvents << "\n";
26-
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks << "\n";
24+
std::cout << "--------------------------------\n";
25+
std::cout << "# Events: " << nEvents << "\n";
26+
std::cout << "# tracks summed over all events (jet-jet + MB): " << sumTracks
27+
<< "\n";
2728

28-
if(sumTracks < 1) {
29-
std::cerr << "No tracks in simulated events\n";
30-
return 1;
31-
}
32-
return 0;
29+
if (sumTracks < 1) {
30+
std::cerr << "No tracks in simulated events\n";
31+
return 1;
32+
}
33+
return 0;
3334
}

0 commit comments

Comments
 (0)