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

[mini] fix bug if next state was outside #323

Merged
merged 2 commits into from
Dec 6, 2024
Merged

[mini] fix bug if next state was outside #323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
013349d
fix bug if next state was outside
SeverinDiederichs Dec 5, 2024
aca7531
Update src/AdePTGeant4Integration.cpp
SeverinDiederichs Dec 5, 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
41 changes: 21 additions & 20 deletions src/AdePTGeant4Integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ void Deleter::operator()(ScoringObjects *ptr)

} // namespace AdePTGeant4Integration_detail

AdePTGeant4Integration::~AdePTGeant4Integration()
{

}
AdePTGeant4Integration::~AdePTGeant4Integration() {}

void AdePTGeant4Integration::CreateVecGeomWorld(std::string filename)
{
Expand Down Expand Up @@ -268,7 +265,6 @@ void AdePTGeant4Integration::InitScoringData(adeptint::VolAuxData *volAuxData)
// Though we only record and reconstruct hits for sensitive volumes, this map needs to store every
// volume in the geometry, as a step may begin in a sensitive volume and end in a non-sensitive one
fglobal_vecgeom_to_g4_map.insert(std::pair<int, const G4VPhysicalVolume *>(vg_pvol->id(), g4_pvol));

// Now do the daughters
for (int id = 0; id < g4_lvol->GetNoDaughters(); ++id) {
auto g4pvol_d = g4_lvol->GetDaughter(id);
Expand All @@ -292,18 +288,20 @@ void AdePTGeant4Integration::ProcessGPUHit(GPUHit const &hit)
}

// Reconstruct G4NavigationHistory and G4Step, and call the SD code for each hit
vecgeom::NavigationState const & preNavState = hit.fPreStepPoint.fNavigationState;
vecgeom::NavigationState const &preNavState = hit.fPreStepPoint.fNavigationState;
// Reconstruct Pre-Step point G4NavigationHistory
FillG4NavigationHistory(preNavState, &fScoringObjects->fPreG4NavigationHistory);
(*fScoringObjects->fPreG4TouchableHistoryHandle)
->UpdateYourself(fScoringObjects->fPreG4NavigationHistory.GetTopVolume(),
&fScoringObjects->fPreG4NavigationHistory);
// Reconstruct Post-Step point G4NavigationHistory
vecgeom::NavigationState const & postNavState = hit.fPostStepPoint.fNavigationState;
FillG4NavigationHistory(postNavState, &fScoringObjects->fPostG4NavigationHistory);
(*fScoringObjects->fPostG4TouchableHistoryHandle)
->UpdateYourself(fScoringObjects->fPostG4NavigationHistory.GetTopVolume(),
&fScoringObjects->fPostG4NavigationHistory);
vecgeom::NavigationState const &postNavState = hit.fPostStepPoint.fNavigationState;
if (!postNavState.IsOutside()) {
FillG4NavigationHistory(postNavState, &fScoringObjects->fPostG4NavigationHistory);
(*fScoringObjects->fPostG4TouchableHistoryHandle)
->UpdateYourself(fScoringObjects->fPostG4NavigationHistory.GetTopVolume(),
&fScoringObjects->fPostG4NavigationHistory);
}

// Reconstruct G4Step
switch (hit.fParticleType) {
Expand Down Expand Up @@ -385,12 +383,15 @@ void AdePTGeant4Integration::FillG4Step(GPUHit const *aGPUHit, G4Step *aG4Step,
G4TouchableHandle &aPreG4TouchableHandle,
G4TouchableHandle &aPostG4TouchableHandle) const
{
const G4ThreeVector aPostStepPointMomentumDirection(aGPUHit->fPostStepPoint.fMomentumDirection.x(), aGPUHit->fPostStepPoint.fMomentumDirection.y(),
aGPUHit->fPostStepPoint.fMomentumDirection.z());
const G4ThreeVector aPostStepPointPolarization(aGPUHit->fPostStepPoint.fPolarization.x(), aGPUHit->fPostStepPoint.fPolarization.y(),
aGPUHit->fPostStepPoint.fPolarization.z());
const G4ThreeVector aPostStepPointPosition(aGPUHit->fPostStepPoint.fPosition.x(), aGPUHit->fPostStepPoint.fPosition.y(),
aGPUHit->fPostStepPoint.fPosition.z());
const G4ThreeVector aPostStepPointMomentumDirection(aGPUHit->fPostStepPoint.fMomentumDirection.x(),
aGPUHit->fPostStepPoint.fMomentumDirection.y(),
aGPUHit->fPostStepPoint.fMomentumDirection.z());
const G4ThreeVector aPostStepPointPolarization(aGPUHit->fPostStepPoint.fPolarization.x(),
aGPUHit->fPostStepPoint.fPolarization.y(),
aGPUHit->fPostStepPoint.fPolarization.z());
const G4ThreeVector aPostStepPointPosition(aGPUHit->fPostStepPoint.fPosition.x(),
aGPUHit->fPostStepPoint.fPosition.y(),
aGPUHit->fPostStepPoint.fPosition.z());

// G4Step
aG4Step->SetStepLength(aGPUHit->fStepLength); // Real data
Expand All @@ -404,8 +405,8 @@ void AdePTGeant4Integration::FillG4Step(GPUHit const *aGPUHit, G4Step *aG4Step,

// G4Track
G4Track *aTrack = aG4Step->GetTrack();
aTrack->SetTrackID(aGPUHit->fParentID); // Missing data
aTrack->SetParentID(aGPUHit->fParentID); // ID of the initial particle that entered AdePT
aTrack->SetTrackID(aGPUHit->fParentID); // Missing data
aTrack->SetParentID(aGPUHit->fParentID); // ID of the initial particle that entered AdePT
aTrack->SetPosition(aPostStepPointPosition); // Real data
// aTrack->SetGlobalTime(0); // Missing data
// aTrack->SetLocalTime(0); // Missing data
Expand Down Expand Up @@ -468,7 +469,7 @@ void AdePTGeant4Integration::FillG4Step(GPUHit const *aGPUHit, G4Step *aG4Step,
// aPostStepPoint->SetGlobalTime(0); // Missing data
// aPostStepPoint->SetProperTime(0); // Missing data
aPostStepPoint->SetMomentumDirection(aPostStepPointMomentumDirection); // Real data
aPostStepPoint->SetKineticEnergy(aGPUHit->fPostStepPoint.fEKin); // Real data
aPostStepPoint->SetKineticEnergy(aGPUHit->fPostStepPoint.fEKin); // Real data
// aPostStepPoint->SetVelocity(0); // Missing data
if (const auto postVolume = (*fScoringObjects->fPostG4TouchableHistoryHandle)->GetVolume();
postVolume != nullptr) { // protect against nullptr if postNavState is outside
Expand Down
Loading