Skip to content

Revert "Default TPC loopers in o2-sim" #14940

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
sawenzel merged 10 commits into from
Jan 5, 2026
Merged

Revert "Default TPC loopers in o2-sim" #14940

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc556c5
Revert "Corrected include folder"
sawenzel Jan 5, 2026
f2335b6
Revert "Add copyright headers"
sawenzel Jan 5, 2026
c4af753
Revert "Please consider the following formatting changes"
sawenzel Jan 5, 2026
b2a1500
Revert "Improved logging + colsys check"
sawenzel Jan 5, 2026
ef670c8
Revert "Fixed bug + cleaned code"
sawenzel Jan 5, 2026
f4ed2f7
Revert "Set automatic interaction rate from collision context"
sawenzel Jan 5, 2026
82fefbf
Revert "Implemented rate and collision system dependence (default)"
sawenzel Jan 5, 2026
367fd4a
Revert "Vetoing loopers for FlatGas and \!collisioncontext"
sawenzel Jan 5, 2026
acb3aed
Revert "Various improvements"
sawenzel Jan 5, 2026
12377ec
Revert "First implementation of loopers inclusion in base Generator c…
sawenzel Jan 5, 2026
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
Prev Previous commit
Next Next commit
Revert "Vetoing loopers for FlatGas and \!collisioncontext" 
This reverts commit 8f8606a.
  • Loading branch information
@sawenzel
sawenzel authored Jan 5, 2026
commit 367fd4a02607ace0516a03dcfb3a8d0cd2720c56
2 changes: 1 addition & 1 deletion Generators/include/Generators/Generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class Generator : public FairGenerator
#ifdef GENERATORS_WITH_TPCLOOPERS
// Loopers generator instance
std::unique_ptr<o2::eventgen::GenTPCLoopers> mLoopersGen = nullptr;
bool initLoopersGen();
void initLoopersGen();
#endif

ClassDefOverride(Generator, 2);
Expand Down
21 changes: 5 additions & 16 deletions Generators/src/Generator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ Generator::Generator() : FairGenerator("ALICEo2", "ALICEo2 Generator"),
if (transport) {
bool tpcActive = (std::find(simConfig.getReadoutDetectors().begin(), simConfig.getReadoutDetectors().end(), "TPC") != simConfig.getReadoutDetectors().end());
if (tpcActive) {
if(initLoopersGen()){
mAddTPCLoopers = kTRUE;
}
mAddTPCLoopers = kTRUE;
initLoopersGen();
}
}
}
Expand All @@ -75,9 +74,8 @@ Generator::Generator(const Char_t* name, const Char_t* title) : FairGenerator(na
if (transport) {
bool tpcActive = (std::find(simConfig.getReadoutDetectors().begin(), simConfig.getReadoutDetectors().end(), "TPC") != simConfig.getReadoutDetectors().end());
if (tpcActive) {
if (initLoopersGen()) {
mAddTPCLoopers = kTRUE;
}
mAddTPCLoopers = kTRUE;
initLoopersGen();
}
}
}
Expand All @@ -86,7 +84,7 @@ Generator::Generator(const Char_t* name, const Char_t* title) : FairGenerator(na

/*****************************************************************/
#ifdef GENERATORS_WITH_TPCLOOPERS
bool Generator::initLoopersGen()
void Generator::initLoopersGen()
{
// Expand all environment paths
const auto& loopersParam = o2::eventgen::GenTPCLoopersParam::Instance();
Expand All @@ -97,14 +95,6 @@ bool Generator::initLoopersGen()
const auto& poisson = gSystem->ExpandPathName(loopersParam.poisson.c_str());
const auto& gauss = gSystem->ExpandPathName(loopersParam.gauss.c_str());
auto flat_gas = loopersParam.flat_gas;
if (flat_gas) {
bool isContext = std::filesystem::exists("collisioncontext.root");
if (!isContext) {
LOG(warning) << "Warning: No collisioncontext.root file found!";
LOG(warning) << "Loopers will be kept OFF.";
return kFALSE;
}
}
const auto& nFlatGasLoopers = loopersParam.nFlatGasLoopers;
auto fraction_pairs = loopersParam.fraction_pairs;
std::array<float, 2> multiplier = {loopersParam.multiplier[0], loopersParam.multiplier[1]};
Expand Down Expand Up @@ -173,7 +163,6 @@ bool Generator::initLoopersGen()
LOG(error) << "Failed to initialize TPC Loopers generator: " << e.what();
mLoopersGen.reset();
}
return kTRUE;
}
#endif

Expand Down