Import Geant4 8.0.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 14:36:02 +02:00
parent d93e1e39a9
commit 8a51e0bc40
5471 changed files with 99628 additions and 55248 deletions
@@ -67,7 +67,7 @@ EnergyAndMomentumCorrector(G4KineticTrackVector* Output, G4LorentzVector& TotalC
G4LorentzVector SumMom;
G4double SumMass = 0;
G4double TotalCollisionMass = TotalCollisionMom.m();
if( !(SumMom<1) && !(SumMom>-1) )
if( !(TotalCollisionMass<1) && !(TotalCollisionMass>-1) )
{
std::cout << "TotalCollisionMomentum = "<<TotalCollisionMom<<G4endl;
throw G4HadronicException(__FILE__, __LINE__, "G4ExcitedStringDecay received nan mass...");
@@ -79,14 +79,17 @@ EnergyAndMomentumCorrector(G4KineticTrackVector* Output, G4LorentzVector& TotalC
SumMom += Output->operator[](cHadron)->Get4Momentum();
if( !(SumMom<1) && !(SumMom>-1) )
{
throw G4HadronicException(__FILE__, __LINE__, "G4ExcitedStringDecay generated nan momentum...");
throw G4HadronicException(__FILE__, __LINE__, "G4ExcitedStringDecay::EnergyAndMomentumCorrector() received nan momentum...");
}
SumMass += Output->operator[](cHadron)->GetDefinition()->GetPDGMass();
if( !(SumMom<1) && !(SumMom>-1) )
if( !(SumMass<1) && !(SumMass>-1) )
{
throw G4HadronicException(__FILE__, __LINE__, "G4ExcitedStringDecay generated nan mass...");
throw G4HadronicException(__FILE__, __LINE__, "G4ExcitedStringDecay::EnergyAndMomentumCorrector() received nan mass...");
}
}
// Cannot correct a single particle
if (Output->size() < 2) return FALSE;
if (SumMass > TotalCollisionMass) return FALSE;
SumMass = SumMom.m2();
if (SumMass < 0) return FALSE;
@@ -120,6 +123,12 @@ EnergyAndMomentumCorrector(G4KineticTrackVector* Output, G4LorentzVector& TotalC
success = true;
break;
}
#ifdef debug_G4ExcitedStringDecay
std::cout << "Scale-1=" << Scale -1
<< ", TotalCollisionMass=" << TotalCollisionMass
<< ", Sum=" << Sum
<< std::endl;
#endif
}
if(!success)
@@ -22,7 +22,7 @@
//
//
// $Id: G4HadronBuilder.cc,v 1.4 2005/06/04 13:47:01 jwellisc Exp $
// GEANT4 tag $Name: geant4-07-01 $
// GEANT4 tag $Name: geant4-08-00 $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
@@ -22,7 +22,7 @@
//
//
// $Id: G4LundStringFragmentation.cc,v 1.4 2005/06/04 13:47:01 jwellisc Exp $
// GEANT4 tag $Name: geant4-07-01 $
// GEANT4 tag $Name: geant4-08-00 $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
@@ -22,7 +22,7 @@
//
//
// $Id: G4QGSMFragmentation.cc,v 1.4 2005/06/04 13:47:01 jwellisc Exp $
// GEANT4 tag $Name: geant4-07-01 $
// GEANT4 tag $Name: geant4-08-00 $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
@@ -22,7 +22,7 @@
//
//
// $Id: G4VKinkyStringDecay.cc,v 1.2 2005/06/04 13:47:01 jwellisc Exp $
// GEANT4 tag $Name: geant4-07-01 $
// GEANT4 tag $Name: geant4-08-00 $
// Maxim Komogorov
//
// -----------------------------------------------------------------------------
@@ -22,7 +22,7 @@
//
//
// $Id: G4VLongitudinalStringDecay.cc,v 1.4 2005/06/04 13:47:01 jwellisc Exp $
// GEANT4 tag $Name: geant4-07-01 $
// GEANT4 tag $Name: geant4-08-00 $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file