Import Geant4 11.0.2 source tree

source/processes/hadronic/models/inclxx/History

@@ -15,9 +15,13 @@ code and to keep track of all tags.
    * Please list in reverse chronological order (last date on top)
    ---------------------------------------------------------------
 
+18 May 2022 - Gabriele Cosmo (hadr-inclxx-V10-07-08)
+----------------------------------------------------
+- Fixed misuse of bitwise '|' operator instead of logical in INCL::postCascade()
+  and in INCL::makeCompoundNucleus().
 
 03 March 2022 - Alberto Ribon (hadr-inclxx-V10-07-07)
--------------------------------------------------------
+-----------------------------------------------------
 - G4INCLXXInterface : fixed treatment of kaon0, anti_kaon0, kaon0L, and kaon0S.
   In current reference physics lists, INCLXX is never used for handling kaons,
   although it is capable of doing so, but at process-level or in custom
@@ -25,6 +29,11 @@ code and to keep track of all tags.
   neutral kaon projectiles. The change (provided by Jean-Christophe David)
   fixes this misbehavior.
 
+09 February 2022 - Gabriele Cosmo
+---------------------------------
+- Fixed compilation warnings on Intel compilers for shadowing of variables
+  and not used variable.
+
 09 November 2021 - Alberto Ribon (hadr-inclxx-V10-07-06)
 -------------------------------------------------------
 - G4INCLNuclearPotentialIsospin : improved nuclear potential for

source/processes/hadronic/models/inclxx/incl_physics/include/G4INCLCluster.hh

@@ -255,11 +255,11 @@ namespace G4INCL {
 
       // First compute the current CM position and total momentum
       ThreeVector theCMPosition, theTotalMomentum;
-      G4double theTotalEnergy = 0.0;
+//    G4double theTotalEnergy = 0.0;
       for(ParticleIter p=particles.begin(), e=particles.end(); p!=e; ++p) {
         theCMPosition += (*p)->getPosition();
         theTotalMomentum += (*p)->getMomentum();
-        theTotalEnergy += (*p)->getEnergy();
+//      theTotalEnergy += (*p)->getEnergy();
       }
       theCMPosition /= theA;
 // assert((unsigned int)theA==particles.size());

source/processes/hadronic/models/inclxx/incl_physics/include/G4INCLINuclearPotential.hh

@@ -148,8 +148,8 @@ namespace G4INCL {
          **/
         inline G4double getFermiMomentum(const Particle * const p) const {
           if(p->isDelta()) {
-            const G4double Tf = getFermiEnergy(p), m = p->getMass();
-            return std::sqrt(Tf*(Tf+2.*m));
+            const G4double Tf = getFermiEnergy(p), mass = p->getMass();
+            return std::sqrt(Tf*(Tf+2.*mass));
           } else {
             std::map<ParticleType, G4double>::const_iterator i = fermiMomentum.find(p->getType());
 // assert(i!=fermiMomentum.end());

source/processes/hadronic/models/inclxx/incl_physics/include/G4INCLNucleus.hh

@@ -345,9 +345,9 @@ namespace G4INCL {
     std::string print();
 
     Store* getStore() const {return theStore; };
-    void setStore(Store *s) {
+    void setStore(Store *str) {
       delete theStore;
-      theStore = s;
+      theStore = str;
     };
 
     G4double getInitialInternalEnergy() const { return initialInternalEnergy; };

source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLCascade.cc

@@ -487,7 +487,7 @@ namespace G4INCL {
       }
 
       // Cluster decay
-      theEventInfo.clusterDecay = nucleus->decayOutgoingClusters() | nucleus->decayMe();
+      theEventInfo.clusterDecay = nucleus->decayOutgoingClusters() || nucleus->decayMe();
 
 #ifndef INCLXX_IN_GEANT4_MODE
       // Global checks of conservation laws
@@ -645,7 +645,7 @@ namespace G4INCL {
       theEventInfo.emitKaon = nucleus->emitInsideKaon();
         
       // Cluster decay
-      theEventInfo.clusterDecay = nucleus->decayOutgoingClusters() | nucleus->decayMe();
+      theEventInfo.clusterDecay = nucleus->decayOutgoingClusters() || nucleus->decayMe();
 
       // Fill the EventInfo structure
       nucleus->fillEventInfo(&theEventInfo);

source/processes/hadronic/models/inclxx/utils/include/G4INCLConfig.hh

@@ -115,7 +115,7 @@ namespace G4INCL {
     ParticleSpecies getProjectileSpecies() const { return projectileSpecies; }
 
     /// \brief Set the projectile species
-    void setProjectileSpecies(ParticleSpecies const &ps) { projectileSpecies=ps; }
+    void setProjectileSpecies(ParticleSpecies const &pars) { projectileSpecies=pars; }
 
     /// \brief Get the projectile kinetic energy.
     G4double getProjectileKineticEnergy() const { return projectileKineticEnergy; }
@@ -199,7 +199,7 @@ namespace G4INCL {
     G4int getClusterMaxMass() const { return clusterMaxMass; }
 
     /// \brief Set the maximum mass for production of clusters.
-    void setClusterMaxMass(const G4int m){ clusterMaxMass=m; }
+    void setClusterMaxMass(const G4int clm){ clusterMaxMass=clm; }
 
     /// \brief Get back-to-spectator
     G4bool getBackToSpectator() const { return backToSpectator; }
@@ -214,7 +214,7 @@ namespace G4INCL {
     void setUseRealMasses(G4bool use) { useRealMasses = use; }
 
     /// \brief Set the INCLXX datafile path
-    void setINCLXXDataFilePath(std::string const &s) { INCLXXDataFilePath=s; }
+    void setINCLXXDataFilePath(std::string const &path) { INCLXXDataFilePath=path; }
 
     std::string const &getINCLXXDataFilePath() const {
       return INCLXXDataFilePath;

source/processes/hadronic/models/inclxx/utils/src/G4INCLParticleTable.cc

@@ -528,22 +528,22 @@ namespace G4INCL {
       return -10; // Unknown
     }
 
-    std::string getShortName(const ParticleSpecies &s) {
-      if(s.theType==Composite && s.theS == 0)
-        return getShortName(s.theA,s.theZ);
-      else if(s.theType==Composite)
-        return getName(s.theA,s.theZ,s.theS);
+    std::string getShortName(const ParticleSpecies &sp) {
+      if(sp.theType==Composite && sp.theS == 0)
+        return getShortName(sp.theA,sp.theZ);
+      else if(sp.theType==Composite)
+        return getName(sp.theA,sp.theZ,sp.theS);
       else
-        return getShortName(s.theType);
+        return getShortName(sp.theType);
     }
 
-    std::string getName(const ParticleSpecies &s) {
-      if(s.theType==Composite && s.theS == 0)
-        return getName(s.theA,s.theZ);
-      else if(s.theType==Composite)
-        return getName(s.theA,s.theZ,s.theS);
+    std::string getName(const ParticleSpecies &sp) {
+      if(sp.theType==Composite && sp.theS == 0)
+        return getName(sp.theA,sp.theZ);
+      else if(sp.theType==Composite)
+        return getName(sp.theA,sp.theZ,sp.theS);
       else
-        return getName(s.theType);
+        return getName(sp.theType);
     }
 
     std::string getName(const G4int A, const G4int Z) {
@@ -1140,11 +1140,11 @@ namespace G4INCL {
 
     G4double getLambdaSeparationEnergy() { return lambdaSeparationEnergy; }
 
-    void setProtonSeparationEnergy(const G4double s) { protonSeparationEnergy = s; }
+    void setProtonSeparationEnergy(const G4double sen) { protonSeparationEnergy = sen; }
 
-    void setNeutronSeparationEnergy(const G4double s) { neutronSeparationEnergy  = s; }
+    void setNeutronSeparationEnergy(const G4double sen) { neutronSeparationEnergy  = sen; }
 
-    void setLambdaSeparationEnergy(const G4double s) { lambdaSeparationEnergy  = s; }
+    void setLambdaSeparationEnergy(const G4double sen) { lambdaSeparationEnergy  = sen; }
 
     std::string getElementName(const G4int Z) {
       if(Z<1) {
@@ -1177,9 +1177,9 @@ namespace G4INCL {
         return ParticleTable::parseIUPACElement(pS);
     }
 
-    G4int parseIUPACElement(std::string const &s) {
+    G4int parseIUPACElement(std::string const &sel) {
       // Normalise to lower case
-      std::string elementName(s);
+      std::string elementName(sel);
       std::transform(elementName.begin(), elementName.end(), elementName.begin(), ::tolower);
       // Return 0 if the element name contains anything but IUPAC digits
       if(elementName.find_first_not_of(elementIUPACDigits)!=std::string::npos)