Changeset 1340 for trunk/source/processes/hadronic/cross_sections/src/G4EMDissociationCrossSection.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/cross_sections/src/G4EMDissociationCrossSection.cc (modified) (14 diffs)

trunk/source/processes/hadronic/cross_sections/src/G4EMDissociationCrossSection.cc

@@ -34 +34 @@
 // ********************************************************************
 //
-// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // MODULE:              G4EMDissociationCrossSection.cc
@@ -45 +45 @@
 // Contract:            17191/03/NL/LvH
 //
-// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // CHANGE HISTORY
@@ -56 +56 @@
 // Beta release
 //
-// 30. May 2005, J.P. Wellisch removed a compilation warning on gcc 3.4 for gant4 7.1.
-//
-// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-////////////////////////////////////////////////////////////////////////////////
+// 30. May 2005, J.P. Wellisch removed a compilation warning on gcc 3.4 for 
+//               geant4 7.1.
+//
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+//////////////////////////////////////////////////////////////////////////////
 //
 #include "G4EMDissociationCrossSection.hh"
@@ -65 +66 @@
 #include "G4ParticleTable.hh"
 #include "G4IonTable.hh"
+#include "G4HadTmpUtil.hh"
 #include "globals.hh"
-////////////////////////////////////////////////////////////////////////////////
-//
+
+
 G4EMDissociationCrossSection::G4EMDissociationCrossSection ()
 {
-//
 //
 // This function makes use of the class which can sample the virtual photon
@@ -86 +87 @@
   xd      = 0.25;
 }
-////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
 //
 G4EMDissociationCrossSection::~G4EMDissociationCrossSection()
@@ -92 +93 @@
   delete thePhotonSpectrum;
 }
-///////////////////////////////////////////////////////////////////////////////
-//
-G4bool G4EMDissociationCrossSection::IsZAApplicable
-(const G4DynamicParticle* theDynamicParticle, G4double /*ZZ*/, G4double AA)
+/////////////////////////////////////////////////////////////////////////////
+//
+G4bool
+G4EMDissociationCrossSection::IsIsoApplicable(const G4DynamicParticle* theDynamicParticle,
+                                              G4int /*ZZ*/, G4int AA)
 {
 //
@@ -105 +107 @@
 //
   if (G4ParticleTable::GetParticleTable()->GetIonTable()->
-    IsIon(theDynamicParticle->GetDefinition()) && AA > 1.0)
+    IsIon(theDynamicParticle->GetDefinition()) && AA > 1)
     return true;
   else
@@ -114 +116 @@
   (const G4DynamicParticle* theDynamicParticle, const G4Element* theElement)
 {
-  return IsZAApplicable(theDynamicParticle, 0., theElement->GetN());
+  return IsIsoApplicable(theDynamicParticle, 0, G4lrint(theElement->GetN()));
 }
 
@@ -130 +132 @@
     G4IsotopeVector* isoVector = theElement->GetIsotopeVector();
     G4double* abundVector = theElement->GetRelativeAbundanceVector();
-    G4double ZZ;
-    G4double AA;
+    G4int ZZ;
+    G4int AA;
      
     for (G4int i = 0; i < nIso; i++) {
-      ZZ = G4double( (*isoVector)[i]->GetZ() );
-      AA = G4double( (*isoVector)[i]->GetN() );
-      sig = GetIsoZACrossSection(theDynamicParticle, ZZ, AA, temperature);
+      ZZ = (*isoVector)[i]->GetZ();
+      AA = (*isoVector)[i]->GetN();
+      sig = GetZandACrossSection(theDynamicParticle, ZZ, AA, temperature);
       crossSection += sig*abundVector[i];
     }
    
   } else {
-    crossSection =
-      GetIsoZACrossSection(theDynamicParticle, theElement->GetZ(), 
-                           theElement->GetN(), temperature);
+    G4int ZZ = G4lrint(theElement->GetZ());
+    G4int AA = G4lrint(theElement->GetN());
+    crossSection = GetZandACrossSection(theDynamicParticle, ZZ, AA, temperature);
   }
     
@@ -150 +152 @@
 
 
-G4double G4EMDissociationCrossSection::GetIsoZACrossSection
-  (const G4DynamicParticle *theDynamicParticle, G4double ZZ, G4double AA,
-   G4double /*temperature*/)
-{
-//
+G4double
+G4EMDissociationCrossSection::GetZandACrossSection(const G4DynamicParticle *theDynamicParticle,
+                                                   G4int ZZ, G4int AA, G4double /*temperature*/)
+{
 //
 // Get relevant information about the projectile and target (A, Z) and
@@ -240 +241 @@
   return theCrossSectionVector;
 }
+
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -247 +249 @@
 {
 //
-//
 // This is a cheaky little member function to calculate the probability of
 // EMD for the target in the field of the projectile ... just by reversing the
@@ -254 +255 @@
   return GetCrossSectionForProjectile (AT, ZT, AP, ZP, b, bmin);
 }
-////////////////////////////////////////////////////////////////////////////////
-//
+
+
 G4double
-  G4EMDissociationCrossSection::GetWilsonProbabilityForProtonDissociation
-  (G4double A, G4double Z)
-{
-//
+G4EMDissociationCrossSection::GetWilsonProbabilityForProtonDissociation(G4double A,
+                                                                        G4double Z)
+{
 //
 // This is a simple algorithm to choose whether a proton or neutron is ejected
@@ -282 +282 @@
   return p;
 }
-////////////////////////////////////////////////////////////////////////////////
-//