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

Import Geant4 10.5.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/util/History
+23 -1
View File
@@ -1,4 +1,4 @@
$Id: History 107451 2017-11-14 11:27:57Z gcosmo $
$Id: History 110267 2018-05-17 14:34:00Z gcosmo $
-------------------------------------------------------------------
==========================================================
@@ -15,6 +15,28 @@ code and to keep track of all tags.
* Please list in reverse chronological order (last date on top)
---------------------------------------------------------------
17 May 2017 Jonathan Madsen (hadr-mod-util-V10-04-03)
- updated "thread-local-static-var" model to
"function-returning-thread-local-static-reference" model
which fixes Windows DLL + MT
21 December 2017 Alberto Ribon (hadr-mod-util-V10-04-02)
- G4Fancy3DNucleus : in the case of difficulties in the method
ChooseFermiMomenta(), emit a "JustWarning" exception instead of
writing to the error stream.
12 December 2017 Alberto Ribon (hadr-mod-util-V10-04-01)
- G4Nucleon : clean-up.
- G4Fancy3DNucleus : fixed irreproducibility seen with (but not caused by)
the previous tag; added also loop checks; general clean up.
11 December 2017 V. Uzhinsky (hadr-mod-util-V10-04-00)
- The first implementation of alpha cluster structure of carbon nuclei
is done in the G4Fancy3DNucleus according to the paper
(P. Bozek, W. Broniowski, E.R. Arriola and M. Rybczynski,
Phys. Rev. C90, 064902 (2014)). The class G4Nucleon is also improved
a little bit.
14 November 2017 Alberto Ribon (hadr-mod-util-V10-03-15)
- G4SampleResonance: added protection for rare cases when a wide parent
resonance, with a very small dynamic mass, decays into another wide
source/processes/hadronic/models/util/include/G4Fancy3DNucleus.hh
+4 -3
View File
@@ -96,8 +96,8 @@ class G4Fancy3DNucleus : public G4V3DNucleus
void CenterNucleons();
void DoTranslation(const G4ThreeVector & theShift);
const G4VNuclearDensity * GetNuclearDensity() const;
void SortNucleonsIncZ(); // on increased Z-coordinates Uzhi 29.08.08
void SortNucleonsDecZ(); // on decreased Z-coordinates Uzhi 29.08.08
void SortNucleonsIncZ();
void SortNucleonsDecZ();
private:
@@ -108,7 +108,8 @@ class G4Fancy3DNucleus : public G4V3DNucleus
G4int currentNucleon;
G4VNuclearDensity * theDensity;
G4FermiMomentum theFermi;
const G4double nucleondistance;
//const G4double nucleondistance; // Uzhi Dec. 2017
G4double nucleondistance; // Uzhi Dec. 2017
G4double excitationEnergy;
std::vector<G4ThreeVector> places; // For selecting locations
source/processes/hadronic/models/util/include/G4Fragment.hh
+6 -6
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Fragment.hh 104963 2017-07-03 07:38:44Z gcosmo $
// $Id: G4Fragment.hh 110267 2018-05-17 14:34:00Z gcosmo $
//
//---------------------------------------------------------------------
//
@@ -220,20 +220,20 @@ private:
// ============= INLINE METHOD IMPLEMENTATIONS ===================
#if defined G4HADRONIC_ALLOC_EXPORT
extern G4DLLEXPORT G4ThreadLocal G4Allocator<G4Fragment> *pFragmentAllocator;
extern G4DLLEXPORT G4Allocator<G4Fragment>*& pFragmentAllocator();
#else
extern G4DLLIMPORT G4ThreadLocal G4Allocator<G4Fragment> *pFragmentAllocator;
extern G4DLLIMPORT G4Allocator<G4Fragment>*& pFragmentAllocator();
#endif
inline void * G4Fragment::operator new(size_t)
{
if (!pFragmentAllocator) { pFragmentAllocator = new G4Allocator<G4Fragment>; }
return (void*) pFragmentAllocator->MallocSingle();
if (!pFragmentAllocator()) { pFragmentAllocator() = new G4Allocator<G4Fragment>; }
return (void*) pFragmentAllocator()->MallocSingle();
}
inline void G4Fragment::operator delete(void * aFragment)
{
pFragmentAllocator->FreeSingle((G4Fragment *) aFragment);
pFragmentAllocator()->FreeSingle((G4Fragment *) aFragment);
}
inline void G4Fragment::CalculateExcitationEnergy()
source/processes/hadronic/models/util/include/G4Nucleon.hh
+14 -6
View File
@@ -64,8 +64,8 @@ class G4Nucleon : public G4VKineticNucleon
public:
inline void SetPosition(G4ThreeVector & aPosition) {thePosition = aPosition;}
virtual inline const G4ThreeVector & GetPosition() const {return thePosition;}
void SetPosition(const G4ThreeVector aPosition);
const G4ThreeVector& GetPosition() const;
inline void SetMomentum(G4LorentzVector & aMomentum) {theMomentum = aMomentum;}
inline const G4LorentzVector& GetMomentum() const {return theMomentum;}
@@ -77,9 +77,8 @@ class G4Nucleon : public G4VKineticNucleon
inline void SetParticleType(G4Proton * aProton) {theParticleType = aProton;}
inline void SetParticleType(G4Neutron *aNeutron){theParticleType = aNeutron;}
inline void SetParticleType(G4AntiProton * aAntiProton) {theParticleType =aAntiProton;} //VU
inline void SetParticleType(G4AntiNeutron *aAntiNeutron){theParticleType =aAntiNeutron;}//VU
inline void SetParticleType(G4AntiProton * aAntiProton) {theParticleType =aAntiProton;}
inline void SetParticleType(G4AntiNeutron *aAntiNeutron){theParticleType =aAntiNeutron;}
inline const G4ParticleDefinition* GetParticleType() const {return theParticleType;}
virtual const G4ParticleDefinition* GetDefinition() const {return theParticleType;}
@@ -131,6 +130,15 @@ inline G4Nucleon& G4Nucleon::operator=(const G4Nucleon& right)
return *this;
}
inline void G4Nucleon::SetPosition(const G4ThreeVector aPosition)
{
thePosition = aPosition;
}
inline const G4ThreeVector& G4Nucleon::GetPosition() const
{
return thePosition;
}
#endif
source/processes/hadronic/models/util/src/G4DecayKineticTracks.cc
+2
View File
@@ -37,10 +37,12 @@
// Decay all input tracks, put daughters onto end of list
G4DecayKineticTracks::G4DecayKineticTracks(G4KineticTrackVector *tracks) {
if (tracks) Decay(tracks);
}
void G4DecayKineticTracks::Decay(G4KineticTrackVector *tracks) const {
if (!tracks) return;
G4KineticTrackVector* daughters = 0;
source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc
+164 -70
View File
@@ -49,13 +49,18 @@
#include "G4Pow.hh"
#include "G4HadronicException.hh"
#include "Randomize.hh"
#include "G4ThreeVector.hh"
#include "G4RandomDirection.hh"
#include "G4LorentzRotation.hh"
#include "G4RotationMatrix.hh"
#include "G4PhysicalConstants.hh"
G4Fancy3DNucleus::G4Fancy3DNucleus()
: myA(0), myZ(0), theNucleons(250), currentNucleon(-1), theDensity(0),
nucleondistance(0.8*fermi),excitationEnergy(0.),
places(250), momentum(250), fermiM(250), testSums(250)
{
//G4cout <<"G4Fancy3DNucleus::G4Fancy3DNucleus()"<<G4endl;
}
G4Fancy3DNucleus::~G4Fancy3DNucleus()
@@ -76,9 +81,13 @@ void G4Fancy3DNucleus::Init(G4double theA, G4double theZ)
void G4Fancy3DNucleus::Init(G4int theA, G4int theZ)
{
// G4cout << "G4Fancy3DNucleus::Init(theA, theZ) called"<<G4endl;
currentNucleon=-1;
theNucleons.clear();
nucleondistance = 0.8*fermi;
places.clear();
momentum.clear();
fermiM.clear();
testSums.clear();
myZ = theZ;
myA= theA;
@@ -86,11 +95,10 @@ void G4Fancy3DNucleus::Init(G4int theA, G4int theZ)
theNucleons.resize(myA); // Pre-loads vector with empty elements
// G4cout << "myA, myZ" << myA << ", " << myZ << G4endl;
if(theDensity) delete theDensity;
if ( myA < 17 ) {
theDensity = new G4NuclearShellModelDensity(myA, myZ);
if( myA == 12 ) nucleondistance=0.9*fermi;
} else {
theDensity = new G4NuclearFermiDensity(myA, myZ);
}
@@ -101,7 +109,7 @@ void G4Fancy3DNucleus::Init(G4int theA, G4int theZ)
ChoosePositions();
// CenterNucleons(); // This would introduce a bias
if( myA == 12 ) CenterNucleons(); // This would introduce a bias
ChooseFermiMomenta();
@@ -112,7 +120,6 @@ void G4Fancy3DNucleus::Init(G4int theA, G4int theZ)
theNucleons[aNucleon].SetBindingEnergy(Ebinding);
}
return;
}
@@ -141,7 +148,7 @@ bool G4Fancy3DNucleusHelperForSortInZ(const G4Nucleon& nuc1, const G4Nucleon& nu
return nuc1.GetPosition().z() < nuc2.GetPosition().z();
}
void G4Fancy3DNucleus::SortNucleonsIncZ() // on increased Z-coordinates Uzhi 29.08.08
void G4Fancy3DNucleus::SortNucleonsIncZ()
{
if (theNucleons.size() < 2 ) return; // Avoid unnecesary work
@@ -149,7 +156,7 @@ void G4Fancy3DNucleus::SortNucleonsIncZ() // on increased Z-coordinates Uzhi 29.
G4Fancy3DNucleusHelperForSortInZ);
}
void G4Fancy3DNucleus::SortNucleonsDecZ() // on decreased Z-coordinates Uzhi 29.08.08
void G4Fancy3DNucleus::SortNucleonsDecZ()
{
if (theNucleons.size() < 2 ) return; // Avoid unnecessary work
SortNucleonsIncZ();
@@ -286,72 +293,153 @@ void G4Fancy3DNucleus::ChooseNucleons()
void G4Fancy3DNucleus::ChoosePositions()
{
G4int i=0;
G4ThreeVector aPos, delta;
G4bool freeplace;
const G4double nd2=sqr(nucleondistance);
G4double maxR=GetNuclearRadius(0.001); // there are no nucleons at a
// relative Density of 0.01
G4int jr=0;
G4int jx,jy;
G4double arand[600];
G4double *prand=arand;
if( myA != 12) {
places.clear(); // Reset data buffer
G4int interationsLeft=1000*myA;
while ( (i < myA) && (--interationsLeft>0)) /* Loop checking, 30-Oct-2015, G.Folger */
G4int i=0;
G4ThreeVector aPos, delta;
G4bool freeplace;
const G4double nd2=sqr(nucleondistance);
G4double maxR=GetNuclearRadius(0.001); // there are no nucleons at a
// relative Density of 0.01
G4int jr=0;
G4int jx,jy;
G4double arand[600];
G4double *prand=arand;
places.clear(); // Reset data buffer
G4int interationsLeft=1000*myA;
while ( (i < myA) && (--interationsLeft>0)) /* Loop checking, 30-Oct-2015, G.Folger */
{
do
{
if ( jr < 3 )
{
do
{
if ( jr < 3 )
{
jr=std::min(600,9*(myA - i));
G4RandFlat::shootArray(jr,prand);
//CLHEP::RandFlat::shootArray(jr, prand );
}
jx=--jr;
jy=--jr;
aPos.set((2*arand[jx]-1.), (2*arand[jy]-1.), (2*arand[--jr]-1.));
} while (aPos.mag2() > 1. ); /* Loop checking, 30-Oct-2015, G.Folger */
aPos *=maxR;
G4double density=theDensity->GetRelativeDensity(aPos);
if (G4UniformRand() < density)
{
freeplace= true;
std::vector<G4ThreeVector>::iterator iplace;
for( iplace=places.begin(); iplace!=places.end() && freeplace;++iplace)
{
delta = *iplace - aPos;
freeplace= delta.mag2() > nd2;
}
if ( freeplace )
{
G4double pFermi=theFermi.GetFermiMomentum(theDensity->GetDensity(aPos));
// protons must at least have binding energy of CoulombBarrier, so
// assuming the Fermi energy corresponds to a potential, we must place these such
// that the Fermi Energy > CoulombBarrier
if (theNucleons[i].GetDefinition() == G4Proton::Proton())
{
G4double nucMass = theNucleons[i].GetDefinition()->GetPDGMass();
G4double eFermi= std::sqrt( sqr(pFermi) + sqr(nucMass) )
- nucMass;
if (eFermi <= CoulombBarrier() ) freeplace=false;
}
}
if ( freeplace )
{
theNucleons[i].SetPosition(aPos);
places.push_back(aPos);
++i;
}
}
jr=std::min(600,9*(myA - i));
G4RandFlat::shootArray(jr,prand);
//CLHEP::RandFlat::shootArray(jr, prand );
}
if (interationsLeft<=0) {
G4Exception("model/util/G4Fancy3DNucleus.cc", "mod_util001", FatalException,
"Problem to place nucleons");
jx=--jr;
jy=--jr;
aPos.set((2*arand[jx]-1.), (2*arand[jy]-1.), (2*arand[--jr]-1.));
} while (aPos.mag2() > 1. ); /* Loop checking, 30-Oct-2015, G.Folger */
aPos *=maxR;
G4double density=theDensity->GetRelativeDensity(aPos);
if (G4UniformRand() < density)
{
freeplace= true;
std::vector<G4ThreeVector>::iterator iplace;
for( iplace=places.begin(); iplace!=places.end() && freeplace;++iplace)
{
delta = *iplace - aPos;
freeplace= delta.mag2() > nd2;
}
if ( freeplace ) {
G4double pFermi=theFermi.GetFermiMomentum(theDensity->GetDensity(aPos));
// protons must at least have binding energy of CoulombBarrier, so
// assuming the Fermi energy corresponds to a potential, we must place these such
// that the Fermi Energy > CoulombBarrier
if (theNucleons[i].GetDefinition() == G4Proton::Proton())
{
G4double nucMass = theNucleons[i].GetDefinition()->GetPDGMass();
G4double eFermi= std::sqrt( sqr(pFermi) + sqr(nucMass) ) - nucMass;
if (eFermi <= CoulombBarrier() ) freeplace=false;
}
}
if ( freeplace ) {
theNucleons[i].SetPosition(aPos);
places.push_back(aPos);
++i;
}
}
}
if (interationsLeft<=0) {
G4Exception("model/util/G4Fancy3DNucleus.cc", "mod_util001", FatalException,
"Problem to place nucleons");
}
} else {
// Start insertion
// Alpha cluster structure of carbon nuclei, C-12, is implemented according to
// P. Bozek, W. Broniowski, E.R. Arriola and M. Rybczynski
// Phys. Rev. C90, 064902 (2014)
const G4double Lbase=3.05*fermi;
const G4double Disp=0.552; // 0.91^2*2/3 fermi^2
const G4double nd2=sqr(nucleondistance);
const G4ThreeVector Corner1=G4ThreeVector( Lbase/2., 0., 0.);
const G4ThreeVector Corner2=G4ThreeVector(-Lbase/2., 0., 0.);
const G4ThreeVector Corner3=G4ThreeVector( 0.,Lbase*0.866, 0.); // 0.866=sqrt(3)/2
G4ThreeVector R1;
R1=G4ThreeVector(G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp))*fermi + Corner1;
theNucleons[0].SetPosition(R1); // First nucleon of the first He-4
G4int loopCounterLeft = 10000;
for(G4int ii=1; ii<4; ii++) // 2 - 4 nucleons of the first He-4
{
G4bool Continue;
do
{
R1=G4ThreeVector(G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp))*fermi + Corner1;
theNucleons[ii].SetPosition(R1);
Continue=false;
for(G4int jj=0; jj < ii; jj++)
{
if( (theNucleons[ii].GetPosition() - theNucleons[jj].GetPosition()).mag2() <= nd2 ) {Continue = true; break;}
}
} while( Continue && --loopCounterLeft > 0 ); /* Loop checking, 12-Dec-2017, A.Ribon */
}
if ( loopCounterLeft <= 0 ) {
G4Exception("model/util/G4Fancy3DNucleus.cc", "mod_util002", FatalException,
"Unable to find a good position for the first alpha cluster");
}
loopCounterLeft = 10000;
for(G4int ii=4; ii<8; ii++) // 5 - 8 nucleons of the second He-4
{
G4bool Continue;
do
{
R1=G4ThreeVector(G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp))*fermi + Corner2;
theNucleons[ii].SetPosition(R1);
Continue=false;
for(G4int jj=0; jj < ii; jj++)
{
if( (theNucleons[ii].GetPosition() - theNucleons[jj].GetPosition()).mag2() <= nd2 ) {Continue = true; break;}
}
} while( Continue && --loopCounterLeft > 0 ); /* Loop checking, 12-Dec-2017, A.Ribon */
}
if ( loopCounterLeft <= 0 ) {
G4Exception("model/util/G4Fancy3DNucleus.cc", "mod_util003", FatalException,
"Unable to find a good position for the second alpha cluster");
}
loopCounterLeft = 10000;
for(G4int ii=8; ii<12; ii++) // 9 - 12 nucleons of the third He-4
{
G4bool Continue;
do
{
R1=G4ThreeVector(G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp), G4RandGauss::shoot(0.,Disp))*fermi + Corner3;
theNucleons[ii].SetPosition(R1);
Continue=false;
for(G4int jj=0; jj < ii; jj++)
{
if( (theNucleons[ii].GetPosition() - theNucleons[jj].GetPosition()).mag2() <= nd2 ) {Continue = true; break;}
}
} while( Continue && --loopCounterLeft > 0 ); /* Loop checking, 12-Dec-2017, A.Ribon */
}
if ( loopCounterLeft <= 0 ) {
G4Exception("model/util/G4Fancy3DNucleus.cc", "mod_util004", FatalException,
"Unable to find a good position for the third alpha cluster");
}
G4LorentzRotation RandomRotation;
RandomRotation.rotateZ(2.*pi*G4UniformRand());
RandomRotation.rotateY(std::acos(2.*G4UniformRand()-1.));
// Randomly rotation of the created nucleus
G4LorentzVector Pos;
for(G4int ii=0; ii<myA; ii++ )
{
Pos=G4LorentzVector(theNucleons[ii].GetPosition(),0.); Pos *=RandomRotation;
G4ThreeVector NewPos = Pos.vect();
theNucleons[ii].SetPosition(NewPos);
}
}
}
void G4Fancy3DNucleus::ChooseFermiMomenta()
@@ -384,7 +472,13 @@ void G4Fancy3DNucleus::ChooseFermiMomenta()
}
} else
{
G4cerr << "G4Fancy3DNucleus: difficulty finding proton momentum" << G4endl;
//AR-21Dec2017 : emit a "JustWarning" exception instead of writing on the error stream.
//G4cerr << "G4Fancy3DNucleus: difficulty finding proton momentum" << G4endl;
G4ExceptionDescription ed;
ed << "Nucleus Z A " << myZ << " " << myA << G4endl;
ed << "proton with eMax=" << eMax << G4endl;
G4Exception( "G4Fancy3DNucleus::ChooseFermiMomenta(): difficulty finding proton momentum, set it to (0,0,0)",
"HAD_FANCY3DNUCLEUS_001", JustWarning, ed );
mom=G4ThreeVector(0,0,0);
}
source/processes/hadronic/models/util/src/G4Fragment.cc
+7 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Fragment.cc 105013 2017-07-04 11:40:46Z gcosmo $
// $Id: G4Fragment.cc 110267 2018-05-17 14:34:00Z gcosmo $
//
//---------------------------------------------------------------------
//
@@ -43,7 +43,12 @@
#include "G4ios.hh"
#include <iomanip>
G4ThreadLocal G4Allocator<G4Fragment> *pFragmentAllocator = nullptr;
G4Allocator<G4Fragment>*& pFragmentAllocator()
{
G4ThreadLocalStatic G4Allocator<G4Fragment>* _instance = nullptr;
return _instance;
}
const G4double G4Fragment::minFragExcitation = 10.*CLHEP::eV;
// Default constructor