Skip to content

Refactor AdePT into 2 libraries 2: Pass B field directly to AdePTTransport #518

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
SeverinDiederichs merged 1 commit into from
Mar 18, 2026
Merged

Refactor AdePT into 2 libraries 2: Pass B field directly to AdePTTransport #518

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions include/AdePT/core/AsyncAdePTTransport.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,16 @@ private:
///< Needed to stall the GPU, in case the nPartInFlight * fHitBufferSafetyFactor > available HitSlots
double fHitBufferSafetyFactor{1.5};

void Initialize(G4HepEmTrackingManagerSpecialized *hepEmTM, AdePTGeant4Integration &g4Integration);
void Initialize(G4HepEmTrackingManagerSpecialized *hepEmTM, AdePTGeant4Integration &g4Integration,
const std::vector<float> &uniformFieldValues);
void InitBVH();
bool InitializeGeometry(const vecgeom::cxx::VPlacedVolume *world);
bool InitializePhysics(G4HepEmConfig *hepEmConfig);
void InitWDTOnDevice(const adeptint::WDTHostPacked &src, adeptint::WDTDeviceBuffers &dev, unsigned short maxIter);

public:
AsyncAdePTTransport(AdePTConfiguration &configuration, G4HepEmTrackingManagerSpecialized *hepEmTM,
AdePTGeant4Integration &g4Integration);
AdePTGeant4Integration &g4Integration, const std::vector<float> &uniformFieldValues);
AsyncAdePTTransport(const AsyncAdePTTransport &other) = delete;
~AsyncAdePTTransport();

Expand Down
11 changes: 6 additions & 5 deletions include/AdePT/core/AsyncAdePTTransport.icc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ std::ostream &operator<<(std::ostream &stream, TrackDataWithIDs const &track)
// inline to avoid multiple definitions across translation units.
inline AsyncAdePTTransport::AsyncAdePTTransport(AdePTConfiguration &configuration,
G4HepEmTrackingManagerSpecialized *hepEmTM,
AdePTGeant4Integration &g4Integration)
AdePTGeant4Integration &g4Integration,
const std::vector<float> &uniformFieldValues)
: fAdePTSeed{configuration.GetAdePTSeed()}, fNThread{(ushort)configuration.GetNumThreads()},
fTrackCapacity{(uint)(1024 * 1024 * configuration.GetMillionsOfTrackSlots())},
fLeakCapacity{(uint)(1024 * 1024 * configuration.GetMillionsOfLeakSlots())},
Expand All @@ -96,7 +97,7 @@ inline AsyncAdePTTransport::AsyncAdePTTransport(AdePTConfiguration &configuratio
std::atomic_init(&eventState, EventState::LeakedTracksRetrieved);
}

AsyncAdePTTransport::Initialize(hepEmTM, g4Integration);
AsyncAdePTTransport::Initialize(hepEmTM, g4Integration, uniformFieldValues);
}

inline AsyncAdePTTransport::~AsyncAdePTTransport()
Expand Down Expand Up @@ -185,7 +186,8 @@ inline bool AsyncAdePTTransport::InitializePhysics(G4HepEmConfig *hepEmConfig)
}

inline void AsyncAdePTTransport::Initialize(G4HepEmTrackingManagerSpecialized *hepEmTM,
AdePTGeant4Integration &g4Integration)
AdePTGeant4Integration &g4Integration,
const std::vector<float> &uniformFieldValues)
{
const auto numVolumes = vecgeom::GeoManager::Instance().GetRegisteredVolumesCount();
if (numVolumes == 0) throw std::runtime_error("AsyncAdePTTransport::Initialize: Number of geometry volumes is zero.");
Expand Down Expand Up @@ -235,8 +237,7 @@ inline void AsyncAdePTTransport::Initialize(G4HepEmTrackingManagerSpecialized *h
assert(fBuffer != nullptr);

fGPUstate = async_adept_impl::InitializeGPU(fTrackCapacity, fLeakCapacity, fScoringCapacity, fNThread, *fBuffer,
fCPUCapacityFactor, fCPUCopyFraction, fBfieldFile,
g4Integration.GetUniformField());
fCPUCapacityFactor, fCPUCopyFraction, fBfieldFile, uniformFieldValues);
fGPUWorker = async_adept_impl::LaunchGPUWorker(fTrackCapacity, fLeakCapacity, fScoringCapacity, fNThread, *fBuffer,
*fGPUstate, fEventStates, fCV_G4Workers, fAdePTSeed, fDebugLevel,
fReturnAllSteps, fReturnFirstAndLastStep, fLastNParticlesOnCPU,
Expand Down
12 changes: 8 additions & 4 deletions src/AdePTTrackingManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ using AdePTTransport = AdePTTrackingManager::AdePTTransport;
}

std::shared_ptr<AdePTTransport> InstantiateAdePT(AdePTConfiguration &conf, G4HepEmTrackingManagerSpecialized *hepEmTM,
AdePTGeant4Integration &g4Integration)
AdePTGeant4Integration &g4Integration,
const std::vector<float> &uniformFieldValues)
{
static std::shared_ptr<AdePTTransport> AdePT{new AdePTTransport(conf, hepEmTM, g4Integration)};
static std::shared_ptr<AdePTTransport> AdePT{new AdePTTransport(conf, hepEmTM, g4Integration, uniformFieldValues)};
return AdePT;
}

Expand Down Expand Up @@ -110,10 +111,12 @@ void AdePTTrackingManager::InitializeAdePT()
<< std::endl;
if (fAdePTConfiguration->GetCovfieBfieldFile() == "") std::cout << "No magnetic field file provided!" << std::endl;
#endif
const auto uniformFieldValues = fGeant4Integration.GetUniformField();

// Create an instance of an AdePT transport engine. This can either be one engine per thread or a shared engine for
// all threads.
fAdeptTransport = InstantiateAdePT(*fAdePTConfiguration, fHepEmTrackingManager.get(), fGeant4Integration);
fAdeptTransport =
InstantiateAdePT(*fAdePTConfiguration, fHepEmTrackingManager.get(), fGeant4Integration, uniformFieldValues);

// common init done, can notify other workers to proceed their initialization
{
Expand All @@ -134,7 +137,8 @@ void AdePTTrackingManager::InitializeAdePT()
fAdePTConfiguration->SetNumThreads(fNumThreads);

// AdePTTransport was already initialized by the first G4 worker. The other workers get its pointer here
fAdeptTransport = InstantiateAdePT(*fAdePTConfiguration, fHepEmTrackingManager.get(), fGeant4Integration);
fAdeptTransport = InstantiateAdePT(*fAdePTConfiguration, fHepEmTrackingManager.get(), fGeant4Integration,
fGeant4Integration.GetUniformField());

// Initialize the GPU region list
if (!fAdePTConfiguration->GetTrackInAllRegions()) {
Expand Down
Loading