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

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/hadronic/util/include

Files:

• G4HadronicWhiteBoard.hh (modified) (3 diffs)
• G4Nucleus.hh (modified) (1 diff)

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;