Import Geant4 11.2.1 source tree

2024-02-16 14:58:45 +01:00
parent 860a2b92bf
commit dda54bbdcf
331 changed files with 48457 additions and 50699 deletions
@@ -5,6 +5,16 @@ which **must** added in reverse chronological order (newest at the top).
 It must **not** be used as a substitute for writing good git commit messages!

 -------------------------------------------------------------------------------
+
+## 2024-01-29 Vladimir Ivanchenko (hadr-lend-V11-01-03)
+- MCGIDI_product, MCGIDI_outputChannel, MCGIDI_distribution - fixed alma9-gcc131
+    compilation warnings seen in CMSSW
+
+## 2023-12-18 Gabriele Cosmo
+- Fixed compilation error on latest Windows VC++ compiler 17.8.3 for use of
+  std::isfinite() in nf_specialFunctions_h and in nf_floatToShortestString().
+  Addressing problem report #2582.
+
 ## 2023-11-03 Ben Morgan (hadr-lend-V11-01-02)
 - Use "G4" prefixed version of EXPAT/ZLIB CMake variables

@@ -8,12 +8,11 @@

 #include <math.h>
 #include <float.h>
-#include <nf_utilities.h>
+
+#include "nf_utilities.h"

 #ifdef WIN32
-#define isfinite _finite
 #define M_PI 3.141592653589793238463
-/*#define INFINITY (DBL_MAX+DBL_MAX)*/
 #endif

 #if defined __cplusplus
@@ -61,7 +61,7 @@ int MCGIDI_distribution_release( statusMessageReporting *smr, MCGIDI_distributio
 int MCGIDI_distribution_parseFromTOM( statusMessageReporting *smr, xDataTOM_element *element, MCGIDI_product *product, MCGIDI_POPs * /*pops*/, ptwXYPoints *norms ) {

    char const *nativeData, *gammaEnergy;
-    double gammaEnergy_MeV;
+    double gammaEnergy_MeV{0.0};
    MCGIDI_distribution *distribution = &(product->distribution);
    xDataTOM_element *distributionElement;
    enum MCGIDI_energyType energyType = MCGIDI_energyType_unknown;
@@ -61,9 +61,9 @@ int MCGIDI_outputChannel_release( statusMessageReporting *smr, MCGIDI_outputChan
 int MCGIDI_outputChannel_parseFromTOM( statusMessageReporting *smr, xDataTOM_element *element, MCGIDI_POPs *pops, MCGIDI_outputChannel *outputChannel,
        MCGIDI_reaction *reaction, MCGIDI_product *parent ) {

-    int n, delayedNeutronIndex = 0;
-    char const *genre, *Q;
-    xDataTOM_element *child;
+    int n{0}, delayedNeutronIndex{0};
+    char const *genre{""}, *Q{""};
+    xDataTOM_element *child{nullptr};

    MCGIDI_outputChannel_initialize( smr, outputChannel );

@@ -82,9 +82,9 @@ int MCGIDI_product_release( statusMessageReporting *smr, MCGIDI_product *product
 int MCGIDI_product_parseFromTOM( statusMessageReporting *smr, xDataTOM_element *element, MCGIDI_outputChannel *outputChannel,
        MCGIDI_POPs *pops, MCGIDI_product *product, int *delayedNeutronIndex ) {

-    char const *name, *label, *delayedNeutron, *multiplicityStr, *multiplicityUnits[2] = { "MeV", "" };
-    xDataTOM_element *multiplicity, *multiplicityTOM, *decayChannelElement;
-    nfu_status status;
+    char const *name{""}, *label{""}, *delayedNeutron{""}, *multiplicityStr{""}, *multiplicityUnits[2] = { "MeV", "" };
+    xDataTOM_element *multiplicity{nullptr}, *multiplicityTOM{nullptr}, *decayChannelElement{nullptr};
+    nfu_status status{nfu_Okay};
    ptwXYPoints *multiplicityVsEnergy = NULL, *norms1 = NULL, *norms2 = NULL;

    MCGIDI_product_initialize( smr, product );
@@ -4,17 +4,11 @@
 */

 #include <stdlib.h>
+#include <float.h>
 #include <cmath>

 #include "nf_utilities.h"

-#ifdef WIN32
-  #include <float.h>
-  #define isfinite _finite
-#else
-  #define isfinite std::isfinite
-#endif
-
 #if defined __cplusplus
 namespace GIDI {
 using namespace GIDI;
@@ -71,7 +65,7 @@ char *nf_floatToShortestString( double value, int significantDigits, int favorEF

    if( flags & nf_floatToShortestString_includeSign ) sign = "+";

-    if( !isfinite( value ) ) {
+    if( !std::isfinite( value ) ) {
        snprintf( Fmt, sizeof Fmt, "%%%sf", sign );
        snprintf( Str_e, sizeof Str_e, Fmt, value );
        return( strdup( Str_e ) );