Skip to content

return preStep global time #439

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
merged 2 commits into from
Sep 19, 2025
Merged

return preStep global time #439

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
07f290c
return preStep global time
SeverinDiederichs Sep 18, 2025
580931f
fix typo in split kernel
SeverinDiederichs Sep 18, 2025
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
4 changes: 2 additions & 2 deletions include/AdePT/core/AdePTScoringTemplate.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ __device__ void RecordHit(Scoring *scoring_dev, uint64_t aTrackID, uint64_t aPar
vecgeom::Vector3D<Precision> const &aPreMomentumDirection, double aPreEKin,
vecgeom::NavigationState const &aPostState, vecgeom::Vector3D<Precision> const &aPostPosition,
vecgeom::Vector3D<Precision> const &aPostMomentumDirection, double aPostEKin,
double aGlobalTime, double aLocalTime, unsigned int eventId, short threadId, bool isLastStep,
unsigned short stepCounter);
double aGlobalTime, double aLocalTime, double aPreGlobalTime, unsigned int eventId,
short threadId, bool isLastStep, unsigned short stepCounter);

template <typename Scoring>
__device__ void AccountProduced(Scoring *scoring_dev, int num_ele, int num_pos, int num_gam);
Expand Down
6 changes: 3 additions & 3 deletions include/AdePT/core/HostScoringImpl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,16 @@ __device__ void RecordHit(HostScoring *hostScoring_dev, uint64_t aTrackID, uint6
vecgeom::Vector3D<Precision> const &aPreMomentumDirection, double aPreEKin,
vecgeom::NavigationState const &aPostState, vecgeom::Vector3D<Precision> const &aPostPosition,
vecgeom::Vector3D<Precision> const &aPostMomentumDirection, double aPostEKin,
double aGlobalTime, double aLocalTime, unsigned int eventID, short threadID, bool isLastStep,
unsigned short stepCounter)
double aGlobalTime, double aLocalTime, double aPreGlobalTime, unsigned int eventID,
short threadID, bool isLastStep, unsigned short stepCounter)
{
// Acquire a hit slot
GPUHit &aGPUHit = *GetNextFreeHit(hostScoring_dev);

// Fill the required data
FillHit(aGPUHit, aTrackID, aParentID, stepLimProcessId, aParticleType, aStepLength, aTotalEnergyDeposit, aTrackWeight,
aPreState, aPrePosition, aPreMomentumDirection, aPreEKin, aPostState, aPostPosition, aPostMomentumDirection,
aPostEKin, aGlobalTime, aLocalTime, eventID, threadID, isLastStep, stepCounter);
aPostEKin, aGlobalTime, aLocalTime, aPreGlobalTime, eventID, threadID, isLastStep, stepCounter);
}

/// @brief Account for the number of produced secondaries
Expand Down
6 changes: 3 additions & 3 deletions include/AdePT/core/PerEventScoringImpl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,16 +706,16 @@ __device__ void RecordHit(AsyncAdePT::PerEventScoring * /*scoring*/, uint64_t aT
vecgeom::Vector3D<Precision> const &aPreMomentumDirection, double aPreEKin,
vecgeom::NavigationState const &aPostState, vecgeom::Vector3D<Precision> const &aPostPosition,
vecgeom::Vector3D<Precision> const &aPostMomentumDirection, double aPostEKin,
double aGlobalTime, double aLocalTime, unsigned int eventID, short threadID, bool isLastStep,
unsigned short stepCounter)
double aGlobalTime, double aLocalTime, double aPreGlobalTime, unsigned int eventID,
short threadID, bool isLastStep, unsigned short stepCounter)
{
// Acquire a hit slot
GPUHit &aGPUHit = AsyncAdePT::gHitScoringBuffer_dev.GetNextSlot(threadID);

// Fill the required data
FillHit(aGPUHit, aTrackID, aParentID, stepLimProcessId, aParticleType, aStepLength, aTotalEnergyDeposit, aTrackWeight,
aPreState, aPrePosition, aPreMomentumDirection, aPreEKin, aPostState, aPostPosition, aPostMomentumDirection,
aPostEKin, aGlobalTime, aLocalTime, eventID, threadID, isLastStep, stepCounter);
aPostEKin, aGlobalTime, aLocalTime, aPreGlobalTime, eventID, threadID, isLastStep, stepCounter);
}

/// @brief Account for the number of produced secondaries
Expand Down
4 changes: 3 additions & 1 deletion include/AdePT/core/ScoringCommons.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ struct GPUHit {
// double fNonIonizingEnergyDeposit{0};
double fGlobalTime{0.};
double fLocalTime{0.};
double fPreGlobalTime{0.};
float fTrackWeight{1};
uint64_t fTrackID{0}; // Track ID
uint64_t fParentID{0}; // parent Track ID
Expand Down Expand Up @@ -76,7 +77,7 @@ __device__ __forceinline__ void FillHit(
vecgeom::Vector3D<Precision> const &aPrePosition, vecgeom::Vector3D<Precision> const &aPreMomentumDirection,
double aPreEKin, vecgeom::NavigationState const &aPostState, vecgeom::Vector3D<Precision> const &aPostPosition,
vecgeom::Vector3D<Precision> const &aPostMomentumDirection, double aPostEKin, double aGlobalTime, double aLocalTime,
unsigned int eventID, short threadID, bool isLastStep, unsigned short stepCounter)
double aPreGlobalTime, unsigned int eventID, short threadID, bool isLastStep, unsigned short stepCounter)
{
aGPUHit.fEventId = eventID;
aGPUHit.threadId = threadID;
Expand All @@ -93,6 +94,7 @@ __device__ __forceinline__ void FillHit(
aGPUHit.fTrackWeight = aTrackWeight;
aGPUHit.fGlobalTime = aGlobalTime;
aGPUHit.fLocalTime = aLocalTime;
aGPUHit.fPreGlobalTime = aPreGlobalTime;
// Pre step point
aGPUHit.fPreStepPoint.fNavigationState = aPreState;
Copy3DVector(aPrePosition, aGPUHit.fPreStepPoint.fPosition);
Expand Down
1 change: 1 addition & 0 deletions include/AdePT/core/Track.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ struct Track {
vecgeom::Vector3D<Precision> preStepPos;
vecgeom::Vector3D<Precision> preStepDir;
double preStepEKin{0};
double preStepGlobalTime{0.};
// Variables used to store navigation results
double geometryStepLength{0};
double safeLength{0};
Expand Down
Loading