Import Geant4 11.3.0 source tree
This commit is contained in:
+7
-3
@@ -33,6 +33,12 @@
|
||||
# ifndef FLUKA_COMMON_DEPENDENCIES_HH
|
||||
# define FLUKA_COMMON_DEPENDENCIES_HH
|
||||
|
||||
// clang-format off
|
||||
// Special headers with global constants - DO NOT RE-ORDER
|
||||
# include "dblprc.h"
|
||||
# include "dimpar.h"
|
||||
# include "iounit.h"
|
||||
// End: special headers with global constants
|
||||
# include "beamcm.h"
|
||||
# include "blnkcm.h"
|
||||
# include "caslim.h"
|
||||
@@ -40,8 +46,6 @@
|
||||
# include "cmphnu.h"
|
||||
# include "ctitle.h"
|
||||
# include "currpt.h"
|
||||
# include "dblprc.h"
|
||||
# include "dimpar.h"
|
||||
# include "evaflg.h"
|
||||
# include "evapix.h"
|
||||
# include "fheavy.h"
|
||||
@@ -49,7 +53,6 @@
|
||||
# include "genflg.h"
|
||||
# include "genstk.h"
|
||||
# include "genthr.h"
|
||||
# include "iounit.h"
|
||||
# include "isotop.h"
|
||||
# include "ncsfta.h"
|
||||
# include "ndnicm.h"
|
||||
@@ -67,6 +70,7 @@
|
||||
# include "sumcou.h"
|
||||
# include "thrscm.h"
|
||||
# include "usryld.h"
|
||||
// clang-format on
|
||||
|
||||
# endif
|
||||
#endif // G4_USE_FLUKA
|
||||
|
||||
+13
-3
@@ -45,9 +45,11 @@
|
||||
# include "types.h"
|
||||
|
||||
// FLUKA DEPENDENCIES
|
||||
// clang-format off
|
||||
# include "FLUKAParticleTable.hh"
|
||||
# include "fluka_dependencies.hh" // Do not re-order
|
||||
# include "cmcyl.hh"
|
||||
# include "fluka_dependencies.hh"
|
||||
// clang-format on
|
||||
|
||||
// G4
|
||||
# include "G4DynamicParticle.hh"
|
||||
@@ -369,9 +371,17 @@ void setNuclearInelasticFinalState(G4HadFinalState* const finalState,
|
||||
const G4int targetZ = targetNucleus.GetZ_asInt();
|
||||
|
||||
const auto& projectileDirection = projectile.GetMomentumDirection();
|
||||
G4double txx = projectileDirection.x();
|
||||
/*G4double txx = projectileDirection.x();
|
||||
G4double tyy = projectileDirection.y();
|
||||
G4double tzz = projectileDirection.z();
|
||||
G4double tzz = projectileDirection.z();*/
|
||||
// Should NOT propagate the track/projectile's direction (dir) from Geant4:
|
||||
// the FLUKA event generator should work in a local frame
|
||||
// whose localZ is the projectile direction.
|
||||
// Geant4 is in charge of transforming the final state
|
||||
// from that local frame back to the lab (rotateUz), using the cached projectile direction.
|
||||
G4double txx = 0.;
|
||||
G4double tyy = 0.;
|
||||
G4double tzz = 1.;
|
||||
|
||||
// RENAME INTO FLUKA-WORLD VARIABLES
|
||||
G4int kproj = projectileFLUKAId;
|
||||
|
||||
Reference in New Issue
Block a user