Import Geant4 11.0.0 source tree
This commit is contained in:
committed by
Ben Morgan
parent
6399a014b6
commit
80e2389dd8
@@ -119,7 +119,7 @@ G4HadFinalState * G4LENDCapture::ApplyYourself(const G4HadProjectile& aTrack, G4
|
||||
}
|
||||
*/
|
||||
|
||||
theResult->AddSecondary( theSec );
|
||||
theResult->AddSecondary( theSec, secID );
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -150,7 +150,7 @@ G4HadFinalState * G4LENDCapture::ApplyYourself(const G4HadProjectile& aTrack, G4
|
||||
theSec->SetDefinition( G4IonTable::GetIonTable()->GetIon( (*it)->GetZ_asInt() , (*it)->GetA_asInt() ) );
|
||||
theSec->Set4Momentum( (*it)->GetMomentum() );
|
||||
}
|
||||
theResult->AddSecondary( theSec );
|
||||
theResult->AddSecondary( theSec, secID );
|
||||
}
|
||||
delete products_from_PE;
|
||||
}
|
||||
@@ -160,7 +160,7 @@ G4HadFinalState * G4LENDCapture::ApplyYourself(const G4HadProjectile& aTrack, G4
|
||||
G4DynamicParticle* residual = new G4DynamicParticle;
|
||||
residual->SetDefinition( G4IonTable::GetIonTable()->GetIon( iZ + ipZ , iA + ipA ) );
|
||||
residual->SetMomentum( -p*MeV );
|
||||
theResult->AddSecondary( residual );
|
||||
theResult->AddSecondary( residual, secID );
|
||||
}
|
||||
|
||||
delete products;
|
||||
|
||||
@@ -142,7 +142,7 @@ G4HadFinalState * G4LENDElastic::ApplyYourself(const G4HadProjectile& aTrack, G4
|
||||
|
||||
theRecoil->SetDefinition( target_pd );
|
||||
theRecoil->SetMomentum( theTarget.GetMomentum() );
|
||||
theResult->AddSecondary( theRecoil );
|
||||
theResult->AddSecondary( theRecoil, secID );
|
||||
|
||||
return theResult;
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ G4HadFinalState * G4LENDFission::ApplyYourself(const G4HadProjectile& aTrack, G4
|
||||
|
||||
theSec->SetMomentum( G4ThreeVector( (*products)[j].px*MeV , (*products)[j].py*MeV , (*products)[j].pz*MeV ) );
|
||||
//G4cout << theSec->GetDefinition()->GetParticleName() << G4endl;
|
||||
theResult->AddSecondary( theSec );
|
||||
theResult->AddSecondary( theSec, secID );
|
||||
//Set time for delayed neutrons
|
||||
//Current implementation is a little tricky,
|
||||
if ( (*products)[j].birthTimeSec != 0 ) {
|
||||
|
||||
@@ -215,7 +215,7 @@ G4HadFinalState* G4LENDInelastic::ApplyYourself(const G4HadProjectile& aTrack,
|
||||
Psum += momentum;
|
||||
theSec->SetMomentum(momentum);
|
||||
// theResult->AddSecondary(theSec);
|
||||
theParticleChange.AddSecondary(theSec);
|
||||
theParticleChange.AddSecondary(theSec, secID);
|
||||
}
|
||||
|
||||
G4int productM(0);
|
||||
@@ -234,7 +234,7 @@ G4HadFinalState* G4LENDInelastic::ApplyYourself(const G4HadProjectile& aTrack,
|
||||
Psum += momentum;
|
||||
theSec->SetMomentum(momentum);
|
||||
// theResult->AddSecondary(theSec);
|
||||
theParticleChange.AddSecondary(theSec);
|
||||
theParticleChange.AddSecondary(theSec, secID);
|
||||
}
|
||||
|
||||
// Create heavy fragment if necessary to try to balance A, Z
|
||||
@@ -254,7 +254,7 @@ G4HadFinalState* G4LENDInelastic::ApplyYourself(const G4HadProjectile& aTrack,
|
||||
}
|
||||
theSec->SetMomentum(projMom - Psum);
|
||||
// theResult->AddSecondary(theSec);
|
||||
theParticleChange.AddSecondary(theSec);
|
||||
theParticleChange.AddSecondary(theSec, secID);
|
||||
}
|
||||
} // loop OK
|
||||
|
||||
|
||||
@@ -41,11 +41,12 @@
|
||||
#include "G4PhysicalConstants.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
#include "G4NistManager.hh"
|
||||
#include "G4PhysicsModelCatalog.hh"
|
||||
|
||||
double MyRNG(void*) { return G4Random::getTheEngine()->flat(); }
|
||||
|
||||
G4LENDModel::G4LENDModel( G4String name )
|
||||
:G4HadronicInteraction( name )
|
||||
:G4HadronicInteraction( name ), secID(-1)
|
||||
{
|
||||
|
||||
proj = NULL; //will be set in an inherited class
|
||||
@@ -62,6 +63,7 @@ G4LENDModel::G4LENDModel( G4String name )
|
||||
|
||||
lend_manager = G4LENDManager::GetInstance();
|
||||
|
||||
secID = G4PhysicsModelCatalog::GetModelID( "model_" + GetModelName() );
|
||||
}
|
||||
|
||||
G4LENDModel::~G4LENDModel()
|
||||
|
||||
Reference in New Issue
Block a user