Skip to content

Please consider the following formatting changes to #13873 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackal1-66 merged 1 commit into from
Jan 17, 2025
+7 −7
Merged

Please consider the following formatting changes to #13873 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Generators/include/Generators/GeneratorHybrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ class GeneratorHybrid : public Generator
std::vector<std::vector<int>> mGroups;

// Trigger configuration
std::vector<ETriggerMode_t> mTriggerModes; // trigger mode for each generator
std::vector<ETriggerMode_t> mTriggerModes; // trigger mode for each generator
std::vector<std::vector<std::string>> mTriggerMacros; // trigger macros for each generator (multiple triggers for each generator possible)
std::vector<std::vector<std::string>> mTriggerFuncs; // trigger functions for each generator (multiple triggers for each generator possible)
std::vector<std::vector<std::string>> mTriggerFuncs; // trigger functions for each generator (multiple triggers for each generator possible)

// Create a task arena with a specified number of threads
std::thread mTBBTaskPoolRunner;
Expand Down
2 changes: 1 addition & 1 deletion Generators/src/GeneratorFactory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ void GeneratorFactory::setPrimaryGenerator(o2::conf::SimConfig const& conf, Fair

Trigger trigger = nullptr;
DeepTrigger deeptrigger = nullptr;
if(!genconfig.compare("hybrid") == 0){
if (!genconfig.compare("hybrid") == 0) {
auto trgconfig = conf.getTrigger();
if (trgconfig.empty()) {
return;
Expand Down
8 changes: 4 additions & 4 deletions Generators/src/GeneratorHybrid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Bool_t GeneratorHybrid::Init()
// }
}
bool isTriggered = false;
while(!isTriggered) {
while (!isTriggered) {
generator->clearParticles();
generator->generateEvent();
generator->importParticles();
Expand Down Expand Up @@ -490,9 +490,9 @@ Bool_t GeneratorHybrid::confSetter(const auto& gen)
auto trigger_specs = [this, &trigger]() {
mTriggerMacros.push_back({});
mTriggerFuncs.push_back({});
if(trigger.HasMember("specs")) {
for(auto& spec : trigger["specs"].GetArray()) {
if(spec.HasMember("macro")){
if (trigger.HasMember("specs")) {
for (auto& spec : trigger["specs"].GetArray()) {
if (spec.HasMember("macro")) {
const auto& macro = spec["macro"].GetString();
if (!strcmp(macro, "") == 0) {
mTriggerMacros.back().push_back(macro);
Expand Down
Loading