Changeset 1340 for trunk/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh (modified) (8 diffs)

trunk/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh

@@ -25 +25 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-cross-V09-03-12 $
 //
 //
@@ -55 +55 @@
 #include "G4VProcess.hh"
 #include "G4DynamicParticle.hh"
-//#include "G4ParticleTypes.hh"
+#include "G4HadTmpUtil.hh"
 #include "G4PionPlus.hh"
 #include "G4PionZero.hh"
@@ -84 +84 @@
 #include "G4OmegaMinus.hh"
 #include "G4AntiOmegaMinus.hh"
-//#include "G4LPhysicsFreeVector.hh"
 
 
@@ -95 +94 @@
    G4HadronCrossSections()
      : prevParticleDefinition(0), lastEkx(0.), lastEkxPower(0.), verboseLevel(0)
-   {
-   }
+   {}
 
    ~G4HadronCrossSections()
-   {
-   }
+   {}
 
    static G4HadronCrossSections* Instance()
@@ -123 +120 @@
 
    G4double GetElasticCrossSection(const G4DynamicParticle*,
-                                   G4double /*ZZ*/, G4double /*AA*/);
+                                   G4int /*ZZ*/, G4int /*AA*/);
 
    G4double GetInelasticCrossSection(const G4DynamicParticle*, 
@@ -129 +126 @@
 
    G4double GetInelasticCrossSection(const G4DynamicParticle*,
-                                     G4double /*ZZ*/, G4double /*AA*/);
+                                     G4int /*ZZ*/, G4int /*AA*/);
 
    G4double GetCaptureCrossSection(const G4DynamicParticle* aParticle,
                                    const G4Element* anElement)
    {
-     return GetCaptureCrossSection(aParticle, anElement->GetZ(),
-                                              anElement->GetN());
+     G4int Z = G4lrint(anElement->GetZ());
+     G4int A = G4lrint(anElement->GetN());
+     return GetCaptureCrossSection(aParticle, Z, A);
    }
 
    G4double GetCaptureCrossSection(const G4DynamicParticle*,
-                                   G4double /*ZZ*/, G4double /*AA*/);
+                                   G4int /*ZZ*/, G4int /*AA*/);
 
    G4double GetFissionCrossSection(const G4DynamicParticle* aParticle,
                                    const G4Element* anElement)
    {
-     return GetFissionCrossSection(aParticle, anElement->GetZ(),
-                                              anElement->GetN());
+     G4int Z = G4lrint(anElement->GetZ());
+     G4int A = G4lrint(anElement->GetN());
+     return GetFissionCrossSection(aParticle, Z, A);
    }
 
    G4double GetFissionCrossSection(const G4DynamicParticle*,
-                                   G4double /*ZZ*/, G4double /*AA*/);
+                                   G4int /*ZZ*/, G4int /*AA*/);
 
 
@@ -177 +176 @@
 
    void CalcScatteringCrossSections(const G4DynamicParticle*, 
-                                    G4double /*ZZ*/, G4double /*AA*/);
+                                    G4int /*ZZ*/, G4int /*AA*/);
 
    static G4HadronCrossSections* theInstance;
@@ -199 +198 @@
    static G4float csin[NPARTS][TSIZE];
 
-
    static G4float cspiel[3][TSIZE];
    static G4float cspiin[3][TSIZE];