Import Geant4 11.1.1 source tree
This commit is contained in:
@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2023-02-06 Gabriele Cosmo (hadr-lend-V11-00-08)
|
||||
- Fixed potential uninitialised variables in MCGIDI_energy_parseMadlandNixFromTOM().
|
||||
|
||||
## 2022-11-26 Gabriele Cosmo (hadr-lend-V11-00-07)
|
||||
- Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
|
||||
|
||||
|
||||
@@ -310,7 +310,8 @@ err:
|
||||
static int MCGIDI_energy_parseMadlandNixFromTOM( statusMessageReporting *smr, xDataTOM_element *functional, MCGIDI_energy *energy ) {
|
||||
|
||||
int iE, length, nXs, i1, n;
|
||||
double E, T_M, EFL, EFH, argList[3], xs[] = { 1e-5, 1e-3, 1e-1, 1e1, 1e3, 1e5, 3e7 }, norm;
|
||||
double E=0., T_M=0., EFL=0., EFH=0., argList[3] = { 0., 0., 0. },
|
||||
xs[] = { 1e-5, 1e-3, 1e-1, 1e1, 1e3, 1e5, 3e7 }, norm;
|
||||
ptwXYPoints *ptwXY_TM = NULL, *pdfXY = NULL;
|
||||
ptwXYPoint *point;
|
||||
ptwXPoints *cdfX = NULL;
|
||||
|
||||
@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2023-02-06 Gabriele Cosmo (hadr-hpp-V11-00-20)
|
||||
- Minor cleanup in G4ParticleHPDeExGammas header for data initialisation.
|
||||
|
||||
## 2022-11-26 Gabriele Cosmo (hadr-hpp-V11-00-19)
|
||||
- Fixed more compilation warnings for implicit type conversions.
|
||||
- Some code cleanup.
|
||||
|
||||
@@ -46,31 +46,26 @@ class G4ParticleHPDeExGammas
|
||||
|
||||
G4ParticleHPDeExGammas()
|
||||
{
|
||||
levelStart = 0;
|
||||
levelSize = 0;
|
||||
nLevels = 0;
|
||||
theLevels = 0;
|
||||
}
|
||||
~G4ParticleHPDeExGammas()
|
||||
{
|
||||
if(levelStart!=0) delete [] levelStart;
|
||||
if(levelSize!=0) delete [] levelSize;
|
||||
if(theLevels!=0) delete [] theLevels;
|
||||
delete [] levelStart;
|
||||
delete [] levelSize;
|
||||
delete [] theLevels;
|
||||
}
|
||||
|
||||
void Init(std::istream & aDataFile);
|
||||
|
||||
inline G4ReactionProductVector * GetDecayGammas(G4int aLevel)
|
||||
{
|
||||
if(aLevel>nLevels-1 || aLevel<0) return 0;
|
||||
if(aLevel>nLevels-1 || aLevel<0) return nullptr;
|
||||
if(nLevels==0) return new G4ReactionProductVector();
|
||||
G4ReactionProductVector * result = new G4ReactionProductVector;
|
||||
G4DynamicParticleVector * theResult;
|
||||
|
||||
theResult = theLevels[aLevel]. GetDecayGammas();
|
||||
G4ReactionProduct * theCurrent;
|
||||
unsigned int i;
|
||||
for(i=0; i<theResult->size(); i++)
|
||||
for(unsigned int i=0; i<theResult->size(); ++i)
|
||||
{
|
||||
theCurrent = new G4ReactionProduct;
|
||||
*theCurrent = *(theResult->operator[](i));
|
||||
@@ -90,7 +85,7 @@ class G4ParticleHPDeExGammas
|
||||
|
||||
inline G4ParticleHPLevel * GetLevel(G4int i)
|
||||
{
|
||||
if(i>nLevels-1) return 0;
|
||||
if(i>nLevels-1) return nullptr;
|
||||
return theLevels+i;
|
||||
}
|
||||
|
||||
@@ -104,10 +99,10 @@ class G4ParticleHPDeExGammas
|
||||
}
|
||||
private:
|
||||
|
||||
G4int * levelStart;
|
||||
G4int * levelSize;
|
||||
G4int nLevels;
|
||||
G4ParticleHPLevel * theLevels;
|
||||
G4int * levelStart = nullptr;
|
||||
G4int * levelSize = nullptr;
|
||||
G4int nLevels = 0;
|
||||
G4ParticleHPLevel * theLevels = nullptr;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2023-02-06 Gabriele Cosmo (hadr-qgsm-V11-00-04)
|
||||
- Fixed potential uninitialised variables in G4QGSMSplitableHadron::GetValenceQuarkFlavors().
|
||||
|
||||
## 2022-10-07 Gabriele Cosmo (hadr-qgsm-V11-00-03)
|
||||
- Fixed compilation warning on Intel/icx compiler for variables set
|
||||
but not used in G4QGSMSplitableHadron and G4QGSParticipants.
|
||||
|
||||
@@ -225,8 +225,8 @@ void G4QGSMSplitableHadron::GetValenceQuarkFlavors(const G4ParticleDefinition *
|
||||
G4Parton *& Parton1, G4Parton *& Parton2)
|
||||
{
|
||||
// Note! convention aEnd = q or (qq)bar and bEnd = qbar or qq.
|
||||
G4int aEnd;
|
||||
G4int bEnd;
|
||||
G4int aEnd=0;
|
||||
G4int bEnd=0;
|
||||
G4int HadronEncoding = aPart->GetPDGEncoding();
|
||||
if (aPart->GetBaryonNumber() == 0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user