Skip to content

Commit

Permalink
Merge pull request #11 from alibuild/alibot-cleanup-13838
Browse files Browse the repository at this point in the history
Please consider the following formatting changes to AliceO2Group#13838
  • Loading branch information
jackal1-66 authored Jan 7, 2025
2 parents 94cfe33 + 3cdd806 commit 15256c6
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion Generators/src/GeneratorHybrid.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Bool_t GeneratorHybrid::parseJSON(const std::string& path)
if (gen.HasMember("cocktail")) {
mCocktailMode = true;
for (const auto& subgen : gen["cocktail"].GetArray()) {
if(confSetter(subgen)) {
if (confSetter(subgen)) {
mGroups.back().push_back(mInputGens.size() - 1);
} else {
return false;
Expand Down
84 changes: 42 additions & 42 deletions run/SimExamples/Hybrid_cocktail/hybridcocktail.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
{
"generators": [
{
"cocktail": [
{
"name": "pythia8",
"config": {
"config": "$O2_ROOT/share/Generators/egconfig/pythia8_inel.cfg",
"hooksFileName": "",
"hooksFuncName": "",
"includePartonEvent": false,
"particleFilter": "",
"verbose": 0
}
},
{
"name": "external",
"config": {
"fileName": "${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C",
"funcName": "GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()",
"iniFile": ""
}
{
"cocktail": [
{
"name": "pythia8",
"config": {
"config": "$O2_ROOT/share/Generators/egconfig/pythia8_inel.cfg",
"hooksFileName": "",
"hooksFuncName": "",
"includePartonEvent": false,
"particleFilter": "",
"verbose": 0
}
]
},
{
"cocktail": [
{
"name": "pythia8pp"
},
{
"name": "extkinO2",
"config": {
"skipNonTrackable": true,
"continueMode": false,
"roundRobin": false,
"randomize": false,
"rngseed": 0,
"randomphi": false,
"fileName": "${PWD}/evtpool.root"
}
},
{
"name": "external",
"config": {
"fileName": "${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C",
"funcName": "GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()",
"iniFile": ""
}
]
},
{
}
]
},
{
"cocktail": [
{
"name": "pythia8pp"
},
{
"name": "extkinO2",
"config": {
"skipNonTrackable": true,
"continueMode": false,
"roundRobin": false,
"randomize": false,
"rngseed": 0,
"randomphi": false,
"fileName": "${PWD}/evtpool.root"
}
}
]
},
{
"name": "pythia8hf",
"config": ""
}
}
],
"fractions": [
1,
Expand Down

0 comments on commit 15256c6

Please sign in to comment.