Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
==========================================================
|
||||
Geant4 - an Object-Oriented Toolkit for Physics Simulation
|
||||
==========================================================
|
||||
$Id: History 106719 2017-10-20 09:44:30Z gcosmo $
|
||||
$Id: History 110281 2018-05-17 14:51:46Z gcosmo $
|
||||
---------------------------------------------------------------------
|
||||
|
||||
History file for the ABLA evaporation/fission model
|
||||
@@ -16,6 +16,26 @@ code and to keep track of all tags.
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
17 May 2018 - Jose Luis Rodriguez Sanchez (hadr-abla-V10-04-03)
|
||||
--------------------------------------------------
|
||||
- Removed obsolete documents.
|
||||
|
||||
17 May 2018 - Jose Luis Rodriguez Sanchez (hadr-abla-V10-04-02)
|
||||
--------------------------------------------------
|
||||
- Cleaning some files and update information.
|
||||
|
||||
14 May 2018 - Jose Luis Rodriguez Sanchez (hadr-abla-V10-04-01)
|
||||
--------------------------------------------------
|
||||
- Removed obsolete test.
|
||||
|
||||
14 May 2018 - Jose Luis Rodriguez Sanchez (hadr-abla-V10-04-00)
|
||||
--------------------------------------------------
|
||||
- Update some parameters and right tag.
|
||||
|
||||
12 May 2018 - Jose Luis Rodriguez Sanchez (hadr-abla-V10-03-01)
|
||||
--------------------------------------------------
|
||||
- Update some parameters.
|
||||
|
||||
19 October 2017 - Jose Luis Rodriguez Sanchez (hadr-abla-V10-03-00)
|
||||
--------------------------------------------------
|
||||
- New C++ version of abla07
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
@@ -67,8 +67,8 @@ private:
|
||||
G4Abla *theABLAModel;
|
||||
G4long eventNumber;
|
||||
|
||||
/// \brief Convert an Abla particle to a G4ReactionProduct
|
||||
G4ReactionProduct *toG4Particle(G4int A, G4int Z , G4double kinE, G4double px, G4double py, G4double pz) const;
|
||||
/// \brief Convert an Abla particle to a G4DynamicParticle
|
||||
G4ReactionProduct *toG4Particle(G4int A, G4int Z, G4double kinE, G4double px, G4double py, G4double pz) const;
|
||||
|
||||
/// \brief Convert A and Z to a G4ParticleDefinition
|
||||
G4ParticleDefinition *toG4ParticleDefinition (G4int A, G4int Z) const;
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -24,23 +24,25 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
#define ABLAXX_IN_GEANT4_MODE 1
|
||||
|
||||
#include "globals.hh"
|
||||
|
||||
#include "G4AblaDataFile.hh"
|
||||
//#include "G4HadronicException.hh"
|
||||
|
||||
#ifdef ABLAXX_IN_GEANT4_MODE
|
||||
#include "globals.hh"
|
||||
#else
|
||||
#include "G4INCLGeant4Compat.hh"
|
||||
#endif
|
||||
|
||||
#include <fstream>
|
||||
#include <cmath>
|
||||
#include <iostream>
|
||||
@@ -121,7 +123,7 @@ bool G4AblaDataFile::readData()
|
||||
if (!((buf1->is_open()) && (buf2->is_open()) && (buf3->is_open()) && (buf4->is_open()) && (buf5->is_open()) && (buf6->is_open()) && (buf7->is_open()))) {
|
||||
#ifdef ABLAXX_IN_GEANT4_MODE
|
||||
G4ExceptionDescription ed;
|
||||
ed << " Data missing: could not find ABLA data file in " << dataPath
|
||||
ed << "Data missing: could not find ABLA data file in " << dataPath
|
||||
<< "defined by environment variable G4ABLADATA" << G4endl;
|
||||
G4Exception("G4AblaDataFile::readData()", "ABLA", FatalException, ed);
|
||||
#else
|
||||
|
||||
@@ -24,12 +24,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
#define ABLAXX_IN_GEANT4_MODE 1
|
||||
|
||||
#include "globals.hh"
|
||||
@@ -44,8 +45,6 @@
|
||||
#include "G4IonTable.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
#include "G4PhysicalConstants.hh"
|
||||
//#include "G4INCLParticleTable.hh"
|
||||
//#include "G4INCLGlobals.hh"
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
|
||||
@@ -115,10 +114,9 @@ G4ParticleDefinition *G4AblaInterface::toG4ParticleDefinition(G4int A, G4int Z)
|
||||
else if(A == 3 && Z == 1) return G4Triton::Triton();
|
||||
else if(A == 3 && Z == 2) return G4He3::He3();
|
||||
else if(A == 4 && Z == 2) return G4Alpha::Alpha();
|
||||
else if(A > 0 && Z > 0 && A >= Z) { // Returns ground state ion definition
|
||||
else if(A > 0 && Z > 0 && A > Z) { // Returns ground state ion definition. No hyper-nucleus allows in Geant4
|
||||
return G4IonTable::GetIonTable()->GetIon(Z, A, 0);
|
||||
} else { // Error, unrecognized particle
|
||||
G4cout << "Can't convert particle with A=" << A << ", Z=" << Z << " to G4ParticleDefinition, trouble ahead" << G4endl;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -127,11 +125,11 @@ G4ReactionProduct *G4AblaInterface::toG4Particle(G4int A, G4int Z,
|
||||
G4double kinE,
|
||||
G4double px,
|
||||
G4double py, G4double pz) const {
|
||||
G4ParticleDefinition *def = toG4ParticleDefinition(A, Z);
|
||||
const G4ParticleDefinition *def = toG4ParticleDefinition(A, Z);
|
||||
if(def == 0) { // Check if we have a valid particle definition
|
||||
return 0;
|
||||
}
|
||||
const double energy = kinE * MeV;
|
||||
const G4double energy = kinE * MeV;
|
||||
const G4ThreeVector momentum(px, py, pz);
|
||||
const G4ThreeVector momentumDirection = momentum.unit();
|
||||
G4DynamicParticle p(def, momentumDirection, energy);
|
||||
@@ -145,12 +143,17 @@ void G4AblaInterface::ModelDescription(std::ostream& outFile) const {
|
||||
}
|
||||
|
||||
void G4AblaInterface::DeExciteModelDescription(std::ostream& outFile) const {
|
||||
outFile << "ABLA++ is a statistical model for nuclear de-excitation. It simulates\n"
|
||||
outFile
|
||||
<< "ABLA++ is a statistical model for nuclear de-excitation. It simulates\n"
|
||||
<< "evaporation of neutrons, protons and alpha particles, as well as fission\n"
|
||||
<< "where applicable. The code included in Geant4 is a C++ translation of the\n"
|
||||
<< "original Fortran code. More details about the physics are available in the\n"
|
||||
<< "the Geant4 Physics Reference Manual and in the reference articles.\n\n"
|
||||
<< "Reference:\n"
|
||||
<< "A. Kelic, M. V. Ricciardi, and K. H. Schmidt, in Proceedings of Joint ICTP-IAEA Advanced Workshop on Model Codes for Spallation Reactions, ICTP Trieste, Italy, 4–8 February 2008, edited by D. Filges, S. Leray, Y. Yariv, A. Mengoni, A. Stanculescu, and G. Mank (IAEA INDC(NDS)-530, Vienna, 2008), pp. 181–221.\n\n"; }
|
||||
<< "A. Kelic, M. V. Ricciardi, and K. H. Schmidt, in Proceedings of Joint\n"
|
||||
<< "ICTP-IAEA Advanced Workshop on Model Codes for Spallation Reactions,\n"
|
||||
<< "ICTP Trieste, Italy, 4–8 February 2008, edited by D. Filges, S. Leray, Y. Yariv,\n"
|
||||
<< "A. Mengoni, A. Stanculescu, and G. Mank (IAEA INDC(NDS)-530, Vienna, 2008), pp. 181–221.\n\n";
|
||||
}
|
||||
|
||||
#endif // ABLAXX_IN_GEANT4_MODE
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
@@ -24,12 +24,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// ABLAXX statistical de-excitation model
|
||||
// Jose Luis Rodriguez, CEA (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (translation)
|
||||
// Christelle Schmidt, IPNL (fission code)
|
||||
// Jose Luis Rodriguez, GSI (translation from ABLA07 and contact person)
|
||||
// Pekka Kaitaniemi, HIP (initial translation of ablav3p)
|
||||
// Aleksandra Kelic, GSI (ABLA07 code)
|
||||
// Davide Mancusi, CEA (contact person INCL)
|
||||
// Aatos Heikkinen, HIP (project coordination)
|
||||
//
|
||||
|
||||
#define ABLAXX_IN_GEANT4_MODE 1
|
||||
|
||||
#include "globals.hh"
|
||||
|
||||
Reference in New Issue
Block a user