Changeset 1340 for trunk/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.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/G4GlauberGribovCrossSection.hh (modified) (10 diffs)

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

@@ -47 +47 @@
 #include "G4Proton.hh"
 #include "G4Nucleus.hh"
+#include "G4HadTmpUtil.hh"
 
 #include "G4VCrossSectionDataSet.hh"
@@ -63 +64 @@
 
   virtual
-  G4bool IsZAApplicable(const G4DynamicParticle* aDP, G4double Z, G4double A);
+  G4bool IsIsoApplicable(const G4DynamicParticle* aDP, G4int Z, G4int A);
 
   virtual
@@ -71 +72 @@
 
   virtual
-  G4double GetIsoZACrossSection(const G4DynamicParticle*, 
-                                G4double Z, G4double A, 
-                                G4double aTemperature = 0.0);
+  G4double GetZandACrossSection(const G4DynamicParticle*,
+                                G4int Z, G4int A,
+                                G4double aTemperature = 0.0);
 
   virtual
@@ -83 +84 @@
   {G4cout << "G4GlauberGribovCrossSection: uses Glauber-Gribov formula"<<G4endl;}
 
-  G4double GetRatioSD(const G4DynamicParticle*, G4double At, G4double Zt);
-  G4double GetRatioQE(const G4DynamicParticle*, G4double At, G4double Zt);
+  G4double GetRatioSD(const G4DynamicParticle*, G4int At, G4int Zt);
+  G4double GetRatioQE(const G4DynamicParticle*, G4int At, G4int Zt);
 
   G4double GetHadronNucleonXsc(const G4DynamicParticle*, const G4Element*);
-  G4double GetHadronNucleonXsc(const G4DynamicParticle*, G4double At, G4double Zt);
+  G4double GetHadronNucleonXsc(const G4DynamicParticle*, G4int At, G4int Zt);
 
   G4double GetHadronNucleonXscPDG(const G4DynamicParticle*, const G4Element*);
-  G4double GetHadronNucleonXscPDG(const G4DynamicParticle*, G4double At, G4double Zt);
+  G4double GetHadronNucleonXscPDG(const G4DynamicParticle*, G4int At, G4int Zt);
 
   G4double GetHadronNucleonXscNS(const G4DynamicParticle*, const G4Element*);
-  G4double GetHadronNucleonXscNS(const G4DynamicParticle*,G4double At, G4double Zt);
+  G4double GetHadronNucleonXscNS(const G4DynamicParticle*, G4int At, G4int Zt);
 
   G4double GetHNinelasticXsc(const G4DynamicParticle*, const G4Element*);
-  G4double GetHNinelasticXsc(const G4DynamicParticle*, G4double At, G4double Zt);
-  G4double GetHNinelasticXscVU(const G4DynamicParticle*, G4double At, G4double Zt);
+  G4double GetHNinelasticXsc(const G4DynamicParticle*, G4int At, G4int Zt);
+  G4double GetHNinelasticXscVU(const G4DynamicParticle*, G4int At, G4int Zt);
 
   G4double CalculateEcmValue ( const G4double , const G4double , const G4double ); 
@@ -103 +104 @@
   G4double CalcMandelstamS( const G4double , const G4double , const G4double );
 
-  G4double GetElasticGlauberGribov(const G4DynamicParticle*,G4double Z, G4double A);
-  G4double GetInelasticGlauberGribov(const G4DynamicParticle*,G4double Z, G4double A);
+  G4double GetElasticGlauberGribov(const G4DynamicParticle*, G4int Z, G4int A);
+  G4double GetInelasticGlauberGribov(const G4DynamicParticle*, G4int Z, G4int A);
 
   G4double GetTotalGlauberGribovXsc()    { return fTotalXsc;     }; 
@@ -114 +115 @@
 
   G4double GetNucleusRadius(const G4DynamicParticle*, const G4Element*);
-  G4double GetNucleusRadius(G4double At);
-
-  inline G4double GetParticleBarCorTot( const G4ParticleDefinition* theParticle, G4double Z );
-  inline G4double GetParticleBarCorIn( const G4ParticleDefinition* theParticle, G4double Z );
+  G4double GetNucleusRadius(G4int At);
+
+  inline G4double GetParticleBarCorTot(const G4ParticleDefinition* theParticle, G4int Z);
+  inline G4double GetParticleBarCorIn(const G4ParticleDefinition* theParticle, G4int Z);
 
   inline void SetEnergyLowerLimit(G4double E ){fLowerLimit=E;};
@@ -180 +181 @@
 
 inline
-G4double G4GlauberGribovCrossSection::GetElasticGlauberGribov(
-         const G4DynamicParticle* dp, G4double Z, G4double A)
-{
-  GetIsoZACrossSection(dp, Z, A);
+G4double
+G4GlauberGribovCrossSection::GetElasticGlauberGribov(const G4DynamicParticle* dp,
+                                                     G4int Z, G4int A)
+{
+  GetZandACrossSection(dp, Z, A);
   return fElasticXsc;
 }
@@ -190 +192 @@
 
 inline
-G4double G4GlauberGribovCrossSection::GetInelasticGlauberGribov(
-         const G4DynamicParticle* dp, G4double Z, G4double A)
-{
-  GetIsoZACrossSection(dp, Z, A);
+G4double
+G4GlauberGribovCrossSection::GetInelasticGlauberGribov(const G4DynamicParticle* dp,
+                                                       G4int Z, G4int A)
+{
+  GetZandACrossSection(dp, Z, A);
   return fInelasticXsc;
 }
@@ -204 +207 @@
 
 inline G4double G4GlauberGribovCrossSection::GetParticleBarCorTot( 
-                          const G4ParticleDefinition* theParticle, G4double Z )
-{
-  G4int iZ = G4int(Z);
-
-  if( iZ >= 2 && iZ <= 92)
+                          const G4ParticleDefinition* theParticle, G4int Z)
+{
+  if(Z >= 2 && Z <= 92)
   {
-    if(      theParticle == theProton ) return fProtonBarCorrectionTot[iZ]; 
-    else if( theParticle == theNeutron) return fNeutronBarCorrectionTot[iZ]; 
-    else if( theParticle == thePiPlus ) return fPionPlusBarCorrectionTot[iZ];
-    else if( theParticle == thePiMinus) return fPionMinusBarCorrectionTot[iZ];
+    if(      theParticle == theProton ) return fProtonBarCorrectionTot[Z]; 
+    else if( theParticle == theNeutron) return fNeutronBarCorrectionTot[Z]; 
+    else if( theParticle == thePiPlus ) return fPionPlusBarCorrectionTot[Z];
+    else if( theParticle == thePiMinus) return fPionMinusBarCorrectionTot[Z];
     else return 1.0;
   }
@@ -226 +227 @@
 
 inline G4double G4GlauberGribovCrossSection::GetParticleBarCorIn( 
-                          const G4ParticleDefinition* theParticle, G4double Z )
-{
-  G4int iZ = G4int(Z);
-
-  if( iZ >= 2 && iZ <= 92)
+                          const G4ParticleDefinition* theParticle, G4int Z)
+{
+  if(Z >= 2 && Z <= 92)
   {
-    if(      theParticle == theProton ) return fProtonBarCorrectionIn[iZ]; 
-    else if( theParticle == theNeutron) return fNeutronBarCorrectionIn[iZ]; 
-    else if( theParticle == thePiPlus ) return fPionPlusBarCorrectionIn[iZ];
-    else if( theParticle == thePiMinus) return fPionMinusBarCorrectionIn[iZ];
+    if(      theParticle == theProton ) return fProtonBarCorrectionIn[Z]; 
+    else if( theParticle == theNeutron) return fNeutronBarCorrectionIn[Z]; 
+    else if( theParticle == thePiPlus ) return fPionPlusBarCorrectionIn[Z];
+    else if( theParticle == thePiMinus) return fPionMinusBarCorrectionIn[Z];
     else return 1.0;
   }