Skip to content

Fix and improve TPC Loopers implementation #15013

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

Open
jackal1-66 wants to merge 1 commit into
base: dev
Choose a base branch
from
+26 −11
Open

Fix and improve TPC Loopers implementation #15013

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
12 changes: 5 additions & 7 deletions Generators/include/Generators/Generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#include "FairGenerator.h"
#include "TParticle.h"
#include "Generators/Trigger.h"
#ifdef GENERATORS_WITH_TPCLOOPERS
#include "Generators/TPCLoopers.h"
#include "Generators/TPCLoopersParam.h"
#endif
#include <functional>
#include <vector>
#include <unordered_map>
Expand All @@ -38,6 +34,8 @@ namespace o2
namespace eventgen
{

class GenTPCLoopers; // Forward declaration

/*****************************************************************/
/*****************************************************************/

Expand All @@ -60,7 +58,7 @@ class Generator : public FairGenerator
/** constructor **/
Generator(const Char_t* name, const Char_t* title = "ALICEo2 Generator");
/** destructor **/
~Generator() override = default;
~Generator() override;

/** Initialize the generator if needed **/
Bool_t Init() override;
Expand Down Expand Up @@ -169,9 +167,9 @@ class Generator : public FairGenerator
// global static information about (upper limit of) number of events to be generated
static unsigned int gTotalNEvents;

#ifdef GENERATORS_WITH_TPCLOOPERS
// Loopers generator instance
std::unique_ptr<o2::eventgen::GenTPCLoopers> mTPCLoopersGen = nullptr;
o2::eventgen::GenTPCLoopers* mTPCLoopersGen = nullptr;
#ifdef GENERATORS_WITH_TPCLOOPERS
bool initTPCLoopersGen();
#endif

Expand Down
2 changes: 0 additions & 2 deletions Generators/include/Generators/TPCLoopers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@

#ifdef GENERATORS_WITH_TPCLOOPERS
#include <onnxruntime_cxx_api.h>
#endif
#include <vector>
#include <rapidjson/document.h>
#include "TRandom3.h"
#include <SimulationDataFormat/DigitizationContext.h>
#include "TParticle.h"

#ifdef GENERATORS_WITH_TPCLOOPERS
// Static Ort::Env instance for multiple onnx model loading
extern Ort::Env global_env;

Expand Down
23 changes: 21 additions & 2 deletions Generators/src/Generator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
#include "TGrid.h"
#include "CCDB/BasicCCDBManager.h"
#include <filesystem>
#ifdef GENERATORS_WITH_TPCLOOPERS
#include "Generators/TPCLoopers.h"
#include "Generators/TPCLoopersParam.h"
#endif

namespace o2
{
Expand Down Expand Up @@ -94,6 +98,19 @@ Generator::Generator(const Char_t* name, const Char_t* title) : FairGenerator(na
#endif
}

/*****************************************************************/

Generator::~Generator()
{
/** destructor **/
#ifdef GENERATORS_WITH_TPCLOOPERS
if (mTPCLoopersGen) {
delete mTPCLoopersGen;
mTPCLoopersGen = nullptr;
}
#endif
}

/*****************************************************************/
#ifdef GENERATORS_WITH_TPCLOOPERS
bool Generator::initTPCLoopersGen()
Expand Down Expand Up @@ -171,7 +188,7 @@ bool Generator::initTPCLoopersGen()
nclxrate = isAlien[2] || isCCDB[2] ? local_names[2] : nclxrate;
try {
// Create the TPC loopers generator with the provided parameters
mTPCLoopersGen = std::make_unique<o2::eventgen::GenTPCLoopers>(model_pairs, model_compton, poisson, gauss, scaler_pair, scaler_compton);
mTPCLoopersGen = new o2::eventgen::GenTPCLoopers(model_pairs, model_compton, poisson, gauss, scaler_pair, scaler_compton);
const auto& intrate = loopersParam.intrate;
// Configure the generator with flat gas loopers defined per orbit with clusters/track info
// If intrate is negative (default), automatic IR from collisioncontext.root will be used
Expand All @@ -188,7 +205,9 @@ bool Generator::initTPCLoopersGen()
LOG(info) << "TPC Loopers generator initialized successfully";
} catch (const std::exception& e) {
LOG(error) << "Failed to initialize TPC Loopers generator: " << e.what();
mTPCLoopersGen.reset();
delete mTPCLoopersGen;
mTPCLoopersGen = nullptr;
return kFALSE;
}
return kTRUE;
}
Expand Down