Changeset 1340 for trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc (modified) (5 diffs)

trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VPreCompoundFragment.cc,v 1.12 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VPreCompoundFragment.cc,v 1.13 2010/08/28 15:16:55 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
-// J. M. Quesada (August 2008).  
-// Based  on previous work by V. Lara
+// J. M. Quesada (August 2008).  Based  on previous work by V. Lara
 //
- 
+// Modified:
+// 20.08.2010 V.Ivanchenko added G4Pow and G4PreCompoundParameters pointers
+//                         use int Z and A and cleanup
+
 #include "G4VPreCompoundFragment.hh"
 #include "G4PreCompoundParameters.hh"
+#include "G4NucleiProperties.hh"
 
-G4VPreCompoundFragment::
-G4VPreCompoundFragment(const G4VPreCompoundFragment & right)
+G4VPreCompoundFragment::G4VPreCompoundFragment(
+  const G4ParticleDefinition* part, G4VCoulombBarrier* aCoulombBarrier)
+  : particle(part), theCoulombBarrierPtr(aCoulombBarrier),
+    theRestNucleusA(0),theRestNucleusZ(0),theBindingEnergy(0.0), 
+    theMaximalKineticEnergy(-MeV),theRestNucleusMass(0.0),
+    theReducedMass(0.0),theMomentum(0.,0.,0.,0.),
+    theEmissionProbability(0.0),theCoulombBarrier(0.0)
 {
-  theA = right.theA;
-  theZ = right.theZ;
-  theRestNucleusA = right.theRestNucleusA;
-  theRestNucleusZ = right.theRestNucleusZ;
-  theCoulombBarrier = right.theCoulombBarrier;
-  theCoulombBarrierPtr = right.theCoulombBarrierPtr;
-  theMaximalKineticEnergy = right.theMaximalKineticEnergy;
-  theEmissionProbability = right.theEmissionProbability;
-  theMomentum = right.theMomentum;
-  theFragmentName = right.theFragmentName;
-  theStage = right.theStage;
+  theA = particle->GetBaryonNumber();
+  theZ = G4int(particle->GetPDGCharge()/eplus + 0.1);
+  theMass = particle->GetPDGMass();
+  theParameters = G4PreCompoundParameters::GetAddress();
+  g4pow = G4Pow::GetInstance();
 }
 
-G4VPreCompoundFragment::
-G4VPreCompoundFragment(const G4double anA,
-                       const G4double aZ, 
-                       G4VCoulombBarrier* aCoulombBarrier,
-                       const G4String & aName):
-  theA(anA),theZ(aZ), 
-  theRestNucleusA(0.0),theRestNucleusZ(0.0),theCoulombBarrier(0.0),
-  theCoulombBarrierPtr(aCoulombBarrier),
-  theBindingEnergy(0.0), theMaximalKineticEnergy(-1.0),
-  theEmissionProbability(0.0), theMomentum(0.0,0.0,0.0,0.0),
-  theFragmentName(aName),theStage(0)
+G4VPreCompoundFragment::~G4VPreCompoundFragment()
 {}
-
-
-
-G4VPreCompoundFragment::~G4VPreCompoundFragment()
-{
-}
-
-
-const G4VPreCompoundFragment & G4VPreCompoundFragment::
-operator= (const G4VPreCompoundFragment & right)
-{
-  if (this != &right) {
-    theA = right.theA;
-    theZ = right.theZ;
-    theRestNucleusA = right.theRestNucleusA;
-    theRestNucleusZ = right.theRestNucleusZ;
-    theCoulombBarrier = right.theCoulombBarrier;
-    theCoulombBarrierPtr = right.theCoulombBarrierPtr;
-    theMaximalKineticEnergy = right.theMaximalKineticEnergy;
-    theEmissionProbability = right.theEmissionProbability;
-    theMomentum = right.theMomentum;
-    theFragmentName = right.theFragmentName;
-    theStage = right.theStage;
-  }
-  return *this;
-}
-
-G4int G4VPreCompoundFragment::operator==(const G4VPreCompoundFragment & right) const
-{
-  return (this == (G4VPreCompoundFragment *) &right);
-}
-
-G4int G4VPreCompoundFragment::operator!=(const G4VPreCompoundFragment & right) const
-{
-  return (this != (G4VPreCompoundFragment *) &right);
-}
-
 
 std::ostream& 
@@ -107 +62 @@
 }
 
-
 std::ostream& 
 operator << (std::ostream &out, const G4VPreCompoundFragment *theFragment)
@@ -115 +69 @@
     
   out 
-    << "PreCompound Model Emitted Fragment: A = " 
+    << "PreCompoundModel Emitted Fragment: A = " 
     << std::setprecision(3) << theFragment->theA 
     << ", Z = " << std::setprecision(3) << theFragment->theZ;
@@ -130 +84 @@
     
     out.setf(old_floatfield,std::ios::floatfield);
-    
     return out;
 }
-
 
 void G4VPreCompoundFragment::
 Initialize(const G4Fragment & aFragment)
 {
-  theRestNucleusA = aFragment.GetA() - theA;
-  theRestNucleusZ = aFragment.GetZ() - theZ;
+  theRestNucleusA = aFragment.GetA_asInt() - theA;
+  theRestNucleusZ = aFragment.GetZ_asInt() - theZ;
+  theRestNucleusA13 = g4pow->Z13(theRestNucleusA);
 
   if ((theRestNucleusA < theRestNucleusZ) ||
@@ -149 +102 @@
       return;
     }
-  
-  
+    
   // Calculate Coulomb barrier
   theCoulombBarrier = theCoulombBarrierPtr->
-    GetCoulombBarrier(static_cast<G4int>(theRestNucleusA),static_cast<G4int>(theRestNucleusZ),
+    GetCoulombBarrier(theRestNucleusA,theRestNucleusZ,
                       aFragment.GetExcitationEnergy());
 
+  // Calculate masses
+  theRestNucleusMass = 
+    G4NucleiProperties::GetNuclearMass(theRestNucleusA, theRestNucleusZ);
+  theReducedMass = theRestNucleusMass*theMass/(theRestNucleusMass + theMass);
 
   // Compute Binding Energies for fragments 
   // (needed to separate a fragment from the nucleus)
+  theBindingEnergy = theRestNucleusMass + theMass - aFragment.GetGroundStateMass();
   
-  theBindingEnergy = G4NucleiProperties::GetMassExcess(static_cast<G4int>(theA),static_cast<G4int>(theZ)) +
-    G4NucleiProperties::GetMassExcess(static_cast<G4int>(theRestNucleusA),static_cast<G4int>(theRestNucleusZ)) -
-    G4NucleiProperties::GetMassExcess(static_cast<G4int>(aFragment.GetA()),static_cast<G4int>(aFragment.GetZ()));
+  //theBindingEnergy = G4NucleiProperties::GetMassExcess(static_cast<G4int>(theA),static_cast<G4int>(theZ)) +
+  //G4NucleiProperties::GetMassExcess(static_cast<G4int>(theRestNucleusA),static_cast<G4int>(theRestNucleusZ)) -
+  //G4NucleiProperties::GetMassExcess(static_cast<G4int>(aFragment.GetA()),static_cast<G4int>(aFragment.GetZ()));
   
   // Compute Maximal Kinetic Energy which can be carried by fragments after separation
   // This is the true (assimptotic) maximal kinetic energy
-  G4double m = aFragment.GetMomentum().m();
-  G4double rm = GetRestNuclearMass();
-  G4double em = GetNuclearMass();
+  G4double m  = aFragment.GetMomentum().m();
+  G4double rm = theRestNucleusMass;
+  G4double em = theMass;
   theMaximalKineticEnergy = ((m - rm)*(m + rm) + em*em)/(2.0*m) - em;
  
-  
   return;
 }
-
-
-
-