Skip to content

Mem leak corrections in Sp reso #757

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
kochebina wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Mem leak corrections in Sp reso #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7f6e77
mNavigator mem leak correction
kochebina Mar 18, 2026
ec711a2
mNavigator mem leak correction v2
kochebina Mar 18, 2026
f385778
Small corrections in Sp reso
kochebina Mar 20, 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
100 changes: 64 additions & 36 deletions source/digits_hits/src/GateSpatialResolution.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Includes functionalities from:
GateSpblurring
GateCC3DlocalSpblurring
GateDoIModels (TODO)
GateDoIModels

Previous authors: Steven.Staelens@rug.ac.be(?), AE

Expand Down Expand Up @@ -65,12 +65,12 @@ GateSpatialResolution::GateSpatialResolution(GateSinglesDigitizer *digitizer, G4
m_fwhmXDistrib(0),
m_fwhmYDistrib(0),
m_fwhmZDistrib(0),
m_nameAxis("YZ"),
m_nameAxis(""),
m_fwhmXDistrib2D(0),
m_fwhmYDistrib2D(0),
m_fwhmZDistrib2D(0),
m_IsConfined(true),
m_UseTruncatedGaussian(true),
m_UseTruncatedGaussian(false),
m_Navigator(0),
m_Touchable(0),
m_systemDepth(-1),
Expand Down Expand Up @@ -129,12 +129,30 @@ void GateSpatialResolution::SetSpatialResolutionParameters() {
abort();
}


if (m_nameAxis == "YZ" && (m_fwhmYDistrib2D ==0 || m_fwhmZDistrib2D ==0))
{
G4cout << "***ERROR*** Spatial Resolution 2D distribution: you choose YZ axis but one or both parameters /fwhmYDistrib2D or /m_fwhmZDistrib2D are not defined" << G4endl;
abort();
}
if (m_nameAxis == "XZ" && (m_fwhmXDistrib2D ==0 || m_fwhmZDistrib2D ==0))
{
G4cout << "***ERROR*** Spatial Resolution 2D distribution: you choose XZ axis but one or both parameters /fwhmXDistrib2D or /m_fwhmZDistrib2D are not defined" << G4endl;
abort();
}






}



void GateSpatialResolution::Digitize(){


GateVSystem* m_system = ((GateSinglesDigitizer*)this->GetDigitizer())->GetSystem();

if (m_IsFirstEntrance) {
Expand Down Expand Up @@ -190,6 +208,17 @@ void GateSpatialResolution::Digitize(){
GateDigi* inputDigi;


if(!m_IsConfined && !m_Navigator)
{
//Getting world Volume
// Do not use from TransportationManager as it is not recommended
G4Navigator *navigator = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
G4VPhysicalVolume *WorldVolume = navigator->GetWorldVolume();
m_Navigator = new G4Navigator();
m_Navigator->SetWorldVolume(WorldVolume);
}


if (IDC)
{
G4int n_digi = IDC->entries();
Expand All @@ -208,39 +237,41 @@ void GateSpatialResolution::Digitize(){
G4double Pz = P.z();
G4double stddevX = 0., stddevY = 0., stddevZ = 0.;

// Use the configured axis pair (m_nameAxis) to evaluate Value2D.
// Allowed pairs for PET: "XZ" or "YZ" (default "YZ").
if (m_fwhmXDistrib2D || m_fwhmYDistrib2D || m_fwhmZDistrib2D) {
if (m_nameAxis == "XZ") {
if (m_fwhmXDistrib2D) stddevX = m_fwhmXDistrib2D->Value2D(P.x() * mm, P.z() * mm);
if (m_fwhmYDistrib2D) stddevY = m_fwhmYDistrib2D->Value2D(P.x() * mm, P.z() * mm);
if (m_fwhmZDistrib2D) stddevZ = m_fwhmZDistrib2D->Value2D(P.x() * mm, P.z() * mm);
} else { // YZ
if (m_fwhmXDistrib2D) stddevX = m_fwhmXDistrib2D->Value2D(P.y() * mm, P.z() * mm);
if (m_fwhmYDistrib2D) stddevY = m_fwhmYDistrib2D->Value2D(P.y() * mm, P.z() * mm);
if (m_fwhmZDistrib2D) stddevZ = m_fwhmZDistrib2D->Value2D(P.y() * mm, P.z() * mm);
}
if (m_nameAxis == "XZ") { //if 2D distributions are defined
stddevX = m_fwhmXDistrib2D->Value2D(P.x() * mm, P.z() * mm);
stddevZ = m_fwhmZDistrib2D->Value2D(P.x() * mm, P.z() * mm);
}
else {

if (m_fwhmXDistrib) stddevX = m_fwhmXDistrib->Value(P.x() * mm);
else if (fwhmX) stddevX = fwhmX / GateConstants::fwhm_to_sigma;

if (m_fwhmYDistrib) stddevY = m_fwhmYDistrib->Value(P.y() * mm);
else if (fwhmY) stddevY = fwhmY / GateConstants::fwhm_to_sigma;

if (m_fwhmZDistrib) stddevZ = m_fwhmZDistrib->Value(P.z() * mm);
else if (fwhmZ) stddevZ = fwhmZ / GateConstants::fwhm_to_sigma;

if(m_nameAxis == "YZ") { // YZ
stddevY = m_fwhmYDistrib2D->Value2D(P.y() * mm, P.z() * mm);
stddevZ = m_fwhmZDistrib2D->Value2D(P.y() * mm, P.z() * mm);
}





if (m_fwhmXDistrib) stddevX = m_fwhmXDistrib->Value(P.x() * mm);
else if (fwhmX)
stddevX = fwhmX / GateConstants::fwhm_to_sigma;


if (m_fwhmYDistrib) stddevY = m_fwhmYDistrib->Value(P.y() * mm);
else if (fwhmY) stddevY = fwhmY / GateConstants::fwhm_to_sigma;

if (m_fwhmZDistrib) stddevZ = m_fwhmZDistrib->Value(P.z() * mm);
else if (fwhmZ) stddevZ = fwhmZ / GateConstants::fwhm_to_sigma;

// }


if(!stddevX || !stddevY || !stddevZ)
{
G4cout << " *** ERROR*** GateSpatialResolution::Digitize. Resolution for one of the axis is not set. If you really don't want to apply spatial resolution on one of the axis, please, contact kochebina [a] gmail (dot) com " << G4endl;
abort();
}
G4double PxNew ;
G4double PyNew ;
G4double PzNew ;

// store the computed stddevs into the digi for later ROOT output
// store the computed stddevs into the digi for later ROOT output
m_outputDigi->SetSpatialRes2DStdDevX(stddevX);
m_outputDigi->SetSpatialRes2DStdDevY(stddevY);
m_outputDigi->SetSpatialRes2DStdDevZ(stddevZ);
Expand Down Expand Up @@ -314,15 +345,11 @@ void GateSpatialResolution::Digitize(){
if(PxNew>Xmax) PxNew=Xmax;
if(PyNew>Ymax) PyNew=Ymax;
if(PzNew>Zmax) PzNew=Zmax;

m_outputDigi->SetLocalPos(G4ThreeVector(PxNew,PyNew,PzNew)); //TC
m_outputDigi->SetGlobalPos(m_outputDigi->GetVolumeID().MoveToAncestorVolumeFrame(m_outputDigi->GetLocalPos())); //TC

//Getting world Volume
// Do not use from TransportationManager as it is not recommended
G4Navigator *navigator = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
G4VPhysicalVolume *WorldVolume = navigator->GetWorldVolume();
m_Navigator = new G4Navigator();
m_Navigator->SetWorldVolume(WorldVolume);

m_outputDigi->SetGlobalPos(m_outputDigi->GetVolumeID().MoveToAncestorVolumeFrame(m_outputDigi->GetLocalPos())); //TC

G4VPhysicalVolume* PV = m_Navigator->LocateGlobalPointAndSetup(m_outputDigi->GetGlobalPos());
m_Touchable = m_Navigator->CreateTouchableHistoryHandle();
Expand All @@ -332,6 +359,7 @@ void GateSpatialResolution::Digitize(){
{
UpdateVolumeID();
}

m_OutputDigiCollection->insert(m_outputDigi);


Expand Down
1 change: 1 addition & 0 deletions source/digits_hits/src/GateSpatialResolutionMessenger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ GateSpatialResolutionMessenger::GateSpatialResolutionMessenger (GateSpatialResol
spresolutionZdistribCmd = new G4UIcmdWithAString(cmdName,this);
spresolutionZdistribCmd->SetGuidance("Set the distribution resolution in position for gaussian spblurring");


cmdName = GetDirectoryName() + "fwhmXDistrib2D";
spresolutionXDistrib2DCmd = new G4UIcmdWithAString(cmdName,this);
spresolutionXDistrib2DCmd->SetGuidance("Set the 2D distribution for X axis (expects a 2D distribution object)");
Expand Down
Loading