Changeset 1340 for trunk/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.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/G4ElectroNuclearCrossSection.cc (modified) (10 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ElectroNuclearCrossSection.cc,v 1.29 2008/10/24 19:15:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ElectroNuclearCrossSection.cc,v 1.30 2010/10/14 05:25:22 dennis Exp $
+// GEANT4 tag $Name: hadr-cross-V09-03-12 $
 //
 //
@@ -33 +33 @@
 // The last update: M.V. Kossov, CERN/ITEP (Moscow) 17-Oct-03
 // 
-//===============================================================================================
+//============================================================================
 
 ///#define debug
@@ -43 +43 @@
 
 #include "G4ElectroNuclearCrossSection.hh"
+#include "G4HadTmpUtil.hh"
 
 // Initialization of statics
-G4double  G4ElectroNuclearCrossSection::lastE=0.;  // Last used in the cross section TheEnergy
-G4int     G4ElectroNuclearCrossSection::lastF=0;   // Last used in the cross section TheFirstBin
-G4double  G4ElectroNuclearCrossSection::lastG=0.;  // Last used in the cross section TheGamma
+// Last used in the cross section TheEnergy
+G4double G4ElectroNuclearCrossSection::lastE=0.;
+
+// Last used in the cross section TheFirstBin
+G4int G4ElectroNuclearCrossSection::lastF=0;
+
+// Last used in the cross section TheGamma
+G4double G4ElectroNuclearCrossSection::lastG=0.;
+
 G4double  G4ElectroNuclearCrossSection::lastH=0.;  // Last value of the High Energy A-dependence
 G4double* G4ElectroNuclearCrossSection::lastJ1=0;  // Pointer to the last array of the J1 function
@@ -58 +65 @@
 G4double  G4ElectroNuclearCrossSection::lastSig=0.;// Last value of the Cross Section
 
-std::vector<G4double*> G4ElectroNuclearCrossSection::J1;     // Vector of pointers to the J1 tabulated functions
-std::vector<G4double*> G4ElectroNuclearCrossSection::J2;     // Vector of pointers to the J2 tabulated functions
-std::vector<G4double*> G4ElectroNuclearCrossSection::J3;     // Vector of pointers to the J3 tabulated functions
+// Vector of pointers to the J1 tabulated functions
+std::vector<G4double*> G4ElectroNuclearCrossSection::J1;
+
+// Vector of pointers to the J2 tabulated functions
+std::vector<G4double*> G4ElectroNuclearCrossSection::J2;
+
+// Vector of pointers to the J3 tabulated functions
+std::vector<G4double*> G4ElectroNuclearCrossSection::J3;
+
 
 G4ElectroNuclearCrossSection::G4ElectroNuclearCrossSection()
-{
-}
+{}
+
 
 G4ElectroNuclearCrossSection::~G4ElectroNuclearCrossSection()
@@ -95 +108 @@
     G4IsotopeVector* isoVector = anEle->GetIsotopeVector();
     G4double* abundVector = anEle->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(aPart, ZZ, AA, temperature);
+      ZZ = (*isoVector)[i]->GetZ();
+      AA = (*isoVector)[i]->GetN();
+      sig = GetZandACrossSection(aPart, ZZ, AA, temperature);
       xsection += sig*abundVector[i];
     }
@@ -107 +120 @@
   } else {
     xsection =
-      GetIsoZACrossSection(aPart, anEle->GetZ(), anEle->GetN(),
+      GetZandACrossSection(aPart,
+                           G4lrint(anEle->GetZ()),
+                           G4lrint(anEle->GetN()),
                            temperature);
   }
@@ -116 +131 @@
 
 G4double 
-G4ElectroNuclearCrossSection::GetIsoZACrossSection(const G4DynamicParticle* aPart,
-                                              G4double ZZ, G4double AA,
-                                              G4double /*temperature*/)
+G4ElectroNuclearCrossSection::GetZandACrossSection(const G4DynamicParticle* aPart,
+                                                   G4int ZZ, G4int AA,
+                                                   G4double /*temperature*/)
 {
   static const G4int nE=336; // !!  If you change this, change it in GetFunctions() (*.hh) !!
   static const G4int mL=nE-1;
-  static const G4double EMi=2.0612;          // Minimum tabulated Energy of the Electron
-  static const G4double EMa=50000.;          // Maximum tabulated Energy of the Electron 
-  static const G4double lEMi=std::log(EMi);       // Minimum tabulated logarithmic Energy of the Electron
-  static const G4double lEMa=std::log(EMa);       // Maximum tabulated logarithmic Energy of the Electron
+  static const G4double EMi=2.0612; // Minimum tabulated Energy of the Electron
+  static const G4double EMa=50000.; // Maximum tabulated Energy of the Electron
+  static const G4double lEMi=std::log(EMi);  // Minimum tabulated logarithmic Energy of the Electron
+  static const G4double lEMa=std::log(EMa);  // Maximum tabulated logarithmic Energy of the Electron
   static const G4double dlnE=(lEMa-lEMi)/mL; // Logarithmic step in the table for the electron Energy
   static const G4double alop=1./137.036/3.14159265; //coef. for the calculated functions (Ee>50000.)
@@ -137 +152 @@
   static std::vector <G4double> colH;    // Vector of HighEnergyCoefficients (functional calculations)
   // *** End of Static Definitions (Associative Memory) ***
+
   const G4double Energy = aPart->GetKineticEnergy()/MeV; // Energy of the electron
-  const G4int targetAtomicNumber = static_cast<int>(AA+.499); //@@ Nat mixture (?!)
-  const G4int targZ = static_cast<int>(ZZ+.001);
+  const G4int targetAtomicNumber = AA;
+  const G4int targZ = ZZ;
   const G4int targN = targetAtomicNumber-targZ; // @@ Get isotops (can change initial A)
   if (Energy<=EMi) return 0.;              // Energy is below the minimum energy in the table
+
   G4int PDG=aPart->GetDefinition()->GetPDGEncoding();
-  if(  PDG == 11 || PDG == -11)            // @@ Now only for electrons, but can be fo muons
+  if (PDG == 11 || PDG == -11)            // @@ Now only for electrons, but can be fo muons
   {
-    G4double A=targN+targZ;                // New A (can differ from G4double targetAtomicNumber)
-    if(targN!=lastN || targZ!=lastZ)       // This nucleus was not the last used isotop
+    G4double A = targN + targZ;           // New A (can differ from G4double targetAtomicNumber)
+    if(targN!=lastN || targZ!=lastZ)      // This nucleus was not the last used isotop
         {
       lastE    = 0.;                       // New history in the electron Energy
@@ -185 +202 @@
           } // End of creation of the new set of parameters
     } // End of parameters udate
+
     else if(std::abs((lastE-Energy)/Energy)<.001) return lastSig*millibarn; // Don't calc. same CS twice
     // ============================== NOW Calculate the Cross Section ==========================
@@ -268 +286 @@
 }
 
-// Correction function for Be,C @@ Move to header // @@@ !!! NOT used !!!
-//G4double G4ElectroNuclearCrossSection::LinearFit(G4double X, G4int N, const G4double* XN,
-//                                                 const G4double* YN)
-//{
-//  G4double Xj=XN[0];
-//  G4double Xh=XN[N-1];
-//  if(X<=Xj) return YN[0]; //-------+ !!! If you correct this, correct upper copy too!!
-//  else if(X>=Xh) return YN[N-1];//-|
-//  G4double Xp=0.; //               |
-//  G4int j=0;   //                  |
-//  while (X>Xj && j<N)//<-----------+
-//  {
-//    j++;
-//    Xp=Xj;
-//    Xj=XN[j];
-//  }
-//  return YN[j]-(Xj-X)*(YN[j]-YN[j-1])/(Xj-Xp);
-//}
 
 // Calculate the functions for the std::log(A)