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

Import Geant4 11.4.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2026-03-19 16:51:22 +01:00
parent b4a16de652
commit 41f2dd7996
352 changed files with 26342 additions and 24532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/cascade/History
+5
View File
@@ -6,6 +6,11 @@ It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2025-12-16 Gabriele Cosmo (hadr-casc-V11-03-02)
- Directly use std::cbrt(double) in G4InuclSpecialFunctions, as now standard
and available in <cmath>, replacing old ad-hoc implementation.
Minor code formatting.
## 2025-11-26 Vladimir ivanchenko (hadr-casc-V11-03-01)
- G4BigBanger - fixed typo in the computation of probability, which is
identified by the new compiler and should not change any result.
source/processes/hadronic/models/cascade/cascade/include/G4InuclSpecialFunctions.hh
+22 -31
View File
@@ -23,21 +23,10 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// G4InuclSpecialFunctions namespace
//
// 20100114 M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
// 20100319 M. Kelsey -- Add optional mass argument to generateWithFixedTheta;
// define new generateWithRandomAngles, encapsulating code; define
// cbrt() cube-root function (in math.h, but not in <math>!)
// 20100412 M. Kelsey -- Modify paraMaker[Truncated] to take buffer as argument
// 20100914 M. Kelsey -- Migrate to integer A and Z. Discard unused binding
// energy functions
// 20120608 M. Kelsey -- Fix variable-name "shadowing" compiler warnings.
// 20130308 M. Kelsey -- New function to encapsulate INUCL power expansion
// 20130808 M. Kelsey -- Convert paraMaker[Truncated] to class object, to
// allow thread isolation
// 20130829 M. Kelsey -- Address Coverity #52158, 52161 for copy actions.
// 20150619 M. Kelsey -- Overload G4cbrt for case of integer arguments
// Original Author: Aatos Heikkinen, 2002
// --------------------------------------------------------------------
#ifndef G4INUCL_SPECIAL_FUNC_HH
#define G4INUCL_SPECIAL_FUNC_HH
@@ -48,8 +37,8 @@
template <int N> class G4CascadeInterpolator;
namespace G4InuclSpecialFunctions {
namespace G4InuclSpecialFunctions
{
G4double bindingEnergy(G4int A, G4int Z);
// NOTE: Used only by G4Fissioner
@@ -63,7 +52,7 @@ namespace G4InuclSpecialFunctions {
G4double csPN(G4double e);
G4double G4cbrt(G4double x); // Can't use "cbrt" name, clashes with <math.h>
G4double G4cbrt(G4double x); // Use std::cbrt from <cmath>
G4double G4cbrt(G4int n); // Use G4Pow::powN() here for speedup
G4double randomInuclPowers(G4double ekin, // Power series in Ekin, S
@@ -84,24 +73,26 @@ namespace G4InuclSpecialFunctions {
G4LorentzVector generateWithRandomAngles(G4double p, G4double mass=0.);
// This is an object to be instantiated by client code
class paraMaker {
public:
paraMaker(G4int verbose=0);
~paraMaker();
class paraMaker
{
public:
// NOTE: Passing Z as double here, to be used as interpolation argument
void getParams(G4double Z, std::pair<std::vector<G4double>,
std::vector<G4double> >& parms);
paraMaker(G4int verbose=0);
~paraMaker();
void getTruncated(G4double Z, std::pair<G4double, G4double>& parms);
paraMaker(const paraMaker& right) = delete;
paraMaker& operator=(const paraMaker& right) = delete;
private:
G4int verboseLevel;
G4CascadeInterpolator<5>* interp;
// NOTE: Passing Z as double here, to be used as interpolation argument
void getParams(G4double Z, std::pair<std::vector<G4double>,
std::vector<G4double> >& parms);
// No copy actions
paraMaker(const paraMaker& right);
paraMaker& operator=(const paraMaker& right);
void getTruncated(G4double Z, std::pair<G4double, G4double>& parms);
private:
G4int verboseLevel;
G4CascadeInterpolator<5>* interp;
};
}
source/processes/hadronic/models/cascade/cascade/src/G4InuclSpecialFunctions.cc
+28 -24
View File
@@ -23,17 +23,10 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// G4InuclSpecialFunctions namespace implementation
//
// 20100114 M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
// 20100914 M. Kelsey -- Migrate to integer A and Z. Discard pointless
// verbosity.
// 20120608 M. Kelsey -- Fix variable-name "shadowing" compiler warnings.
// 20130308 M. Kelsey -- New function to compute INUCL-style random value
// 20130314 M. Kelsey -- Restore null initializer and if-block for _TLS_.
// 20130924 M. Kelsey -- Use G4Log, G4Exp, G4Pow for CPU speedup
// 20150619 M. Kelsey -- Define G4cbrt(int) to use G4Pow::Z13, rearrange
// FermiEnergy() to use G4Pow::Z23.
// 20150622 M. Kelsey -- Use G4AutoDelete for _TLS_ buffers.
// Original Author: Aatos Heikkinen, 2002
// --------------------------------------------------------------------
#include <cmath>
@@ -52,7 +45,8 @@
G4double
G4InuclSpecialFunctions::randomInuclPowers(G4double ekin,
const G4double (&coeff)[4][4]) {
const G4double (&coeff)[4][4])
{
G4Pow* theG4Pow = G4Pow::GetInstance();
G4double S = G4UniformRand(); // Random fraction for expansion
@@ -75,11 +69,13 @@ G4InuclSpecialFunctions::randomInuclPowers(G4double ekin,
G4double G4InuclSpecialFunctions::getAL(G4int A) {
G4double G4InuclSpecialFunctions::getAL(G4int A)
{
return 0.76 + 2.2 / G4cbrt(A);
}
G4double G4InuclSpecialFunctions::csNN(G4double e) {
G4double G4InuclSpecialFunctions::csNN(G4double e)
{
G4double snn;
if (e < 40.0) {
@@ -91,7 +87,8 @@ G4double G4InuclSpecialFunctions::csNN(G4double e) {
return snn;
}
G4double G4InuclSpecialFunctions::csPN(G4double e) {
G4double G4InuclSpecialFunctions::csPN(G4double e)
{
G4double spn;
if (e < 40.0) {
@@ -105,7 +102,8 @@ G4double G4InuclSpecialFunctions::csPN(G4double e) {
// calculates the nuclei Fermi energy for 0 - neutron and 1 - proton
G4double G4InuclSpecialFunctions::FermiEnergy(G4int A, G4int Z, G4int ntype) {
G4double G4InuclSpecialFunctions::FermiEnergy(G4int A, G4int Z, G4int ntype)
{
G4Pow* g4pow = G4Pow::GetInstance();
const G4double C = 55.4 / g4pow->Z23(A);
G4double arg = (ntype==0) ? g4pow->Z23(A-Z) : g4pow->Z23(Z);
@@ -113,16 +111,18 @@ G4double G4InuclSpecialFunctions::FermiEnergy(G4int A, G4int Z, G4int ntype) {
return C * arg;
}
G4double G4InuclSpecialFunctions::G4cbrt(G4double x) {
return x==0 ? 0. : (x<0?-1.:1.)*G4Exp(G4Log(std::fabs(x))/3.);
G4double G4InuclSpecialFunctions::G4cbrt(G4double x)
{
return std::cbrt(x);
}
G4double G4InuclSpecialFunctions::G4cbrt(G4int n) {
G4double G4InuclSpecialFunctions::G4cbrt(G4int n)
{
return n==0 ? 0. : (n<0?-1.:1.)*G4Pow::GetInstance()->Z13(std::abs(n));
}
G4double G4InuclSpecialFunctions::randomGauss(G4double sigma) {
G4double G4InuclSpecialFunctions::randomGauss(G4double sigma)
{
const G4double eps = 1.0e-6;
G4double r1 = G4UniformRand();
r1 = r1 > eps ? r1 : eps;
@@ -133,11 +133,13 @@ G4double G4InuclSpecialFunctions::randomGauss(G4double sigma) {
return sigma * std::sin(twopi * r1) * std::sqrt(-2.0 * G4Log(r2));
}
G4double G4InuclSpecialFunctions::randomPHI() {
G4double G4InuclSpecialFunctions::randomPHI()
{
return twopi*G4UniformRand();
}
std::pair<G4double, G4double> G4InuclSpecialFunctions::randomCOS_SIN() {
std::pair<G4double, G4double> G4InuclSpecialFunctions::randomCOS_SIN()
{
G4double CT = 1.0 - 2.0*G4UniformRand();
return std::pair<G4double, G4double>(CT, std::sqrt(1.0 - CT*CT));
@@ -145,7 +147,8 @@ std::pair<G4double, G4double> G4InuclSpecialFunctions::randomCOS_SIN() {
G4LorentzVector
G4InuclSpecialFunctions::generateWithFixedTheta(G4double ct, G4double p,
G4double mass) {
G4double mass)
{
G4double phi = randomPHI();
G4double pt = p * std::sqrt(std::fabs(1.0 - ct * ct));
@@ -171,7 +174,8 @@ G4InuclSpecialFunctions::generateWithFixedTheta(G4double ct, G4double p,
}
G4LorentzVector
G4InuclSpecialFunctions::generateWithRandomAngles(G4double p, G4double mass) {
G4InuclSpecialFunctions::generateWithRandomAngles(G4double p, G4double mass)
{
std::pair<G4double, G4double> COS_SIN = randomCOS_SIN();
G4double phi = randomPHI();
G4double pt = p * COS_SIN.second;