Skip to content

Fix memory leak in TRestDetectorHitsEvent destructor #124

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
cmargalejo merged 3 commits into from
Jul 24, 2026
Merged

Fix memory leak in TRestDetectorHitsEvent destructor #124

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88d2459
Fix memory leak in TRestDetectorHitsEvent destructor
cmargalejo Apr 16, 2026
195c67d
Merge branch 'master' into cris-fix-hitsEvent-memory-leak
cmargalejo Jul 21, 2026
8d96e7e
Fix TRestDetectorHitsEvent auxiliary object ownership
Vindaar Jul 22, 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
37 changes: 36 additions & 1 deletion src/TRestDetectorHitsEvent.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,24 @@ TRestDetectorHitsEvent::TRestDetectorHitsEvent() {
///////////////////////////////////////////////
/// \brief TRestDetectorHitsEvent default destructor
///
TRestDetectorHitsEvent::~TRestDetectorHitsEvent() { delete fHits; }
TRestDetectorHitsEvent::~TRestDetectorHitsEvent() {
delete fHits;
delete fXZHits;
delete fYZHits;
delete fXYZHits;

delete fXYHitGraph;
delete fXZHitGraph;
delete fYZHitGraph;

delete fXYHisto;
delete fXZHisto;
delete fYZHisto;

delete fXHisto;
delete fYHisto;
delete fZHisto;
}

///////////////////////////////////////////////
/// \brief Adds a new hit to this event
Expand Down Expand Up @@ -847,20 +864,32 @@ void TRestDetectorHitsEvent::DrawHistograms(Int_t& column, const TString& histOp
nBinsZ = std::max(1, nBinsZ);

delete fXYHisto;
fXYHisto = nullptr;
delete fXZHisto;
fXZHisto = nullptr;
delete fYZHisto;
fYZHisto = nullptr;

delete fXHisto;
fXHisto = nullptr;
delete fYHisto;
fYHisto = nullptr;
delete fZHisto;
fZHisto = nullptr;

fXYHisto = new TH2F("XY", "", nBinsX, minX, maxX, nBinsY, minY, maxY);
fXYHisto->SetDirectory(nullptr);
fXZHisto = new TH2F("XZ", "", nBinsX, minX, maxX, nBinsZ, minZ, maxZ);
fXZHisto->SetDirectory(nullptr);
fYZHisto = new TH2F("YZ", "", nBinsY, minY, maxY, nBinsZ, minZ, maxZ);
fYZHisto->SetDirectory(nullptr);

fXHisto = new TH1F("X", "", nBinsX, minX, maxX);
fXHisto->SetDirectory(nullptr);
fYHisto = new TH1F("Y", "", nBinsY, minY, maxY);
fYHisto->SetDirectory(nullptr);
fZHisto = new TH1F("Z", "", nBinsZ, minZ, maxZ);
fZHisto->SetDirectory(nullptr);

fXYHisto->SetStats(false);
fXZHisto->SetStats(false);
Expand Down Expand Up @@ -1132,7 +1161,9 @@ TH2F* TRestDetectorHitsEvent::GetXYHistogram(std::vector<float> ranges, Double_t
}

delete fXYHisto;
fXYHisto = nullptr;
fXYHisto = new TH2F("XY", "", nBinsX, minX, maxX, nBinsY, minY, maxY);
fXYHisto->SetDirectory(nullptr);
fXYHisto->SetStats(false);

Int_t nXY = 0;
Expand Down Expand Up @@ -1219,7 +1250,9 @@ TH2F* TRestDetectorHitsEvent::GetXZHistogram(std::vector<float> ranges, Double_t
}

delete fXZHisto;
fXZHisto = nullptr;
fXZHisto = new TH2F("XZ", "", nBinsX, minX, maxX, nBinsZ, minZ, maxZ);
fXZHisto->SetDirectory(nullptr);
fXZHisto->SetStats(false);

Int_t nXZ = 0;
Expand Down Expand Up @@ -1306,7 +1339,9 @@ TH2F* TRestDetectorHitsEvent::GetYZHistogram(std::vector<float> ranges, Double_t
}

delete fYZHisto;
fYZHisto = nullptr;
fYZHisto = new TH2F("YZ", "", nBinsY, minY, maxY, nBinsZ, minZ, maxZ);
fYZHisto->SetDirectory(nullptr);
fYZHisto->SetStats(false);

Int_t nYZ = 0;
Expand Down
Loading