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

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/hadronic/util

Files:

• History (modified) (1 diff)
• include/G4HadronicWhiteBoard.hh (modified) (3 diffs)
• include/G4Nucleus.hh (modified) (1 diff)
• src/G4HadronicWhiteBoard.cc (modified) (1 diff)
• src/G4Nucleus.cc (modified) (1 diff)

trunk/source/processes/hadronic/util/History

@@ -14 +14 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+11 Nov 2010  Dennis Wright              (hadr-util-V09-03-01)
+-------------------------------------------------------------
+- G4HadronicWhiteBoard: fix uninitialized ptrs (theProjectile, theDef,
+    theName)
+- G4Nucleus: add dtaBlackTrackEnergyfromAnnihilation and 
+    pnBlackTrackEnergyfromAnnihilation to copy ctor
+    initialize theA, theZ. aEff, zEff to 0 in ctor
 
 08 Mar 2010 G.Folger                    (hadr-util-V09-03-00)

trunk/source/processes/hadronic/util/include/G4HadronicWhiteBoard.hh

@@ -35 +35 @@
 {
   public:
-  G4HadronicWhiteBoard(){}
+  G4HadronicWhiteBoard();
   
-  static G4HadronicWhiteBoard & Instance();
+  static G4HadronicWhiteBoard& Instance();
   
-  void SetProjectile(const G4HadProjectile & aProjectile);
+  void SetProjectile(const G4HadProjectile& aProjectile);
     
-  void SetTargetNucleus(const G4Nucleus & aTarget);
+  void SetTargetNucleus(const G4Nucleus& aTarget);
 
   void SetProcessName(const G4String& aProcessName);
@@ -47 +47 @@
   void SetModelName(const G4String& aModelName);
 
-  const G4HadProjectile * GetProjectile();
-  const G4Nucleus & GetTargetNucleus(); 
-  G4ParticleDefinition * GetPDef();
+  const G4HadProjectile* GetProjectile();
+  const G4Nucleus& GetTargetNucleus(); 
+  G4ParticleDefinition* GetPDef();
   G4String GetParticleName();
   G4double GetEnergy();
@@ -63 +63 @@
   private:
   
-  G4HadProjectile * theProjectile;
-  G4ParticleDefinition * theDef;
-  char * theName;
+  G4HadProjectile* theProjectile;
+  G4ParticleDefinition* theDef;
+  char* theName;
   G4double theE;
   G4double thePx;

trunk/source/processes/hadronic/util/include/G4Nucleus.hh

@@ -76 +76 @@
          zEff=right.zEff;  
          pnBlackTrackEnergy=right.pnBlackTrackEnergy; 
-         dtaBlackTrackEnergy=right.dtaBlackTrackEnergy; 
+         dtaBlackTrackEnergy=right.dtaBlackTrackEnergy;
+         pnBlackTrackEnergyfromAnnihilation =
+                      right.pnBlackTrackEnergyfromAnnihilation; 
+         dtaBlackTrackEnergyfromAnnihilation =
+                      right.dtaBlackTrackEnergyfromAnnihilation; 
          theTemp = right.theTemp;
          excitationEnergy = right.excitationEnergy;

trunk/source/processes/hadronic/util/src/G4HadronicWhiteBoard.cc

@@ -25 +25 @@
 //
 #include "G4HadronicWhiteBoard.hh"
+
+
+G4HadronicWhiteBoard::G4HadronicWhiteBoard()
+  : theProjectile(0), theDef(0), theName(0)
+{}
 
 

trunk/source/processes/hadronic/util/src/G4Nucleus.cc

@@ -46 +46 @@
  
 G4Nucleus::G4Nucleus()
+  : theA(0), theZ(0), aEff(0.0), zEff(0)
 {
   pnBlackTrackEnergy = 0.0;