Skip to content
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

[14_1_X] Fix memory leak in GenParticles2HepMCConverter #46254

Merged
merged 2 commits into from
Nov 12, 2024
Merged

[14_1_X] Fix memory leak in GenParticles2HepMCConverter #46254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3311e12
Change pointer to stack var to avoid memory leak.
hqucms Oct 2, 2024
59538a3
Use const pointer.
hqucms Oct 14, 2024
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
43 changes: 21 additions & 22 deletions GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,26 +89,26 @@ void GenParticles2HepMCConverter::produce(edm::Event& event, const edm::EventSet

auto const& pTableData = eventSetup.getData(pTable_);

HepMC3::GenEvent* hepmc_event = new HepMC3::GenEvent();
hepmc_event->set_event_number(event.id().event());
hepmc_event->add_attribute("signal_process_id",
std::make_shared<HepMC3::IntAttribute>(genEventInfoHandle->signalProcessID()));
hepmc_event->add_attribute("event_scale", std::make_shared<HepMC3::DoubleAttribute>(genEventInfoHandle->qScale()));
hepmc_event->add_attribute("alphaQCD", std::make_shared<HepMC3::DoubleAttribute>(genEventInfoHandle->alphaQCD()));
hepmc_event->add_attribute("alphaQED", std::make_shared<HepMC3::DoubleAttribute>(genEventInfoHandle->alphaQED()));

hepmc_event->weights() = genEventInfoHandle->weights();
HepMC3::GenEvent hepmc_event;
hepmc_event.set_event_number(event.id().event());
hepmc_event.add_attribute("signal_process_id",
std::make_shared<HepMC3::IntAttribute>(genEventInfoHandle->signalProcessID()));
hepmc_event.add_attribute("event_scale", std::make_shared<HepMC3::DoubleAttribute>(genEventInfoHandle->qScale()));
hepmc_event.add_attribute("alphaQCD", std::make_shared<HepMC3::DoubleAttribute>(genEventInfoHandle->alphaQCD()));
hepmc_event.add_attribute("alphaQED", std::make_shared<HepMC3::DoubleAttribute>(genEventInfoHandle->alphaQED()));

hepmc_event.weights() = genEventInfoHandle->weights();
// add dummy weight if necessary
if (hepmc_event->weights().size() == 0) {
hepmc_event->weights().push_back(1.);
if (hepmc_event.weights().size() == 0) {
hepmc_event.weights().push_back(1.);
}

// resize cross section to number of weights
if (xsec_->xsecs().size() < hepmc_event->weights().size()) {
xsec_->set_cross_section(std::vector<double>(hepmc_event->weights().size(), xsec_->xsec(0)),
std::vector<double>(hepmc_event->weights().size(), xsec_->xsec_err(0)));
if (xsec_->xsecs().size() < hepmc_event.weights().size()) {
xsec_->set_cross_section(std::vector<double>(hepmc_event.weights().size(), xsec_->xsec(0)),
std::vector<double>(hepmc_event.weights().size(), xsec_->xsec_err(0)));
}
hepmc_event->set_cross_section(xsec_);
hepmc_event.set_cross_section(xsec_);

// Set PDF
const gen::PdfInfo* pdf = genEventInfoHandle->pdf();
Expand All @@ -119,7 +119,7 @@ void GenParticles2HepMCConverter::produce(edm::Event& event, const edm::EventSet
const double pdf_xPDF1 = pdf->xPDF.first, pdf_xPDF2 = pdf->xPDF.second;
HepMC3::GenPdfInfoPtr hepmc_pdfInfo = make_shared<HepMC3::GenPdfInfo>();
hepmc_pdfInfo->set(pdf_id1, pdf_id2, pdf_x1, pdf_x2, pdf_scalePDF, pdf_xPDF1, pdf_xPDF2);
hepmc_event->set_pdf_info(hepmc_pdfInfo);
hepmc_event.set_pdf_info(hepmc_pdfInfo);
}

// Prepare list of HepMC3::GenParticles
Expand Down Expand Up @@ -172,11 +172,11 @@ void GenParticles2HepMCConverter::produce(edm::Event& event, const edm::EventSet
vertex1 = make_shared<HepMC3::GenVertex>(FourVector(parton1->vertex()));
vertex2 = make_shared<HepMC3::GenVertex>(FourVector(parton2->vertex()));
}
hepmc_event->add_vertex(vertex1);
hepmc_event->add_vertex(vertex2);
hepmc_event.add_vertex(vertex1);
hepmc_event.add_vertex(vertex2);
vertex1->add_particle_in(hepmc_parton1);
vertex2->add_particle_in(hepmc_parton2);
//hepmc_event->set_beam_particles(hepmc_parton1, hepmc_parton2);
//hepmc_event.set_beam_particles(hepmc_parton1, hepmc_parton2);

// Prepare vertex list
typedef std::map<const reco::Candidate*, HepMC3::GenVertexPtr> ParticleToVertexMap;
Expand All @@ -195,7 +195,7 @@ void GenParticles2HepMCConverter::produce(edm::Event& event, const edm::EventSet
HepMC3::GenVertexPtr vertex;
if (particleToVertexMap.find(elder) == particleToVertexMap.end()) {
vertex = make_shared<HepMC3::GenVertex>(FourVector(elder->vertex()));
hepmc_event->add_vertex(vertex);
hepmc_event.add_vertex(vertex);
particleToVertexMap[elder] = vertex;
} else {
vertex = particleToVertexMap[elder];
Expand All @@ -209,8 +209,7 @@ void GenParticles2HepMCConverter::produce(edm::Event& event, const edm::EventSet
}

// Finalize HepMC event record
std::unique_ptr<edm::HepMC3Product> hepmc_product(new edm::HepMC3Product());
hepmc_product->addHepMCData(hepmc_event);
antoniovilela marked this conversation as resolved.
Show resolved Hide resolved
auto hepmc_product = std::make_unique<edm::HepMC3Product>(&hepmc_event);
event.put(std::move(hepmc_product), "unsmeared");
}

Expand Down
4 changes: 2 additions & 2 deletions SimDataFormats/GeneratorProducts/interface/HepMC3Product.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ namespace edm {
public:
HepMC3Product() : isVtxGenApplied_(false), isVtxBoostApplied_(false), isPBoostApplied_(false) {}

explicit HepMC3Product(HepMC3::GenEvent *evt);
explicit HepMC3Product(const HepMC3::GenEvent *evt);
~HepMC3Product();

void addHepMCData(HepMC3::GenEvent *evt);
void addHepMCData(const HepMC3::GenEvent *evt);

void applyVtxGen(HepMC3::FourVector const *vtxShift) { applyVtxGen(*vtxShift); }
void applyVtxGen(HepMC3::FourVector const &vtxShift);
Expand Down
4 changes: 2 additions & 2 deletions SimDataFormats/GeneratorProducts/src/HepMC3Product.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
using namespace edm;
using namespace std;

HepMC3Product::HepMC3Product(HepMC3::GenEvent* evt)
HepMC3Product::HepMC3Product(const HepMC3::GenEvent* evt)
: isVtxGenApplied_(false), isVtxBoostApplied_(false), isPBoostApplied_(false) {
addHepMCData(evt);
}

HepMC3Product::~HepMC3Product() = default;

void HepMC3Product::addHepMCData(HepMC3::GenEvent* evt) { evt->write_data(evt_); }
void HepMC3Product::addHepMCData(const HepMC3::GenEvent* evt) { evt->write_data(evt_); }

void HepMC3Product::applyVtxGen(HepMC3::FourVector const& vtxShift) {
//std::cout<< " applyVtxGen called " << isVtxGenApplied_ << endl;
Expand Down