Changeset 1340 for trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclNuclei.hh

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclNuclei.hh (modified) (7 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclNuclei.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4InuclNuclei.hh,v 1.17 2010/06/25 09:43:26 gunter Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-01 $
+// $Id: G4InuclNuclei.hh,v 1.27 2010/09/25 04:35:02 mkelsey Exp $
+// Geant4 tag: $Name: hadr-casc-V09-03-85 $
 //
 // 20100112  Michael Kelsey -- Replace G4CascadeMomentum with G4LorentzVector
@@ -32 +32 @@
 // 20100319  M. Kelsey -- Remove "using" directory and unnecessary #includes.
 // 20100409  M. Kelsey -- Drop unused string argument from ctors.
+// 20100630  M. Kelsey -- Add excitation energy as optional public ctor arg,
+//           remove excitation energy data member (part of G4Ions).  Add
+//           excitation energy to "getNucleiMass()" function, move print to .cc
+// 20100711  M. Kelsey -- Add optional model ID to constructors
+// 20100714  M. Kelsey -- Use G4DynamicParticle::theDynamicalMass to deal with
+//           excitation energy without instantianting "infinite" G4PartDefns.
+// 20100719  M. Kelsey -- Move setExitationEnergy implementation to .cc file.
+// 20100906  M. Kelsey -- Add fill() functions to rewrite contents
+// 20100909  M. Kelsey -- Add function to discard exciton configuration
+// 20100914  M. Kelsey -- Use integers for A and Z
+// 20100915  M. Kelsey -- Add constructor to copy G4DynamicParticle input
+// 20100924  M. Kelsey -- Add constructor to copy G4Fragment input, and output
+//              functions to create G4Fragment.
 
 #ifndef G4INUCL_NUCLEI_HH
@@ -37 +50 @@
 
 #include "G4InuclParticle.hh"
+#include "G4LorentzVector.hh"
 #include "G4ExitonConfiguration.hh"
 
+class G4Fragment;
 class G4ParticleDefinition;
+
 
 class G4InuclNuclei : public G4InuclParticle {
@@ -45 +61 @@
   G4InuclNuclei() : G4InuclParticle() {}
 
-  G4InuclNuclei(G4double a, G4double z)
-    : G4InuclParticle(makeDefinition(a,z)),
-      exitationEnergy(0.0) {}
+  G4InuclNuclei(const G4DynamicParticle& dynPart, G4int model=0)
+    : G4InuclParticle(dynPart) {
+    setModel(model);
+  }
 
-  G4InuclNuclei(const G4LorentzVector& mom, G4double a, G4double z)
-    : G4InuclParticle(makeDefinition(a,z), mom),
-      exitationEnergy(0.0) {}
+  G4InuclNuclei(G4int a, G4int z, G4double exc=0., G4int model=0)
+    : G4InuclParticle(makeDefinition(a,z)) {
+    setExitationEnergy(exc);
+    setModel(model);
+  }
 
-  G4InuclNuclei(G4double ekin, G4double a, G4double z) 
-    : G4InuclParticle(makeDefinition(a,z), ekin),
-      exitationEnergy(0.0) {}
+  G4InuclNuclei(const G4LorentzVector& mom, G4int a, G4int z,
+                G4double exc=0., G4int model=0)
+    : G4InuclParticle(makeDefinition(a,z), mom) {
+    setExitationEnergy(exc);
+    setModel(model);
+  }
+
+  G4InuclNuclei(G4double ekin, G4int a, G4int z, G4double exc,
+                G4int model=0) 
+    : G4InuclParticle(makeDefinition(a,z), ekin) {
+    setExitationEnergy(exc);
+    setModel(model);
+  }
+
+  G4InuclNuclei(const G4Fragment& aFragment, G4int model=0);
 
   virtual ~G4InuclNuclei() {}
@@ -61 +92 @@
   // Copy and assignment constructors for use with std::vector<>
   G4InuclNuclei(const G4InuclNuclei& right)
-    : G4InuclParticle(right), exitationEnergy(right.exitationEnergy),
+    : G4InuclParticle(right),
       theExitonConfiguration(right.theExitonConfiguration) {}
 
   G4InuclNuclei& operator=(const G4InuclNuclei& right);
 
-  void setExitationEnergy(G4double e) { exitationEnergy = e; }
+  // Overwrite data structure (avoids creating/copying temporaries)
+  void fill(G4int a, G4int z, G4double exc=0., G4int model=0) {
+    fill(0., a, z, exc, model);
+  }
+
+  void fill(const G4LorentzVector& mom, G4int a, G4int z,
+            G4double exc=0., G4int model=0);
+
+  void fill(G4double ekin, G4int a, G4int z, G4double exc,
+            G4int model=0);
+
+  // Excitation energy is stored as dynamical mass of particle
+  void setExitationEnergy(G4double e);
 
   void setExitonConfiguration(const G4ExitonConfiguration& config) { 
@@ -72 +115 @@
   }
 
-  G4double getA() const { return getDefinition()->GetAtomicMass(); }
+  void clearExitonConfiguration() { theExitonConfiguration.clear(); }
 
-  G4double getZ() const { return getDefinition()->GetAtomicNumber(); }
+  G4int getA() const { return getDefinition()->GetAtomicMass(); }
+  G4int getZ() const { return getDefinition()->GetAtomicNumber(); }
 
-  G4double getExitationEnergy() const { return exitationEnergy; }
+  G4double getNucleiMass() const {
+    return getDefinition()->GetPDGMass()*MeV/GeV;       // From G4 to Bertini
+  }
 
-  G4double getExitationEnergyInGeV() const { 
-    return 0.001 * exitationEnergy; 
+  G4double getExitationEnergy() const {
+    return (getMass()-getNucleiMass())*GeV/MeV;         // Always in MeV
   }
+
+  G4double getExitationEnergyInGeV() const { return getExitationEnergy()/GeV; }
 
   const G4ExitonConfiguration& getExitonConfiguration() const {
@@ -86 +134 @@
   }
 
-  static G4double getNucleiMass(G4double a, G4double z);
+  static G4double getNucleiMass(G4int a, G4int z, G4double exc=0.);
 
-  virtual void printParticle() const {
-    G4cout << " A " << getA() << " Z " << getZ() << " mass " 
-           << getMass() << " Eex (MeV) " << exitationEnergy << G4endl;
-    G4InuclParticle::printParticle();
-  }
+  virtual void printParticle() const;
+
+  // Convert contents to G4Fragment for use outside package
+  G4Fragment makeG4Fragment() const;
+  operator G4Fragment() const;
 
 protected:
   // Convert nuclear configuration to standard GEANT4 pointer
-  static G4ParticleDefinition*
-  makeDefinition(G4double a, G4double z, G4double exc=0.);
-
-  static G4ParticleDefinition* 
-  makeNuclearFragment(G4double a, G4double z, G4double exc=0.);
+  static G4ParticleDefinition* makeDefinition(G4int a, G4int z);
+  static G4ParticleDefinition* makeNuclearFragment(G4int a, G4int z);
 
 private: 
-  G4double exitationEnergy;
   G4ExitonConfiguration theExitonConfiguration;
 };