Import Geant4 10.3.0.beta source tree
This commit is contained in:
@@ -221,12 +221,11 @@ throw G4HadronicException(__FILE__, __LINE__, "Channel: Do not know what to do w
|
||||
{
|
||||
// delete [] theInelastic;
|
||||
if ( theInelastic != NULL ) {
|
||||
for ( std::vector<G4ParticleHPChannelList*>::iterator
|
||||
it = theInelastic->begin() ; it != theInelastic->end() ; it++ )
|
||||
{
|
||||
delete *it;
|
||||
}
|
||||
theInelastic->clear();
|
||||
for ( std::vector<G4ParticleHPChannelList*>::iterator
|
||||
it = theInelastic->begin() ; it != theInelastic->end() ; it++ ) {
|
||||
delete *it;
|
||||
}
|
||||
theInelastic->clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -241,7 +240,7 @@ throw G4HadronicException(__FILE__, __LINE__, "Channel: Do not know what to do w
|
||||
G4int it=0;
|
||||
if(n!=1)
|
||||
{
|
||||
xSec = new G4double[n];
|
||||
G4double* xSec = new G4double[n];
|
||||
G4double sum=0;
|
||||
G4int i;
|
||||
const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
|
||||
@@ -251,7 +250,7 @@ throw G4HadronicException(__FILE__, __LINE__, "Channel: Do not know what to do w
|
||||
{
|
||||
index = theMaterial->GetElement(i)->GetIndex();
|
||||
rWeight = NumAtomsPerVolume[i];
|
||||
if(aTrack.GetDefinition() == G4Neutron::Neutron() ) {
|
||||
if ( aTrack.GetDefinition() == G4Neutron::Neutron() ) {
|
||||
xSec[i] = ((*theInelastic)[index])->GetXsec(aThermalE.GetThermalEnergy(aTrack,
|
||||
theMaterial->GetElement(i),
|
||||
theMaterial->GetTemperature()));
|
||||
@@ -532,6 +531,7 @@ void G4ParticleHPInelastic::BuildPhysicsTable(const G4ParticleDefinition& projec
|
||||
|
||||
if ( itry == 6 ) {
|
||||
// No Final State at all.
|
||||
/*
|
||||
G4bool exceptional = false;
|
||||
if ( (*(G4Element::GetElementTable()))[i]->GetNumberOfIsotopes() == 1 )
|
||||
{
|
||||
@@ -541,6 +541,16 @@ void G4ParticleHPInelastic::BuildPhysicsTable(const G4ParticleDefinition& projec
|
||||
G4cerr << " ELEMENT Z " << (*(G4Element::GetElementTable()))[i]->GetIsotope( 0 )->GetZ() << " N " << (*(G4Element::GetElementTable()))[i]->GetIsotope( 0 )->GetN() << G4endl; //1H
|
||||
throw G4HadronicException(__FILE__, __LINE__, "Channel: Do not know what to do with this element");
|
||||
}
|
||||
*/
|
||||
if ( G4ParticleHPManager::GetInstance()->GetVerboseLevel() > 1 ) {
|
||||
G4cout << "ParticleHP::Inelastic for " << projectile.GetParticleName() << ". Do not know what to do with element of \"" << (*(G4Element::GetElementTable()))[i]->GetName() << "\"." << G4endl;
|
||||
G4cout << "The components of the element are" << G4endl;
|
||||
//G4cout << "TKDB dataDirVariable = " << dataDirVariable << G4endl;
|
||||
for ( G4int ii = 0 ; ii < (G4int)( (*(G4Element::GetElementTable()))[i]->GetNumberOfIsotopes() ) ; ii++ ) {
|
||||
G4cout << " Z: " << (*(G4Element::GetElementTable()))[i]->GetIsotope( ii )->GetZ() << ", A: " << (*(G4Element::GetElementTable()))[i]->GetIsotope( ii )->GetN() << G4endl;
|
||||
}
|
||||
G4cout << "No possible final state data of the element is found in " << dataDirVariable << "." << G4endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
hpmanager->RegisterInelasticFinalStates( &projectile , theInelastic );
|
||||
|
||||
Reference in New Issue
Block a user