Changeset 1347 for trunk/source/processes/hadronic/models/util

Timestamp:

Dec 22, 2010, 3:52:27 PM (15 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/hadronic/models/util

Files:

• History (modified) (2 diffs)
• include/G4DecayStrongResonances.hh (modified) (2 diffs)
• include/G4NuclearFermiDensity.hh (modified) (1 diff)
• include/G4NuclearShellModelDensity.hh (modified) (1 diff)
• src/G4KineticTrack.cc (modified) (4 diffs)
• src/G4NuclearFermiDensity.cc (modified) (1 diff)
• src/G4NuclearShellModelDensity.cc (modified) (1 diff)

trunk/source/processes/hadronic/models/util/History

@@ -1 @@
-$Id: History,v 1.40 2010/09/28 17:03:26 vnivanch Exp $
+$Id: History,v 1.45 2010/11/03 17:37:57 gunter Exp $
 -------------------------------------------------------------------
 
@@ -15 +15 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+3 Nov 2010 Gunter Folger                        hadr-mod-util-V09-03-07
+- G4Nuclear...Density: migrate to integer A&Z
+
+3 Nov 2010 Gunter Folger                        hadr-mod-util-V09-03-06
+- G4KineticTrack: fix coverity warnings of memory leak
+
+02 Nov 2010 Vladimir Ivanchenko hadr-mod-util-V09-03-05
+- G4Fragment - improved printout of negative excitation energy
+- G4DecayStrongResonances - constructor and destructor moved to source,
+                            fixed Coverity warning
 
 27 Sep 2010 Vladimir Ivanchenko hadr-mod-util-V09-03-04

trunk/source/processes/hadronic/models/util/include/G4DecayStrongResonances.hh

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4DecayStrongResonances.hh,v 1.9 2010/11/02 17:57:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
+//
+// -------------------------------------------------------------------
+//
+// GEANT4 Class file
+//
+// File name:     G4DecayStrongResonances
+//
+// Modified:  
+// 02.11.2010 V.Ivanchenko moved constructor and destructor to source; 
+//                         removed unused variable
 
 #ifndef G4DecayStrongResonances_h
@@ -36 +48 @@
 {
 public:
-   G4DecayStrongResonances(){}      
-   ~G4DecayStrongResonances(){}
+  G4DecayStrongResonances();
+  ~G4DecayStrongResonances();
 
 private:
    G4int operator==(G4DecayStrongResonances& right) {return (this == &right);}
    G4int operator!=(G4DecayStrongResonances& right) {return (this != &right);}
-   
-   G4double theEnergy;
       
 public:

trunk/source/processes/hadronic/models/util/include/G4NuclearFermiDensity.hh

@@ -40 +40 @@
 
   public:
-    G4NuclearFermiDensity(G4double anA, G4double aZ);
+    G4NuclearFermiDensity(G4int anA, G4int aZ);
     ~G4NuclearFermiDensity();
     

trunk/source/processes/hadronic/models/util/include/G4NuclearShellModelDensity.hh

@@ -40 +40 @@
 
   public:
-    G4NuclearShellModelDensity(G4double anA, G4double aZ);
+    G4NuclearShellModelDensity(G4int anA, G4int aZ);
     ~G4NuclearShellModelDensity();
     

trunk/source/processes/hadronic/models/util/src/G4KineticTrack.cc

@@ -493 +493 @@
       G4cout << "DECAY Actual Mass " << theActualMass << G4endl;
 */
+  G4ParticleDefinition* thisDefinition = this->GetDefinition();
+  if(!thisDefinition)
+  {
+    G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
+    G4cerr << "  track has no particle definition associated."<<G4endl;
+    return 0;
+  }
+  G4DecayTable* theDecayTable = thisDefinition->GetDecayTable();
+  if(!theDecayTable)
+  {
+    G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
+    G4cerr << "  particle definiton has no decay table associated."<<G4endl;
+    G4cerr << "  particle was "<<thisDefinition->GetParticleName()<<G4endl;
+    return 0;
+  }
  
  G4int chargeBalance = G4lrint(theDefinition->GetPDGCharge() );     
@@ -512 +527 @@
      //  cout << "DECAY Total Width " << theTotalActualWidth << G4endl;
      G4double r = theTotalActualWidth * G4UniformRand();
-     G4ParticleDefinition* thisDefinition = this->GetDefinition();
-     if(!thisDefinition)
-     {
-       G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
-       G4cerr << "  track has no particle definition associated."<<G4endl;
-       return 0;
-     }
-     G4DecayTable* theDecayTable = thisDefinition->GetDecayTable();
-     if(!theDecayTable)
-     {
-       G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
-       G4cerr << "  particle definiton has no decay table associated."<<G4endl;
-       G4cerr << "  particle was "<<thisDefinition->GetParticleName()<<G4endl;
-       return 0;
-     }
-     G4VDecayChannel* theDecayChannel=NULL;
+     G4VDecayChannel* theDecayChannel(0);
      for (index = nChannels - 1; index >= 0; index--)
         {
@@ -538 +538 @@
             }
         }
-        
+
+     delete [] theCumActualWidth;
+   
      if(!theDecayChannel)
      {
@@ -669 +671 @@
         }
      delete theDecayProducts;
-     delete [] theCumActualWidth;
      if(getenv("DecayEnergyBalanceCheck"))
        std::cout << "DEBUGGING energy balance in cms and lab, charge baryon balance : "

trunk/source/processes/hadronic/models/util/src/G4NuclearFermiDensity.cc

@@ -29 +29 @@
 #include "G4NuclearFermiDensity.hh"
 
-G4NuclearFermiDensity::G4NuclearFermiDensity(G4double anA, G4double aZ) 
-  :  a(0.545 * fermi) 
+G4NuclearFermiDensity::G4NuclearFermiDensity(G4int anA, G4int aZ) 
+  :  theA(anA), theZ(aZ), a(0.545 * fermi) 
 {
 //        const G4double r0=1.14*fermi;
-        const G4double r0=1.16 * ( 1. - 1.16 * std::pow(anA, -2./3.)) * fermi;
-        theA = G4int(anA);
-        theZ = G4int(aZ);
+        const G4double r0=1.16 * ( 1. - 1.16 * std::pow(G4double(anA), -2./3.)) * fermi;
         theR= r0 * std::pow(anA, 1./3. );
         Setrho0(3./ (4. * pi * std::pow(r0,3.) * theA * ( 1. + sqr(a/theR)*pi2 )));

trunk/source/processes/hadronic/models/util/src/G4NuclearShellModelDensity.cc

@@ -29 +29 @@
 #include "G4NuclearShellModelDensity.hh"
 
-G4NuclearShellModelDensity::G4NuclearShellModelDensity(G4double anA, G4double aZ) 
+G4NuclearShellModelDensity::G4NuclearShellModelDensity(G4int anA, G4int aZ) 
+: theA(anA), theZ(aZ)
 {
         const G4double r0sq=0.8133*fermi*fermi;
-        theA = G4int(anA);
-        theZ = G4int(aZ);
         theRsquare= r0sq * std::pow(G4double(theA), 2./3. );
         Setrho0(std::pow(1./(pi*theRsquare),3./2.));