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

Jump to bottom

Fix memory leak in scoring #315

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory leak in scoring #315

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
21 changes: 9 additions & 12 deletions src/AdePTGeant4Integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,14 +353,11 @@ void AdePTGeant4Integration::FillG4NavigationHistory(vecgeom::NavigationState aN
void AdePTGeant4Integration::FillG4Step(GPUHit *aGPUHit, G4Step *aG4Step, G4TouchableHandle &aPreG4TouchableHandle,
G4TouchableHandle &aPostG4TouchableHandle)
{
const G4ThreeVector *aPostStepPointMomentumDirection =
new G4ThreeVector(aGPUHit->fPostStepPoint.fMomentumDirection.x(), aGPUHit->fPostStepPoint.fMomentumDirection.y(),
const G4ThreeVector aPostStepPointMomentumDirection(aGPUHit->fPostStepPoint.fMomentumDirection.x(), aGPUHit->fPostStepPoint.fMomentumDirection.y(),
aGPUHit->fPostStepPoint.fMomentumDirection.z());
const G4ThreeVector *aPostStepPointPolarization =
new G4ThreeVector(aGPUHit->fPostStepPoint.fPolarization.x(), aGPUHit->fPostStepPoint.fPolarization.y(),
const G4ThreeVector aPostStepPointPolarization(aGPUHit->fPostStepPoint.fPolarization.x(), aGPUHit->fPostStepPoint.fPolarization.y(),
aGPUHit->fPostStepPoint.fPolarization.z());
const G4ThreeVector *aPostStepPointPosition =
new G4ThreeVector(aGPUHit->fPostStepPoint.fPosition.x(), aGPUHit->fPostStepPoint.fPosition.y(),
const G4ThreeVector aPostStepPointPosition(aGPUHit->fPostStepPoint.fPosition.x(), aGPUHit->fPostStepPoint.fPosition.y(),
aGPUHit->fPostStepPoint.fPosition.z());

// G4Step
Expand All @@ -377,17 +374,17 @@ void AdePTGeant4Integration::FillG4Step(GPUHit *aGPUHit, G4Step *aG4Step, G4Touc
G4Track *aTrack = aG4Step->GetTrack();
aTrack->SetTrackID(aGPUHit->fParentID); // Missing data
aTrack->SetParentID(aGPUHit->fParentID); // ID of the initial particle that entered AdePT
aTrack->SetPosition(*aPostStepPointPosition); // Real data
aTrack->SetPosition(aPostStepPointPosition); // Real data
// aTrack->SetGlobalTime(0); // Missing data
// aTrack->SetLocalTime(0); // Missing data
// aTrack->SetProperTime(0); // Missing data
// aTrack->SetTouchableHandle(aTrackTouchableHistory); // Missing data
// aTrack->SetNextTouchableHandle(nullptr); // Missing data
// aTrack->SetOriginTouchableHandle(nullptr); // Missing data
// aTrack->SetKineticEnergy(aGPUHit->fPostStepPoint.fEKin); // Real data
aTrack->SetMomentumDirection(*aPostStepPointMomentumDirection); // Real data
aTrack->SetMomentumDirection(aPostStepPointMomentumDirection); // Real data
// aTrack->SetVelocity(0); // Missing data
aTrack->SetPolarization(*aPostStepPointPolarization); // Real data
aTrack->SetPolarization(aPostStepPointPolarization); // Real data
// aTrack->SetTrackStatus(G4TrackStatus::fAlive); // Missing data
// aTrack->SetBelowThresholdFlag(false); // Missing data
// aTrack->SetGoodForTrackingFlag(false); // Missing data
Expand Down Expand Up @@ -434,11 +431,11 @@ void AdePTGeant4Integration::FillG4Step(GPUHit *aGPUHit, G4Step *aG4Step, G4Touc

// Post-Step Point
G4StepPoint *aPostStepPoint = aG4Step->GetPostStepPoint();
aPostStepPoint->SetPosition(*aPostStepPointPosition); // Real data
aPostStepPoint->SetPosition(aPostStepPointPosition); // Real data
// aPostStepPoint->SetLocalTime(0); // Missing data
// aPostStepPoint->SetGlobalTime(0); // Missing data
// aPostStepPoint->SetProperTime(0); // Missing data
aPostStepPoint->SetMomentumDirection(*aPostStepPointMomentumDirection); // Real data
aPostStepPoint->SetMomentumDirection(aPostStepPointMomentumDirection); // Real data
aPostStepPoint->SetKineticEnergy(aGPUHit->fPostStepPoint.fEKin); // Real data
// aPostStepPoint->SetVelocity(0); // Missing data
if (fPostG4TouchableHistoryHandle->GetVolume()) { // protect against nullptr if postNavState is outside
Expand All @@ -450,7 +447,7 @@ void AdePTGeant4Integration::FillG4Step(GPUHit *aGPUHit, G4Step *aG4Step, G4Touc
}
// aPostStepPoint->SetSensitiveDetector(nullptr); // Missing data
// aPostStepPoint->SetSafety(0); // Missing data
aPostStepPoint->SetPolarization(*aPostStepPointPolarization); // Real data
aPostStepPoint->SetPolarization(aPostStepPointPolarization); // Real data
// aPostStepPoint->SetStepStatus(G4StepStatus::fUndefined); // Missing data
// aPostStepPoint->SetProcessDefinedStep(nullptr); // Missing data
// aPostStepPoint->SetMass(0); // Missing data
Expand Down
Loading