Better alignment of the Track members

apt-sim · Nov 5, 2024 · b5a17d9 · b5a17d9
1 parent fa8ba18
commit b5a17d9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/examples/Example1/macros/example1_ttbar.mac.in b/examples/Example1/macros/example1_ttbar.mac.in
@@ -64,4 +64,3 @@
 # run events with parametrised simulation
 # by default all created models are active
 /run/beamOn 8
-
diff --git a/examples/Example1/macros/example1_ttbar_LHCb.mac.in b/examples/Example1/macros/example1_ttbar_LHCb.mac.in
@@ -7,7 +7,7 @@
 ## Geant4 macro for modelling simplified sampling calorimeters
 ## =============================================================================
 ##
-/run/numberOfThreads 8
+/run/numberOfThreads 1
 /control/verbose 0
 /run/verbose 0
 /process/verbose 0

diff --git a/include/AdePT/core/AdePTTransport.cuh b/include/AdePT/core/AdePTTransport.cuh
@@ -36,8 +36,10 @@
 #include <G4HepEmStateInit.hh>
 #include <G4HepEmParameters.hh>
 #include <G4HepEmMatCutData.hh>
+#ifdef USE_SPLIT_KERNELS
 #include <G4HepEmElectronTrack.hh>
 #include <G4HepEmGammaTrack.hh>
+#endif
 
 #include <iostream>
 #include <iomanip>

diff --git a/include/AdePT/core/Track.cuh b/include/AdePT/core/Track.cuh
@@ -18,8 +18,6 @@
 struct Track {
   using Precision = vecgeom::Precision;
 
-  int parentID{0}; // Stores the track id of the initial particle given to AdePT
-
   RanluxppDouble rngState;
   double eKin;
   double numIALeft[3];
@@ -36,26 +34,31 @@ struct Track {
   vecgeom::NavigationState navState;
 
 #ifdef USE_SPLIT_KERNELS
-  RanluxppDouble newRNG;
-
   // Variables used to store track info needed for scoring
-  double preStepEKin;
-  vecgeom::Vector3D<Precision> preStepPos;
-  vecgeom::Vector3D<Precision> preStepDir;
   vecgeom::NavigationState nextState;
   vecgeom::NavigationState preStepNavState;
+  vecgeom::Vector3D<Precision> preStepPos;
+  vecgeom::Vector3D<Precision> preStepDir;
+  RanluxppDouble newRNG;
+  double preStepEKin{0};
 
   // Variables used to store navigation results
-  long hitsurfID{0};
-  bool propagated{false};
   double geometryStepLength{0};
   double safety{0};
+  long hitsurfID{0};
+#endif
+
+  int parentID{0}; // Stores the track id of the initial particle given to AdePT
+
+#ifdef USE_SPLIT_KERNELS
+  bool propagated{false};
 
   // Variables used to store results from G4HepEM
   bool restrictedPhysicalStepLength{false};
   bool stopped{false};
 #endif
 
+
   __host__ __device__ double Uniform() { return rngState.Rndm(); }
 
   __host__ __device__ void InitAsSecondary(const vecgeom::Vector3D<Precision> &parentPos,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,4 +64,3 @@
		# run events with parametrised simulation
		# by default all created models are active
		/run/beamOn 8