Import Geant4 11.4.1 source tree

source/processes/hadronic/models/fission/History

@@ -6,6 +6,11 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2026-02-18 Gabriele Cosmo (hadr-fission-V11-03-00)
+- Fixed reported Coverity defects in G4fissioner for avoiding unnecessary
+  copy of strings.
+- Fixed layout of G4fissionEvent class.
+
 ## 2024-08-21 Gabriele Cosmo (hadr-fission-V11-02-01)
 - Fixed reported Coverity defects for use of std::move().
 

source/processes/hadronic/models/fission/include/G4fissionEvent.hh

@@ -53,40 +53,16 @@
 // UCRL-CODE-224807
 //
 //
-#ifndef G4fissionEvent_hh
-#define G4fissionEvent_hh
+#ifndef G4FISSIONEVENT_HH
+#define G4FISSIONEVENT_HH
 
 #include "globals.hh"
 #include <string>
 
-class G4fissionEvent {
-   private:
-      G4int neutronNu; // number of neutrons in this fission event
-      G4double* neutronEnergies; 
-      G4double* neutronVelocities; 
-      G4double* neutronDircosu; 
-      G4double* neutronDircosv; 
-      G4double* neutronDircosw; 
-      G4double* neutronAges; 
-
-      G4int photonNu; // number of photons in this fission event
-      G4double* photonEnergies; 
-      G4double* photonVelocities; 
-      G4double* photonDircosu; 
-      G4double* photonDircosv; 
-      G4double* photonDircosw; 
-      G4double* photonAges; 
-
-      // options
-      static G4int delayoption;
-      static G4int correlationoption;
-      static G4int nudistoption;
-      static G4int Cf252ndistoption;
-      static G4int Cf252nengoption;
-      static G4double (*rngdptr)(void);
-      static float (*rngfptr)(void);
-
+class G4fissionEvent
+{
    public:
+
       // These are all the methods of this class accessible to the caller of the object 
       G4fissionEvent(G4int isotope, G4double time, G4double nubar, G4double eng);
       ~G4fissionEvent();
@@ -167,6 +143,32 @@ class G4fissionEvent {
 
 
    private:
+
+      G4int neutronNu; // number of neutrons in this fission event
+      G4double* neutronEnergies; 
+      G4double* neutronVelocities; 
+      G4double* neutronDircosu; 
+      G4double* neutronDircosv; 
+      G4double* neutronDircosw; 
+      G4double* neutronAges; 
+
+      G4int photonNu; // number of photons in this fission event
+      G4double* photonEnergies; 
+      G4double* photonVelocities; 
+      G4double* photonDircosu; 
+      G4double* photonDircosv; 
+      G4double* photonDircosw; 
+      G4double* photonAges; 
+
+      // options
+      static G4int delayoption;
+      static G4int correlationoption;
+      static G4int nudistoption;
+      static G4int Cf252ndistoption;
+      static G4int Cf252nengoption;
+      static G4double (*rngdptr)(void);
+      static G4float (*rngfptr)(void);
+
       G4int G4SmpNuDistDataU232_234_236_238(G4double nubar);
       G4int G4SmpNuDistDataU232_234_236_238_MC(G4double nubar);
       G4int G4SmpNuDistDataU233_235(G4double nubar);
@@ -187,7 +189,7 @@ class G4fissionEvent {
       G4int G4SmpSpNugDistData(G4int isotope);
       G4double G4SmpTerrell(G4double nubar);
       G4double G4SmpWatt(G4double ePart, G4int iso);
-      void G4fissionerr(G4int iSever, std::string chSubNam, std::string chMsg);
+      void G4fissionerr(G4int iSever, const G4String& chSubNam, const G4String& chMsg);
       static G4double fisslibrng(void);
       static G4double rngf2d(void);
 };

source/processes/hadronic/models/fission/src/G4fissionEvent.cc

@@ -178,7 +178,8 @@ G4fissionEvent::G4fissionEvent(G4int isotope, G4double time,
    }
 }
 
-G4fissionEvent::~G4fissionEvent() {
+G4fissionEvent::~G4fissionEvent()
+{
    if (neutronNu > 0) {
       delete [] neutronEnergies;
       delete [] neutronVelocities;

source/processes/hadronic/models/fission/src/G4fissionerr.cc

@@ -61,7 +61,7 @@
 
 std::string itoa(const G4int& x);
 
-void G4fissionEvent::G4fissionerr(G4int iSever, std::string chSubNam, std::string chMsg)
+void G4fissionEvent::G4fissionerr(G4int iSever, const G4String& chSubNam, const G4String& chMsg)
 
 /*
   Description
@@ -80,7 +80,7 @@ void G4fissionEvent::G4fissionerr(G4int iSever, std::string chSubNam, std::strin
 
 {
    G4int doExit;
-   std::string ExitMsg;
+   G4String ExitMsg;
  
    
    if (iSever <= 5) {   /* warning */
@@ -92,7 +92,7 @@ void G4fissionEvent::G4fissionerr(G4int iSever, std::string chSubNam, std::strin
 
    ExitMsg = "Error in Function "+chSubNam+", Severity=" + itoa(iSever) + " : "+chMsg;
 
-   std::cerr << "Fission " << ExitMsg << std::endl;
+   G4cerr << "Fission " << ExitMsg << G4endl;
    if (doExit == 1) G4Exception("G4fissionEvent::G4fissionerr()", "601",
                                 FatalException, "Fatal Error");