lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.7.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc
+4 -5
View File
@@ -73,7 +73,6 @@ G4FTFModel::G4FTFModel( const G4String& modelName ) :
theElastic( new G4ElasticHNScattering() ),
theAnnihilation( new G4FTFAnnihilation() )
{
G4VPartonStringModel::SetThisPointer( this );
// ---> JVY theParameters = 0;
theParameters = new G4FTFParameters();
//
@@ -219,9 +218,9 @@ void G4FTFModel::Init( const G4Nucleus& aNucleus, const G4DynamicParticle& aProj
theParticipants.InitProjectileNucleus(
std::abs( theProjectile.GetDefinition()->GetBaryonNumber() ),
std::abs( G4int( theProjectile.GetDefinition()->GetPDGCharge() ) ) );
theParticipants.theProjectileNucleus->StartLoop();
theParticipants.GetProjectileNucleus()->StartLoop();
G4Nucleon* aNucleon;
while ( ( aNucleon = theParticipants.theProjectileNucleus->GetNextNucleon() ) ) { /* Loop checking, 10.08.2015, A.Ribon */
while ( ( aNucleon = theParticipants.GetProjectileNucleus()->GetNextNucleon() ) ) { /* Loop checking, 10.08.2015, A.Ribon */
if ( aNucleon->GetDefinition() == G4Proton::Proton() ) {
aNucleon->SetParticleType( G4AntiProton::AntiProton() );
} else if ( aNucleon->GetDefinition() == G4Neutron::Neutron() ) {
@@ -240,8 +239,8 @@ void G4FTFModel::Init( const G4Nucleus& aNucleus, const G4DynamicParticle& aProj
}
G4ThreeVector BoostVector = theProjectile.GetMomentum() / theProjectile.GetTotalEnergy();
theParticipants.theProjectileNucleus->DoLorentzBoost( BoostVector );
theParticipants.theProjectileNucleus->DoLorentzContraction( BoostVector );
theParticipants.GetProjectileNucleus()->DoLorentzBoost( BoostVector );
theParticipants.GetProjectileNucleus()->DoLorentzContraction( BoostVector );
ProjectileResidualExcitationEnergy = 0.0;
//G4double ProjectileResidualMass = theProjectile.GetMass();
ProjectileResidual4Momentum.setVect( theProjectile.GetMomentum() );
source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc
+1 -13
View File
@@ -60,22 +60,10 @@
G4FTFParticipants::G4FTFParticipants() : currentInteraction( -1 ) {}
//============================================================================
G4FTFParticipants::G4FTFParticipants( const G4FTFParticipants& ) :
G4VParticipants(), currentInteraction( -1 )
{
G4Exception( "G4FTFParticipants::G4FTFParticipants()", "HAD_FTF_001",
FatalException, " Must not use copy ctor()" );
}
//============================================================================
G4FTFParticipants::~G4FTFParticipants() {}
//============================================================================
void G4FTFParticipants::GetList( const G4ReactionProduct& thePrimary,
@@ -96,7 +84,7 @@ void G4FTFParticipants::GetList( const G4ReactionProduct& thePrimary,
G4double deltaxy = 2.0 * fermi; // Extra nuclear radius
if ( theProjectileNucleus == 0 ) { // Hadron-nucleus or anti-baryon-nucleus interactions
if ( theProjectileNucleus == nullptr ) { // Hadron-nucleus or anti-baryon-nucleus interactions
G4double impactX( 0.0 ), impactY( 0.0 );