Skip to content

Commit 15256c6

Browse files
authored
Merge pull request #11 from alibuild/alibot-cleanup-13838
Please consider the following formatting changes to #13838
2 parents 94cfe33 + 3cdd806 commit 15256c6

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

Generators/src/GeneratorHybrid.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ Bool_t GeneratorHybrid::parseJSON(const std::string& path)
494494
if (gen.HasMember("cocktail")) {
495495
mCocktailMode = true;
496496
for (const auto& subgen : gen["cocktail"].GetArray()) {
497-
if(confSetter(subgen)) {
497+
if (confSetter(subgen)) {
498498
mGroups.back().push_back(mInputGens.size() - 1);
499499
} else {
500500
return false;

run/SimExamples/Hybrid_cocktail/hybridcocktail.json

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
{
22
"generators": [
3-
{
4-
"cocktail": [
5-
{
6-
"name": "pythia8",
7-
"config": {
8-
"config": "$O2_ROOT/share/Generators/egconfig/pythia8_inel.cfg",
9-
"hooksFileName": "",
10-
"hooksFuncName": "",
11-
"includePartonEvent": false,
12-
"particleFilter": "",
13-
"verbose": 0
14-
}
15-
},
16-
{
17-
"name": "external",
18-
"config": {
19-
"fileName": "${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C",
20-
"funcName": "GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()",
21-
"iniFile": ""
22-
}
3+
{
4+
"cocktail": [
5+
{
6+
"name": "pythia8",
7+
"config": {
8+
"config": "$O2_ROOT/share/Generators/egconfig/pythia8_inel.cfg",
9+
"hooksFileName": "",
10+
"hooksFuncName": "",
11+
"includePartonEvent": false,
12+
"particleFilter": "",
13+
"verbose": 0
2314
}
24-
]
25-
},
26-
{
27-
"cocktail": [
28-
{
29-
"name": "pythia8pp"
30-
},
31-
{
32-
"name": "extkinO2",
33-
"config": {
34-
"skipNonTrackable": true,
35-
"continueMode": false,
36-
"roundRobin": false,
37-
"randomize": false,
38-
"rngseed": 0,
39-
"randomphi": false,
40-
"fileName": "${PWD}/evtpool.root"
41-
}
15+
},
16+
{
17+
"name": "external",
18+
"config": {
19+
"fileName": "${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C",
20+
"funcName": "GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()",
21+
"iniFile": ""
4222
}
43-
]
44-
},
45-
{
23+
}
24+
]
25+
},
26+
{
27+
"cocktail": [
28+
{
29+
"name": "pythia8pp"
30+
},
31+
{
32+
"name": "extkinO2",
33+
"config": {
34+
"skipNonTrackable": true,
35+
"continueMode": false,
36+
"roundRobin": false,
37+
"randomize": false,
38+
"rngseed": 0,
39+
"randomphi": false,
40+
"fileName": "${PWD}/evtpool.root"
41+
}
42+
}
43+
]
44+
},
45+
{
4646
"name": "pythia8hf",
4747
"config": ""
48-
}
48+
}
4949
],
5050
"fractions": [
5151
1,

0 commit comments

Comments
 (0)