Changeset 1315 for trunk/source/processes/electromagnetic/standard

trunk/source/processes/electromagnetic/standard/History

-                      r1228
+                      r1315
 $Id: History,v 1.480 2009/12/03 17:28:28 vnivanch Exp $
+$Id: History,v 1.504 2010/06/04 09:25:12 vnivanch Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+June 2010:  V.Ivant (emstand-V09-03-17)
+- G4ICRU73QOModel - fixed problems and add factor for transition to
+                    Bethe-Bloch at 2 MeV
+- G4hIonisation - use G4ICRU73QOModel for negatively charged particles
+                  below 2 MeV
+- G4BraggModel - above 2 MeV use ICRU'49 parameterisation for all atoms
+June 3, 2010, V. Grichine
+- G4PAIModel.cc, G4PAIPhotonModel.cc cout for the model initialisation
+June 2010:  V.Ivant (emstand-V09-03-16)
+- G4WentzelOKandVIxSection - optimized computation of the transport
+                             cross section
+- G4WentzelVIModel - optimized method of step limitation
+May 2010:  V.Ivant (emstand-V09-03-15)
+- G4BraggIonGasModel, G4BetheBlochIonGasModel - new ionisation models
+                      for low density media
+- G4ICRU73QOModel (A.Bagulya) new model for anti-particles
+- G4hIonisation - use G4ICRU73QOModel for anti-particles
+- G4WentzelOKandVIxSection - new class to compute cross sections and
+                             sample scattering angle
+- G4WentzelVIModel, G4eCoulombScatteringModel, G4CoulombScatteringModel
+                    use new class G4WentzelOKandVIxSection
+May 2010:  V.Ivant (emstand-V09-03-14)
+- G4UrbanMscModel93 - L.Urban removed randomisation of step limit for the
+                      first step in any volume in the case of UseSafety
+- Removed obsolete models: G4UrbanMscModel, G4UrbanMscModel2, G4UrbanMscModel71,
+  G4MultipleScattering, G4ComptonScattering52, G4PolarizedComptonScattering
+May 2010:  V.Ivant (emstand-V09-03-13)
+- G4WentzelVIModel, G4eCoulombScatteringModel - added momentum dependent
+       limit of scattering angle between single and multiple scattering
+       which allowing to use  G4WentzelVIModel with optical model
+       of hadron scattering
+May 2010:  V.Ivant (emstand-V09-03-12)
+- G4GoudsmitSaundersonMscModel, G4GoudsmitSaundersonTable (O.Kadri) -
+       optimized code to improve speed by addition extra class members
+April 2010:  V.Ivant (emstand-V09-03-11)
+- G4UrbanMscModel93 - L.Urban add randomisation of step limit for the
+                      first step in any volume
+April 2010:  V.Ivant (emstand-V09-03-10)
+G4eBremsstrahlungModel - fixed SelectRandomAtom method (bug report #1115)
+April 2010:  V.Ivant (emstand-V09-03-09)
+- G4ASTARStopping, G4PSTARTStopping - C-arrays sustituted by G4PhysicsVector
+            with spline; reviewed names of materials (G4_He, G4_PHOTO_EMULSION,
+            G4_NYLON-6-6)
+- G4ASTARStopping - fixed G4_O data
+- G4PSTARStopping - fixed G4_Pt and G4_PROPANE data
+- G4WaterStopping - cleanup GetElectronicDEDX method
+April 2010:  V.Ivant (emstand-V09-03-08)
+- G4GoudsmitSaundersonMscModel (O.Kadri) - improved numerical stability
+            of computations for small angles by  direct xsection calculation
+            not inverse of the inverse angular sampling without large angle
+            rejection method longitudinal displacement is computed exactly
+            from <z>
+- G4GoudsmitSaundersonTable (O.Kadri)    - improved numerical stability by
+            minimum of used arrays in computation within the dichotomy
+            finding method
+- G4eMultipleScattering, G4hMultipleScattering - improved printout at
+                                                 initialisation
+April 2010:  V.Ivant (emstand-V09-03-07)
+- G4hMultipleScattering - removed old unused header of G4UrbanMscModel
+- G4ASTARStopping.cc - disabled corrupted data for Oxygen
+April 2010:  V.Ivant (emstand-V09-03-06)
+- G4eBremsstrahlungRelModel, G4MollerBhabhaModel - set minimum cut
+                      value to 0.1 keV
+March 2010:  V.Ivant (emstand-V09-03-05)
+- G4PolarizedComptonScattering - add message that this process is obsolete
+March 2010:  V.Ivant (emstand-V09-03-04)
+- G4eBremsstrahlungModel - reduced minThreshold to 0.1 keV
+- G4MollerBhabhaModel - reduced minimum cut value to mean ionisation
+                      potential
+March 2010:  V.Ivant (emstand-V09-03-03)
+- G4WentzelVIModel - added protections, added DefineMaterial() call
+                     before computing cross section
+March 2010:  V.Ivant (emstand-V09-03-02a)
+- G4PolarizedComptonScattering - add message that this process is obsolete
+- G4eCoulombScatteringModel - returned method default value 100 eV of 9.3 for
+                              internal low limit
+February 2010:  V.Ivant (emstand-V09-03-02)
+- make a tag co-working with emutils-V09-03-02
+February 2010:  V.Ivant (emstand-V09-03-01)
+- G4GoudsmitSaundersonMscModel, G4GoudsmitSaundersonTable (O.Kadri)
+      - fixed problems of small angle theta distributions
+February 2010:  V.Ivant (emstand-V09-03-00)
+- G4CoulombScatteringModel - Added comments to relativistic formula
+- G4eCoulombScatteringModel - Added method SetLowEnergyLimit, default
+                              value is set to 1 eV (before was 100 eV)
+- G4CoulombScattering - Removed inclined method SetBuildTableFlag because
+                        the method exist in the base class
 December 09:  V.Ivant (emstand-V09-02-36)

trunk/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4ASTARStopping.hh,v 1.6 2008/11/13 12:04:37 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ASTARStopping.hh,v 1.8 2010/04/26 17:22:08 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 #ifndef G4ASTARStopping_h
 …
 #include "globals.hh"
+#include "G4LPhysicsFreeVector.hh"
+#include <vector>
 class G4Material;
 …
   void Initialise();
+  void AddData(G4double* e, G4double* s, G4int idx);
   // hide assignment operator
   G4ASTARStopping & operator=(const  G4ASTARStopping &right);
   G4ASTARStopping(const  G4ASTARStopping&);
+  G4int matIndex;
   const G4Material* currentMaterial;
+  G4int index, matIndex;
+  G4String name[74];
+  G4double currentE, res;
+  G4double e[74][78], kinE[78];
+  G4double effZ[74];
+  G4double emin;
+  std::vector<G4String> name;
+  std::vector<G4double> effZ;
+  std::vector<G4LPhysicsFreeVector*> sdata;
 };
 …
+{
   return effZ[idx];
+}
+}
 #endif

trunk/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4BetheBlochModel.hh,v 1.20 2009/04/23 17:44:43 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4BetheBlochModel.hh,v 1.23 2010/05/27 14:26:17 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
                                      G4double kineticEnergy);
   virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
                                     const G4DynamicParticle*,
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
+                                    const G4DynamicParticle* dp,
                                     G4double& eloss,
                                     G4double& niel,
+                                    G4double&,
                                     G4double length);
 …
                                       G4double kinEnergy);
+  inline G4double GetChargeSquareRatio() const;
+  inline void SetChargeSquareRatio(G4double val);
 private:
   inline void SetupParameters();
+  void SetupParameters();
   inline void SetParticle(const G4ParticleDefinition* p);
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4BetheBlochModel::SetupParameters()
+{
-  mass = particle->GetPDGMass();
-  spin = particle->GetPDGSpin();
-  G4double q = particle->GetPDGCharge()/eplus;
-  chargeSquare = q*q;
-  ratio = electron_mass_c2/mass;
-  G4double magmom = particle->GetPDGMagneticMoment()*mass/(0.5*eplus*hbar_Planck*c_squared);
-  magMoment2 = magmom*magmom - 1.0;
-  formfact = 0.0;
-  if(particle->GetLeptonNumber() == 0) {
-    G4double x = 0.8426*GeV;
-    if(spin == 0.0 && mass < GeV) {x = 0.736*GeV;}
-    else if(mass > GeV) {
-      x /= nist->GetZ13(mass/proton_mass_c2);
-      //        tlimit = 51.2*GeV*A13[iz]*A13[iz];
+    }
-    formfact = 2.0*electron_mass_c2/(x*x);
-    tlimit   = 2.0/formfact;
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline void G4BetheBlochModel::SetParticle(const G4ParticleDefinition* p)
+{
   if(particle != p) {
     particle = p;
+    if (p->GetPDGCharge()/eplus > 1.5 && p->GetBaryonNumber() > 2) isIon = true;
+    if (p->GetPDGCharge()/eplus > 1.5 && p->GetBaryonNumber() > 2)
+      { isIon = true; }
     SetupParameters();
+  }
 …
 inline void G4BetheBlochModel::SetGenericIon(const G4ParticleDefinition* p)
+{
   if(p && particle != p) {
     if(p->GetParticleName() == "GenericIon") isIon = true;
+  if(p && particle != p) {
+    if(p->GetParticleName() == "GenericIon") { isIon = true; }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4BetheBlochModel::GetChargeSquareRatio() const
+{
+  return chargeSquare;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4BetheBlochModel::SetChargeSquareRatio(G4double val)
+{
+  chargeSquare = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/standard/include/G4BraggModel.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4BraggModel.hh,v 1.14 2009/11/10 19:25:47 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4BraggModel.hh,v 1.15 2010/05/27 10:08:58 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
                                      const G4Material* mat,
                                      G4double kineticEnergy);
-  /*
-  // add correction to energy loss and compute non-ionizing energy loss
-  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
-                                    const G4DynamicParticle*,
-                                    G4double& eloss,
-                                    G4double& niel,
-                                    G4double length);
-  */
 protected:
 …
   virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                                       G4double kinEnergy);
+  inline G4double GetChargeSquareRatio() const;
+  inline void SetChargeSquareRatio(G4double val);
 private:
 …
+}
+inline G4double G4BraggModel::GetChargeSquareRatio() const
+{
+  return chargeSquare;
+}
+inline void G4BraggModel::SetChargeSquareRatio(G4double val)
+{
+  chargeSquare = val;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4CoulombScattering.hh,v 1.13 2009/05/07 18:41:45 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4CoulombScattering.hh,v 1.14 2010/02/17 18:59:22 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
   // Set energy above which high energy model will be used
   inline void SetHEModelLimit(G4double);
-  // obsolete method to be removed
-  inline void SetBuildTableFlag(G4bool);
   // Print out of the class parameters
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4CoulombScattering::SetBuildTableFlag(G4bool)
-{}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline void G4CoulombScattering::SetHEModelLimit(G4double val)
+{

trunk/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4CoulombScatteringModel.hh,v 1.15 2008/07/31 13:11:34 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4CoulombScatteringModel.hh,v 1.17 2010/05/27 14:22:05 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // 09.10.07 V.Ivanchenko reorganized methods, add cut dependence in scattering off e-
 // 09.06.08 V.Ivanchenko SelectIsotope is moved to the base class
+// 27.05.10 V.Ivanchenko added G4WentzelOKandVIxSection class to
+//              compute cross sections and sample scattering angle
 //
 // Class Description:

trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonMscModel.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4GoudsmitSaundersonMscModel.hh,v 1.2 2009/06/04 13:45:49 gunter Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GoudsmitSaundersonMscModel.hh,v 1.4 2010/05/17 15:11:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // Modifications:
 // 04.03.2009 V.Ivanchenko cleanup and format according to Geant4 EM style
+// 12.05.2010 O.Kadri: adding Qn1 and Qn12 as private doubles
 //
 // Class description:
 …
 //Ref.5:F. Salvat et al.,"ELSEPA--Dirac partial ...molecules", Comp. Phys. Comm. 165 (2005) pp 157-190;
 //Ref.6:G4UrbanMscModel G4_v9.1Ref09;
 //Ref.7:G4eCoulombScatteringModel G4_v9.1Ref09.
+//Ref.7:G4WentzelVIModel G4_v9.3.
 //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 …
 #include "G4PhysicsTable.hh"
 #include "globals.hh"
-#include "G4DataInterpolation.hh"
 class G4DataVector;
 …
   G4GoudsmitSaundersonMscModel(const  G4GoudsmitSaundersonMscModel&);
   G4double              lowKEnergy;
   G4double              highKEnergy;
+  G4double lowKEnergy;
+  G4double highKEnergy;
   G4double currentKinEnergy;
   G4double currentRange;
 …
   G4double charge,lambdalimit;
   G4double tPathLength,stepmin ;
   G4double lambda1,lambda11;
+  G4double lambda0,lambda1,lambda11,Qn1,Qn12;
   G4double mass;
-  G4double lambda0;
   G4int    currentMaterialIndex;
 …
   const G4ParticleDefinition* particle;
   G4ParticleChangeForMSC*     fParticleChange;
-  G4DataInterpolation* MyValue;
   const G4MaterialCutsCouple* currentCouple;

trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonTable.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4GoudsmitSaundersonTable.hh,v 1.3 2009/06/18 18:43:09 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GoudsmitSaundersonTable.hh,v 1.4 2010/02/19 09:29:53 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4PSTARStopping.hh,v 1.5 2008/11/13 12:04:37 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PSTARStopping.hh,v 1.7 2010/04/26 17:22:08 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 #ifndef G4PSTARStopping_h
 …
 #include "globals.hh"
+#include "G4LPhysicsFreeVector.hh"
+#include <vector>
 class G4Material;
 …
   void Initialise();
+  void AddData(G4double* e, G4double* s, G4int idx);
   // hide assignment operator
   G4PSTARStopping & operator=(const  G4PSTARStopping &right);
   G4PSTARStopping(const  G4PSTARStopping&);
+  G4int matIndex;
   const G4Material* currentMaterial;
+  G4int index, matIndex;
+  G4String name[74];
+  G4double currentE, res;
+  G4double e[74][60], kinE[60];
+  G4double emin;
+  std::vector<G4String> name;
+  std::vector<G4LPhysicsFreeVector*> sdata;
 };

trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel93.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4UrbanMscModel93.hh,v 1.1 2009/11/01 13:04:12 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UrbanMscModel93.hh,v 1.4 2009/12/14 06:57:12 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/include/G4WaterStopping.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4WaterStopping.hh,v 1.7 2009/06/19 10:39:48 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4WaterStopping.hh,v 1.8 2010/04/26 17:22:08 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 #ifndef G4WaterStopping_h
 …
   G4int    Z[17];
   G4double A[17];
+  G4double emin;
   std::vector<G4LPhysicsFreeVector*>  dedx;
 };

trunk/source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4WentzelVIModel.hh,v 1.21 2009/10/10 15:16:57 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4WentzelVIModel.hh,v 1.29 2010/05/27 14:22:05 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 //
 // Modifications:
+//
+// 27-05-2010 V.Ivanchenko added G4WentzelOKandVIxSection class to
+//              compute cross sections and sample scattering angle
 //
 // Class Description:
 …
 #include "G4VMscModel.hh"
 #include "G4PhysicsTable.hh"
-#include "G4MscStepLimitType.hh"
 #include "G4MaterialCutsCouple.hh"
+#include "G4NistManager.hh"
+#include "G4WentzelOKandVIxSection.hh"
+class G4ParticleDefinition;
 class G4LossTableManager;
+class G4ParticleChangeForMSC;
+class G4ParticleDefinition;
+class G4Pow;
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
 private:
-  G4double ComputeTransportXSectionPerAtom();
   G4double ComputeXSectionPerVolume();
-  void ComputeMaxElectronScattering(G4double cut);
   inline G4double GetLambda(G4double kinEnergy);
   inline void SetupParticle(const G4ParticleDefinition*);
-  inline void SetupKinematic(G4double kinEnergy, G4double cut);
-  inline void SetupTarget(G4double Z, G4double kinEnergy);
   inline void DefineMaterial(const G4MaterialCutsCouple*);
 …
   G4WentzelVIModel(const  G4WentzelVIModel&);
+  const G4ParticleDefinition* theProton;
+  const G4ParticleDefinition* theElectron;
+  const G4ParticleDefinition* thePositron;
+  G4LossTableManager*       theManager;
   G4ParticleChangeForMSC*   fParticleChange;
+  G4WentzelOKandVIxSection* wokvi;
+  G4Pow*                    fG4pow;
   G4PhysicsTable*           theLambdaTable;
-  G4PhysicsTable*           theLambda2Table;
-  G4LossTableManager*       theManager;
   const G4DataVector*       currentCuts;
-  G4NistManager*            fNistManager;
-  G4double numlimit;
   G4double tlimitminfix;
   G4double invsqrt12;
   // cash
+  // cache kinematics
   G4double preKinEnergy;
-  G4double ecut;
-  G4double lambda0;
   G4double tPathLength;
   G4double zPathLength;
   G4double lambdaeff;
   G4double currentRange;
+  G4double par1;
+  G4double par2;
+  G4double par3;
+  // data for single scattering mode
   G4double xtsec;
   std::vector<G4double> xsecn;
 …
   G4int    nelments;
+  G4int    nbins;
+  G4int    nwarnings;
+  G4int    nwarnlimit;
+  G4double numlimit;
+  // cache material
   G4int    currentMaterialIndex;
   const G4MaterialCutsCouple* currentCouple;
   const G4Material* currentMaterial;
   // single scattering parameters
-  G4double coeff;
   G4double cosThetaMin;
   G4double cosThetaMax;
   G4double cosTetMaxNuc;
-  G4double cosTetMaxNuc2;
-  G4double cosTetMaxElec;
-  G4double cosTetMaxElec2;
-  G4double q2Limit;
-  G4double alpha2;
   // projectile
   const G4ParticleDefinition* particle;
-  G4double chargeSquare;
-  G4double spin;
-  G4double mass;
-  G4double tkin;
-  G4double mom2;
-  G4double invbeta2;
-  G4double kinFactor;
-  G4double etag;
   G4double lowEnergyLimit;
-  // target
-  G4double targetZ;
-  G4double targetMass;
-  G4double screenZ;
-  G4double formfactA;
-  G4int    iz;
-  static G4double ScreenRSquare[100];
-  static G4double FormFactor[100];
   // flags
 …
   G4double x;
   if(theLambdaTable) {
+    G4bool b;
+    x = ((*theLambdaTable)[currentMaterialIndex])->GetValue(e, b);
+    x = ((*theLambdaTable)[currentMaterialIndex])->Value(e);
   } else {
     x = CrossSection(currentCouple,particle,e,
                      (*currentCuts)[currentMaterialIndex]);
+  }
   if(x > DBL_MIN) x = 1./x;
   else            x = DBL_MAX;
+  if(x > DBL_MIN) { x = 1./x; }
+  else            { x = DBL_MAX; }
   return x;
+}
 …
   if(p != particle) {
     particle = p;
+    mass = particle->GetPDGMass();
+    spin = particle->GetPDGSpin();
+    G4double q = particle->GetPDGCharge()/eplus;
+    chargeSquare = q*q;
+    tkin = 0.0;
+    wokvi->SetupParticle(p);
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4WentzelVIModel::SetupKinematic(G4double ekin, G4double cut)
+{
-  if(ekin != tkin || ecut != cut) {
-    tkin  = ekin;
-    mom2  = tkin*(tkin + 2.0*mass);
-    invbeta2 = 1.0 +  mass*mass/mom2;
-    cosTetMaxNuc = cosThetaMax;
-    if(mass < MeV && ekin <= 10.*cut) {
-      cosTetMaxNuc = ekin*(cosThetaMax + 1.0)/(10.*cut) - 1.0;
+    }
-    ComputeMaxElectronScattering(cut);
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4WentzelVIModel::SetupTarget(G4double Z, G4double e)
+{
-  if(Z != targetZ || e != etag) {
-    etag    = e;
-    targetZ = Z;
-    iz = G4int(Z);
-    if(iz > 99) iz = 99;
-    targetMass = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
-    screenZ = ScreenRSquare[iz]/mom2;
-    G4double meff = targetMass/(mass+targetMass);
-    kinFactor = coeff*targetZ*chargeSquare*invbeta2/(mom2*meff*meff);
-    screenZ *=(1.13 + std::min(1.0,3.76*Z*Z*invbeta2*alpha2));
-    if(mass > MeV) { screenZ *= 2.0; }
-    formfactA = FormFactor[iz]*mom2;
-    cosTetMaxNuc2 = cosTetMaxNuc;
-    cosTetMaxElec2 = cosTetMaxElec;
+  }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4eCoulombScatteringModel.hh,v 1.49 2009/10/10 15:16:57 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4eCoulombScatteringModel.hh,v 1.56 2010/05/27 14:22:05 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // 09.06.08 V.Ivanchenko add SelectIsotope and sampling of the recoil ion
 // 17.06.09 C.Consoalndi modified SetupTarget method - remove kinFactor
+// 27.05.10 V.Ivanchenko added G4WentzelOKandVIxSection class to
+//              compute cross sections and sample scattering angle
 //
 //
 …
 #include "G4VEmModel.hh"
-#include "G4PhysicsTable.hh"
 #include "globals.hh"
 #include "G4NistManager.hh"
 #include <vector>
+#include "G4MaterialCutsCouple.hh"
+#include "G4WentzelOKandVIxSection.hh"
 class G4ParticleChangeForGamma;
 class G4ParticleDefinition;
+class G4ParticleTable;
+class G4NistManager;
 class G4eCoulombScatteringModel : public G4VEmModel
 …
                                  G4double maxEnergy);
+  // defines low energy limit of the model
+  inline void SetLowEnergyLimit(G4double val);
+  // obsolete method
   inline void SetRecoilThreshold(G4double eth);
 protected:
-  G4double CrossSectionPerAtom();
-  G4double SampleCosineTheta();
   inline void DefineMaterial(const G4MaterialCutsCouple*);
 …
   inline void SetupParticle(const G4ParticleDefinition*);
-  inline void SetupKinematic(G4double kinEnergy, G4double cut);
-  inline void SetupTarget(G4double Z, G4double kinEnergy);
 private:
-  void ComputeMaxElectronScattering(G4double cut);
   // hide assignment operator
 …
 protected:
+  const G4ParticleDefinition* theProton;
+  const G4ParticleDefinition* theElectron;
+  const G4ParticleDefinition* thePositron;
+  G4ParticleTable*          theParticleTable;
+  G4ParticleTable*          theParticleTable;
   G4ParticleChangeForGamma* fParticleChange;
+  G4WentzelOKandVIxSection* wokvi;
   G4NistManager*            fNistManager;
 …
   G4int                       currentMaterialIndex;
-  G4double                  coeff;
   G4double                  cosThetaMin;
   G4double                  cosThetaMax;
   G4double                  cosTetMinNuc;
   G4double                  cosTetMaxNuc;
-  G4double                  cosTetMaxNuc2;
-  G4double                  cosTetMaxElec;
-  G4double                  cosTetMaxElec2;
-  G4double                  q2Limit;
   G4double                  recoilThreshold;
+  G4double                  elecXSection;
+  G4double                  nucXSection;
+  G4double                  ecut;
+  G4double                  elecRatio;
+  G4double                  mass;
   // projectile
   const G4ParticleDefinition* particle;
+  const G4ParticleDefinition* theProton;
-  G4double                  chargeSquare;
-  G4double                  spin;
-  G4double                  mass;
-  G4double                  tkin;
-  G4double                  mom2;
-  G4double                  invbeta2;
-  G4double                  etag;
   G4double                  lowEnergyLimit;
-  // target
-  G4double                  targetZ;
-  G4double                  targetMass;
-  G4double                  screenZ;
-  G4double                  formfactA;
-  G4int                     idxelm;
-  G4int                     iz;
 private:
-  G4double                  alpha2;
-  G4double                  faclim;
-  static G4double ScreenRSquare[100];
-  static G4double FormFactor[100];
   G4bool                    isInitialised;
 …
     particle = p;
     mass = particle->GetPDGMass();
+    spin = particle->GetPDGSpin();
+    G4double q = particle->GetPDGCharge()/eplus;
+    chargeSquare = q*q;
+    tkin = 0.0;
+    wokvi->SetupParticle(p);
+  }
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4eCoulombScatteringModel::SetupKinematic(G4double ekin,
+                                                      G4double cut)
+inline void G4eCoulombScatteringModel::SetLowEnergyLimit(G4double val)
+{
+  if(ekin != tkin || ecut != cut) {
+    tkin = ekin;
+    mom2 = tkin*(tkin + 2.0*mass);
+    invbeta2 = 1.0 +  mass*mass/mom2;
+    cosTetMinNuc = cosThetaMin;
+    cosTetMaxNuc = cosThetaMax;
+    if(mass < MeV && cosThetaMin < 1.0 && ekin <= 10.*cut) {
+      cosTetMinNuc = ekin*(cosThetaMin + 1.0)/(10.*cut) - 1.0;
+    }
+    ComputeMaxElectronScattering(cut);
+  }
+  lowEnergyLimit = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4eCoulombScatteringModel::SetupTarget(G4double Z, G4double e)
+{
-  if(Z != targetZ || e != etag) {
-    etag    = e;
-    targetZ = Z;
-    iz= G4int(Z);
-    if(iz > 99) iz = 99;
-    targetMass = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
-    screenZ = ScreenRSquare[iz]/mom2;
-    screenZ *=(1.13 + std::min(1.0,3.76*Z*Z*invbeta2*alpha2));
-    if(mass > MeV) { screenZ *= 2.0; }
-    formfactA = FormFactor[iz]*mom2;
-    cosTetMaxNuc2 = cosTetMaxNuc;
-    if(1 == iz && particle == theProton && cosTetMaxNuc2 < 0.0) {
-      cosTetMaxNuc2 = 0.0;
+    }
-    cosTetMaxElec2 = cosTetMaxElec;
+  }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/include/G4hIonisation.hh

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4hIonisation.hh,v 1.42 2009/02/20 12:06:37 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4hIonisation.hh,v 1.44 2010/05/27 10:25:23 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
   virtual void PrintInfo();
+  // obsolete method
   void ActivateNuclearStopping(G4bool);
 …
   G4bool     isInitialised;
-  G4bool     nuclearStopping;
   G4double   mass;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4hIonisation::ActivateNuclearStopping(G4bool val)
+{
-  nuclearStopping = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4ASTARStopping.cc,v 1.8 2008/11/24 18:28:09 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ASTARStopping.cc,v 1.13 2010/04/26 17:22:08 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
 //---------------------------------------------------------------------------
 //
 …
 //
 // Modifications:
+// 19.04.2010 A.Ivanchenko fixed data for G4_O,
+//                         checked all data
+// 25.04.2010 V.Ivanchenko introduce G4LPhysicsFreeVector
 //
 //----------------------------------------------------------------------------
 …
 G4ASTARStopping::G4ASTARStopping()
+{
-  currentE = 0.0;
   currentMaterial = 0;
-  index = 0;
   matIndex = -1;
+  name.resize(74,"");
+  effZ.resize(74,0);
+  sdata.resize(74,0);
   Initialise();
+}
 …
 G4ASTARStopping::~G4ASTARStopping()
+{}
+{
+  for(size_t i=0; i<74; ++i) { delete sdata[i]; }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
 G4int G4ASTARStopping:: GetIndex (const G4Material* mat)
+{
   if (mat == currentMaterial) return matIndex;
+  if (mat == currentMaterial) { return matIndex; }
   G4String matName = mat->GetName();
   for (G4int i=0; i<74; i++){
     if (matName == name[i]){
+  for (G4int i=0; i<74; ++i){
+    if (matName == name[i]){
       matIndex = i;
       currentMaterial = mat;
 …
 G4double G4ASTARStopping::GetElectronicDEDX(G4int i, G4double energy)
+{
+  if (matIndex == i && energy == currentE) return res;
+  G4double res = 0.0;
   if (i<0 || i>73){
     G4cout << "### G4ASTARStopping WARNING: index "
            << i << " is out of range!" << G4endl;
-    res = 0.0;
     return res;
+  }
+  matIndex = i;
+  currentE = energy;
+  if (energy < kinE[index] || energy > kinE[index+1]){
+    if (energy <= kinE[0]) {
+      index = 0;
+      res = e[matIndex][0]*std::sqrt(energy/kinE[0]);
+      return res;
+    } else if (energy >= kinE[77]) {
+      index = 76;
+      res = e[matIndex][77];
+      return res;
+    }
+    for (index = 0; index<77; index++){if (energy <= kinE[index+1]) break;}
+  }
+  G4double t1 = kinE[index];
+  G4double t2 = kinE[index+1];
+  G4double e1 = e[matIndex][index];
+  G4double e2 = e[matIndex][index+1];
+  res = e1*std::exp(std::log(energy/t1)*std::log(e2/e1)/std::log(t2/t1));
+  if(energy < emin) { res = (*(sdata[i]))[0]*std::sqrt(energy/emin); }
+  else              { res = sdata[i]->Value(energy); }
   return res;
+ }
+}
 void G4ASTARStopping::Initialise()
+{
-G4int i;
 G4double Z[74] = {
 .0,  6.0,  6.0, 47.0,  7.0, 13.0, 13.0, 18.0, 79.0, 6.0,
 …
 };
  for(i=0; i<74; i++) {effZ[i]=Z[i];}
+for(G4int i=0; i<74; ++i) {effZ[i]=Z[i];}
 name [0] = "G4_A-150_TISSUE";
+G4double T0[78] = { 0.001, 0.0015, 0.002, 0.0025, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.0125, 0.015, 0.0175, 0.02, 0.0225, 0.025, 0.0275, 0.03, 0.035, 0.04, 0.045, 0.05, 0.055, 0.06, 0.065, 0.07, 0.075, 0.08, 0.085, 0.09, 0.095, 0.1, 0.125, 0.15, 0.175, 0.2, 0.225, 0.25, 0.275, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1, 1.25, 1.5, 1.75, 2, 2.25, 2.5, 2.75, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9, 9.5, 10 };
+G4double T0[78] = { 0.001, 0.0015, 0.002, 0.0025, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.0125, 0.015, 0.0175, 0.02, 0.0225, 0.025, 0.0275, 0.03, 0.035, 0.04, 0.045, 0.05, 0.055, 0.06, 0.065, 0.07, 0.075, 0.08, 0.085, 0.09, 0.095, 0.1, 0.125, 0.15, 0.175, 0.2, 0.225, 0.25, 0.275, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1, 1.25, 1.5, 1.75, 2, 2.25, 2.5, 2.75, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9, 9.5, 10. };
+ emin = T0[0]*MeV;
 G4double e0[78] = { 168.8, 204.2, 233.8, 259.7, 283, 324.3, 360.4, 393, 422.8, 450.5, 476.5, 501, 557.1, 607.7, 654.1, 697.1, 737.4, 775.4, 811.5, 845.9, 910.3, 970, 1026, 1078, 1128, 1175, 1220, 1263, 1305, 1344, 1383, 1419, 1455, 1489, 1646, 1782, 1901, 2005, 2097, 2178, 2249, 2312, 2413, 2488, 2539, 2572, 2589, 2593, 2586, 2571, 2548, 2521, 2489, 2453, 2416, 2377, 2176, 1989, 1825, 1683, 1561, 1457, 1369, 1292, 1165, 1062, 978.5, 908.4, 848.8, 797.4, 752.4, 712.9, 677.7, 646.1, 617.7, 591.9, 568.4, 547 };
+ for(i=0; i<78; i++) {e[0][i]=e0[i]*MeV*cm2/g;}
+ for(i=0; i<78; i++) {kinE[i]=T0[i];}
+AddData(T0,e0, 0);
 name [1] = "G4_ACETYLENE";
 G4double e1[78] = { 192.2, 229.4, 260.2, 287, 311, 353.1, 389.7, 422.5, 452.4, 480.1, 506, 530.3, 585.9, 635.7, 681.2, 723.2, 762.5, 799.4, 834.3, 867.5, 929.6, 986.9, 1040, 1090, 1137, 1182, 1224, 1265, 1304, 1341, 1376, 1411, 1444, 1475, 1619, 1741, 1847, 1938, 2017, 2085, 2144, 2195, 2275, 2331, 2367, 2388, 2397, 2395, 2386, 2370, 2350, 2326, 2299, 2271, 2241, 2210, 2056, 1913, 1783, 1666, 1562, 1468, 1384, 1308, 1177, 1072, 986.8, 915.5, 855, 802.8, 757.2, 717.1, 681.4, 649.5, 620.7, 594.7, 570.9, 549.2 };
+ for(i=0; i<78; i++) {e[1][i]=e1[i]*MeV*cm2/g;}
+AddData(T0,e1, 1);
 name [2] = "G4_ADIPOSE_TISSUE_ICRP";
 G4double e2[78] = { 169.4, 204.2, 233.3, 258.8, 281.8, 322.4, 358.1, 390.2, 419.7, 447.2, 472.9, 497.2, 552.9, 603.2, 649.4, 692.4, 732.7, 770.7, 806.8, 841.3, 906, 966.1, 1022, 1075, 1125, 1173, 1219, 1262, 1304, 1344, 1383, 1420, 1456, 1491, 1650, 1787, 1907, 2012, 2104, 2185, 2256, 2317, 2417, 2489, 2539, 2571, 2588, 2592, 2587, 2573, 2554, 2529, 2500, 2468, 2434, 2398, 2213, 2035, 1874, 1731, 1605, 1499, 1408, 1328, 1197, 1091, 1004, 932.2, 870.7, 817.8, 771.5, 730.8, 694.5, 662.1, 632.9, 606.4, 582.3, 560.2 };
+ for(i=0; i<78; i++) {e[2][i]=e2[i]*MeV*cm2/g;}
+AddData(T0,e2, 2);
 name [3] = "G4_Ag";
 G4double e3[78] = { 31.26, 38.13, 43.91, 48.98, 53.56, 61.66, 68.79, 75.21, 81.11, 86.6, 91.74, 96.6, 107.7, 117.8, 127, 135.6, 143.6, 151.2, 158.4, 165.3, 178.2, 190.2, 201.4, 212, 222, 231.6, 240.7, 249.5, 257.9, 266, 273.9, 281.4, 288.8, 295.9, 328.8, 357.8, 383.8, 407.4, 428.8, 448.4, 466.3, 482.8, 511.8, 536.2, 556.6, 573.5, 587.3, 598.4, 607.2, 613.8, 618.5, 621.6, 623.4, 623.8, 623.3, 621.8, 604.4, 578.7, 550.8, 523.3, 497.6, 474.4, 453.6, 435, 402.7, 375.9, 353.2, 333.6, 316.9, 302, 288.8, 276.9, 266.2, 256.5, 247.7, 239.5, 232, 225.1 };
+ for(i=0; i<78; i++) {e[3][i]=e3[i]*MeV*cm2/g;}
+AddData(T0,e3, 3);
 name [4] = "G4_AIR";
 G4double e4[78] = { 87.5, 108.6, 126.7, 142.7, 157.3, 183.5, 206.7, 227.9, 247.5, 265.9, 283.2, 299.6, 337.7, 372.3, 404.3, 434.3, 462.6, 489.4, 515, 539.5, 585.8, 629, 669.6, 708.1, 744.8, 779.8, 813.4, 845.7, 876.8, 906.8, 935.9, 964, 991.3, 1018, 1140, 1247, 1343, 1429, 1506, 1575, 1637, 1693, 1787, 1861, 1918, 1961, 1990, 2008, 2017, 2019, 2013, 2002, 1987, 1968, 1946, 1922, 1774, 1625, 1494, 1382, 1287, 1205, 1133, 1072, 968.6, 885.9, 818, 760.7, 711.7, 669.6, 632.7, 600.2, 571.2, 545.3, 521.9, 500.6, 481.2, 463.4 };
+ for(i=0; i<78; i++) {e[4][i]=e4[i]*MeV*cm2/g;}
+AddData(T0,e4, 4);
 name [5] = "G4_Al";
 G4double e5[78] = { 55.8, 71.89, 86.05, 98.92, 110.9, 132.7, 152.5, 170.9, 188.2, 204.5, 220.1, 235.1, 270.1, 302.5, 332.8, 361.5, 388.6, 414.6, 439.4, 463.3, 508.4, 550.4, 589.6, 626.5, 661.1, 693.7, 724.3, 753.2, 780.3, 805.9, 830.1, 852.8, 874.3, 894.5, 980, 1045, 1096, 1136, 1168, 1195, 1216, 1234, 1262, 1280, 1291, 1297, 1298, 1297, 1293, 1286, 1279, 1269, 1259, 1248, 1237, 1225, 1161, 1098, 1039, 984.9, 937.6, 895.4, 856.8, 821, 756.1, 698.6, 647.8, 604.8, 567.8, 535.7, 507.4, 482.4, 460, 439.8, 421.6, 405.1, 389.9, 376 };
+ for(i=0; i<78; i++) {e[5][i]=e5[i]*MeV*cm2/g;}
+AddData(T0,e5, 5);
 name [6] = "G4_ALUMINUM_OXIDE";
 G4double e6[78] = { 71.39, 88.59, 103.3, 116.4, 128.4, 149.9, 169, 186.5, 202.8, 218, 232.3, 246, 277.7, 306.6, 333.4, 358.5, 382.1, 404.6, 426, 446.5, 485, 520.9, 554.3, 585.8, 615.5, 643.5, 670, 695.2, 719.1, 741.9, 763.6, 784.3, 804, 822.9, 905.9, 974, 1031, 1080, 1122, 1159, 1191, 1220, 1267, 1304, 1332, 1353, 1368, 1378, 1383, 1385, 1384, 1381, 1376, 1370, 1362, 1352, 1308, 1253, 1187, 1115, 1044, 982.5, 928.4, 880, 801.2, 737, 683.4, 638.1, 599.1, 565.2, 535.4, 508.9, 485.3, 464, 444.8, 427.3, 411.4, 396.7 };
+ for(i=0; i<78; i++) {e[6][i]=e6[i]*MeV*cm2/g;}
+AddData(T0,e6, 6);
 name [7] = "G4_Ar";
 G4double e7[78] = { 34.54, 44.56, 53.39, 61.42, 68.88, 82.53, 94.95, 106.5, 117.3, 127.6, 137.4, 146.8, 168.8, 189.3, 208.5, 226.7, 244.1, 260.8, 276.8, 292.3, 321.9, 349.8, 376.5, 401.9, 426.4, 450, 472.8, 494.9, 516.3, 537.1, 557.3, 577, 596.1, 614.8, 702.1, 780.3, 850.8, 914.4, 971.9, 1024, 1070, 1111, 1181, 1233, 1272, 1298, 1314, 1321, 1321, 1315, 1305, 1291, 1276, 1258, 1240, 1222, 1130, 1047, 974, 911.2, 856.7, 809, 767, 729.8, 666.1, 613.2, 569.7, 532.7, 501, 473.4, 449.1, 427.4, 408.3, 391, 375.4, 361.1, 348.1, 336 };
+ for(i=0; i<78; i++) {e[7][i]=e7[i]*MeV*cm2/g;}
+AddData(T0,e7, 7);
 name [8] = "G4_Au";
 G4double e8[78] = { 11.5, 14.55, 17.2, 19.57, 21.76, 25.72, 29.27, 32.54, 35.59, 38.46, 41.18, 43.78, 49.83, 55.39, 60.56, 65.44, 70.06, 74.46, 78.68, 82.74, 90.45, 97.69, 104.5, 111.1, 117.3, 123.3, 129.1, 134.6, 140, 145.2, 150.3, 155.2, 160, 164.7, 186.4, 205.8, 223.5, 239.5, 254.2, 267.7, 280.1, 291.5, 311.6, 328.5, 342.6, 354.3, 363.8, 371.5, 377.5, 382.1, 385.5, 387.8, 389.1, 389.6, 389.4, 388.7, 384.4, 375.7, 362.6, 346.8, 330.5, 316.4, 304, 293, 274.1, 258.4, 245, 233.4, 223.1, 214, 205.8, 198.4, 191.6, 185.5, 179.7, 174.5, 169.6, 165 };
+ for(i=0; i<78; i++) {e[8][i]=e8[i]*MeV*cm2/g;}
+AddData(T0,e8, 8);
 name [9] = "G4_B-100_BONE";
 G4double e9[78] = { 138.6, 167.7, 192, 213.3, 232.4, 266.3, 296, 322.7, 347.2, 369.9, 391.2, 411.3, 457.3, 498.8, 536.8, 572, 605, 636.1, 665.7, 693.8, 746.5, 795.4, 841, 883.9, 924.5, 963.1, 999.9, 1035, 1069, 1101, 1133, 1163, 1192, 1220, 1348, 1460, 1557, 1643, 1719, 1786, 1845, 1897, 1983, 2047, 2093, 2124, 2142, 2149, 2148, 2139, 2125, 2106, 2084, 2059, 2031, 2003, 1861, 1726, 1600, 1484, 1379, 1290, 1214, 1147, 1035, 945.3, 871.8, 810, 757.7, 712.5, 672.9, 638.1, 607, 579.2, 554.1, 531.3, 510.5, 491.5 };
+ for(i=0; i<78; i++) {e[9][i]=e9[i]*MeV*cm2/g;}
+AddData(T0,e9, 9);
 name [10] = "G4_Be";
 G4double e10[78] = { 146.3, 177.1, 202.9, 225.4, 245.6, 281.3, 312.5, 340.6, 366.2, 390, 412.2, 433.2, 481.1, 524.1, 563.3, 599.7, 633.6, 665.4, 695.6, 724.2, 777.7, 827, 872.7, 915.5, 955.7, 993.7, 1030, 1064, 1096, 1128, 1157, 1186, 1213, 1239, 1356, 1453, 1534, 1602, 1659, 1706, 1745, 1776, 1821, 1846, 1856, 1855, 1845, 1829, 1809, 1785, 1759, 1732, 1703, 1674, 1645, 1617, 1499, 1406, 1326, 1254, 1189, 1129, 1075, 1024, 935.3, 858.7, 792.9, 737.6, 690, 648.7, 612.5, 580.4, 552, 526.4, 503.3, 482.4, 463.3, 445.8 };
+ for(i=0; i<78; i++) {e[10][i]=e10[i]*MeV*cm2/g;}
+AddData(T0,e10, 10);
 name [11] = "G4_BONE_COMPACT_ICRU";
 G4double e11[78] = { 125.9, 152.6, 175, 194.8, 212.5, 244.1, 271.8, 296.8, 319.8, 341.1, 361.2, 380.2, 423.8, 463.1, 499.3, 533, 564.6, 594.5, 622.8, 649.9, 700.8, 748.1, 792.4, 834.2, 873.7, 911.4, 947.4, 981.9, 1015, 1047, 1078, 1107, 1136, 1164, 1291, 1401, 1498, 1584, 1660, 1727, 1787, 1839, 1926, 1991, 2039, 2072, 2092, 2103, 2105, 2100, 2089, 2075, 2056, 2035, 2011, 1986, 1846, 1705, 1576, 1460, 1358, 1271, 1196, 1130, 1020, 931.6, 859.4, 798.8, 747.4, 702.9, 664, 629.7, 599.1, 571.7, 547.1, 524.7, 504.3, 485.6 };
+ for(i=0; i<78; i++) {e[11][i]=e11[i]*MeV*cm2/g;}
+AddData(T0,e11, 11);
 name [12] = "G4_C";
 G4double e12[78] = { 190.6, 225.6, 254.3, 279, 300.9, 339.2, 372.1, 401.4, 427.9, 452.3, 475, 496.2, 544.3, 586.9, 625.5, 661, 693.8, 724.6, 753.5, 780.8, 831.5, 877.9, 920.8, 960.6, 998, 1033, 1066, 1098, 1128, 1156, 1184, 1210, 1235, 1259, 1366, 1455, 1531, 1595, 1650, 1698, 1738, 1772, 1825, 1862, 1886, 1900, 1906, 1906, 1901, 1892, 1880, 1866, 1850, 1833, 1814, 1795, 1684, 1571, 1466, 1372, 1288, 1213, 1145, 1085, 981.9, 898.2, 829.6, 772, 722.9, 680.4, 643.1, 610.2, 580.8, 554.4, 530.6, 509, 489.2, 471.2 };
+ for(i=0; i<78; i++) {e[12][i]=e12[i]*MeV*cm2/g;}
+name [13] = "G4_C_Graphite";
+AddData(T0,e12, 12);
+name [13] = "G4_GRAPHITE_POROUS";
 G4double e13[78] = { 192.3, 228.9, 259, 285.1, 308.3, 348.9, 384, 415.3, 443.7, 469.9, 494.2, 517, 568.9, 615.1, 657, 695.5, 731.3, 764.8, 796.3, 826.2, 881.8, 932.7, 979.8, 1024, 1065, 1104, 1141, 1175, 1209, 1240, 1271, 1300, 1327, 1354, 1473, 1574, 1658, 1731, 1793, 1845, 1890, 1929, 1987, 2027, 2051, 2063, 2065, 2060, 2049, 2034, 2015, 1993, 1969, 1944, 1917, 1891, 1751, 1620, 1502, 1400, 1310, 1231, 1161, 1099, 994.3, 909, 839.2, 780.7, 730.8, 687.6, 649.8, 616.4, 586.6, 559.8, 535.7, 513.8, 493.8, 475.5 };
+ for(i=0; i<78; i++) {e[13][i]=e13[i]*MeV*cm2/g;}
+AddData(T0,e13, 13);
 name [14] = "G4_ETHYLENE";
 G4double e14[78] = { 159.8, 195.8, 226, 252.7, 276.8, 319.7, 357.4, 391.5, 422.9, 452.1, 479.5, 505.4, 565.1, 619, 668.6, 714.8, 758.1, 799.1, 838.1, 875.3, 945.4, 1011, 1072, 1130, 1185, 1237, 1288, 1336, 1383, 1428, 1471, 1514, 1555, 1594, 1779, 1945, 2094, 2230, 2354, 2468, 2571, 2666, 2830, 2961, 3060, 3130, 3172, 3189, 3185, 3164, 3129, 3086, 3038, 2986, 2931, 2876, 2578, 2306, 2084, 1907, 1763, 1642, 1539, 1450, 1303, 1185, 1089, 1010, 941.9, 883.6, 832.8, 788.1, 748.4, 712.9, 680.9, 652, 625.7, 601.7 };
+ for(i=0; i<78; i++) {e[14][i]=e14[i]*MeV*cm2/g;}
+AddData(T0,e14, 14);
 name [15] = "G4_C-552";
 G4double e15[78] = { 124.1, 148.8, 169.3, 187.2, 203.3, 231.5, 256.1, 278.2, 298.4, 317.1, 334.5, 351, 388.6, 422.4, 453.2, 481.8, 508.4, 533.5, 557.3, 579.9, 622.2, 661.3, 697.8, 732, 764.3, 794.9, 824, 851.9, 878.5, 904.1, 928.7, 952.4, 975.2, 997.3, 1097, 1184, 1259, 1325, 1384, 1435, 1481, 1521, 1588, 1639, 1678, 1706, 1726, 1738, 1744, 1745, 1743, 1736, 1727, 1716, 1703, 1688, 1603, 1511, 1421, 1338, 1261, 1190, 1126, 1067, 965.5, 883.8, 816.4, 759.6, 711.1, 669.1, 632.3, 599.9, 571, 545, 521.6, 500.3, 480.9, 463.1 };
+ for(i=0; i<78; i++) {e[15][i]=e15[i]*MeV*cm2/g;}
+AddData(T0,e15, 15);
 name [16] = "G4_CARBON_DIOXIDE";
 G4double e16[78] = { 93.28, 114.2, 131.9, 147.5, 161.6, 186.6, 208.6, 228.5, 246.8, 263.8, 279.8, 295, 329.8, 361.2, 390.2, 417.1, 442.4, 466.4, 489.1, 510.8, 551.8, 589.8, 625.6, 659.4, 691.5, 722.2, 751.6, 779.8, 807.1, 833.4, 858.9, 883.7, 907.7, 931.1, 1040, 1137, 1225, 1306, 1380, 1449, 1513, 1571, 1676, 1763, 1834, 1891, 1933, 1961, 1977, 1982, 1978, 1967, 1952, 1932, 1911, 1888, 1752, 1614, 1490, 1383, 1290, 1209, 1139, 1077, 973.3, 890, 821.5, 764, 714.9, 672.6, 635.5, 602.6, 573.5, 547.3, 523.7, 502.4, 482.9, 465 };
+ for(i=0; i<78; i++) {e[16][i]=e16[i]*MeV*cm2/g;}
+AddData(T0,e16, 16);
 name [17] = "G4_CALCIUM_FLUORIDE";
 G4double e17[78] = { 72.78, 90.74, 106.1, 119.8, 132.3, 154.7, 174.6, 192.8, 209.7, 225.5, 240.4, 254.5, 287.2, 317, 344.6, 370.4, 394.6, 417.6, 439.5, 460.5, 499.9, 536.5, 570.8, 603.1, 633.6, 662.6, 690.1, 716.4, 741.5, 765.6, 788.6, 810.8, 832.1, 852.6, 944.4, 1022, 1088, 1145, 1194, 1237, 1275, 1308, 1361, 1401, 1431, 1453, 1467, 1476, 1481, 1481, 1479, 1474, 1466, 1458, 1447, 1436, 1352, 1256, 1166, 1086, 1016, 954.4, 900.2, 852.3, 772.1, 708.1, 655.5, 610.7, 573.3, 540.6, 511.9, 486.6, 464, 443.8, 425.4, 408.7, 393.4, 379.4 };
+ for(i=0; i<78; i++) {e[17][i]=e17[i]*MeV*cm2/g;}
+AddData(T0,e17, 17);
 name [18] = "G4_CERIC_SULFATE";
 G4double e18[78] = { 99.73, 123.7, 144.1, 162.3, 178.8, 208.3, 234.6, 258.5, 280.5, 301.2, 320.6, 339.1, 381.8, 420.6, 456.5, 490, 521.6, 551.5, 580.1, 607.4, 658.9, 707, 752.2, 795, 835.7, 874.6, 911.8, 947.6, 982, 1015, 1047, 1078, 1109, 1138, 1273, 1391, 1497, 1591, 1676, 1753, 1822, 1884, 1990, 2074, 2140, 2190, 2227, 2251, 2266, 2273, 2272, 2266, 2254, 2238, 2220, 2198, 2049, 1886, 1737, 1607, 1495, 1399, 1315, 1242, 1120, 1023, 942.8, 875.6, 818.4, 769.2, 726.1, 688, 654.2, 624, 596.7, 572, 549.5, 528.9 };
+ for(i=0; i<78; i++) {e[18][i]=e18[i]*MeV*cm2/g;}
+AddData(T0,e18, 18);
 name [19] = "G4_CELLULOSE_NITRATE";
 G4double e19[78] = { 157.6, 186.4, 209.9, 230.3, 248.3, 279.7, 306.8, 330.8, 352.6, 372.6, 391.2, 408.7, 448.1, 483.2, 514.9, 544.1, 571.1, 596.4, 620.3, 642.8, 684.8, 723.2, 758.8, 792, 823.2, 852.7, 880.6, 907.2, 932.6, 956.9, 980.2, 1003, 1024, 1045, 1139, 1220, 1290, 1353, 1408, 1457, 1502, 1541, 1608, 1662, 1704, 1736, 1761, 1778, 1789, 1796, 1798, 1796, 1790, 1782, 1772, 1760, 1674, 1574, 1476, 1385, 1302, 1227, 1160, 1099, 993.8, 909.3, 839.7, 781.1, 731.2, 688.1, 650.2, 616.7, 587, 560.3, 536.2, 514.4, 494.5, 476.2 };
+ for(i=0; i<78; i++) {e[19][i]=e19[i]*MeV*cm2/g;}
+AddData(T0,e19, 19);
 name [20] = "G4_BONE_CORTICAL_ICRP";
 G4double e20[78] = { 109.1, 132.8, 152.8, 170.4, 186.2, 214.4, 239.3, 261.7, 282.4, 301.6, 319.7, 336.8, 376.1, 411.7, 444.5, 475, 503.6, 530.7, 556.5, 581.1, 627.4, 670.4, 710.8, 748.9, 785, 819.4, 852.4, 883.9, 914.3, 943.5, 971.7, 999, 1025, 1051, 1168, 1270, 1360, 1440, 1511, 1574, 1630, 1680, 1763, 1826, 1872, 1905, 1927, 1939, 1943, 1941, 1933, 1921, 1905, 1887, 1866, 1844, 1720, 1593, 1475, 1369, 1274, 1193, 1123, 1062, 959.2, 877.1, 809.7, 753, 704.9, 663.4, 627, 594.9, 566.3, 540.6, 517.5, 496.5, 477.4, 459.8 };
+ for(i=0; i<78; i++) {e[20][i]=e20[i]*MeV*cm2/g;}
+AddData(T0,e20, 20);
 name [21] = "G4_CESIUM_IODIDE";
 G4double e21[78] = { 40.6, 48.54, 55.16, 60.95, 66.15, 75.33, 83.38, 90.64, 97.29, 103.5, 109.3, 114.8, 127.3, 138.7, 149.2, 158.9, 168, 176.7, 184.9, 192.8, 207.6, 221.3, 234.2, 246.4, 258, 269.1, 279.7, 289.9, 299.7, 309.2, 318.3, 327.1, 335.7, 344, 382.3, 415.8, 445.6, 472.1, 495.7, 516.7, 535.4, 551.8, 578.9, 599.2, 613.8, 623.8, 629.9, 633, 633.6, 632.3, 629.5, 625.5, 620.6, 615.1, 609.1, 602.8, 567.7, 533, 501.8, 474.4, 450.3, 429, 410.1, 393.3, 364.6, 340.9, 321, 304, 289.2, 275.9, 264.1, 253.6, 243.9, 235, 226.7, 218.9, 211.9, 205.4 };
+ for(i=0; i<78; i++) {e[21][i]=e21[i]*MeV*cm2/g;}
+AddData(T0,e21, 21);
 name [22] = "G4_Cu";
 G4double e22[78] = { 29.51, 36.49, 42.42, 47.68, 52.45, 60.98, 68.54, 75.4, 81.74, 87.65, 93.23, 98.51, 110.7, 121.8, 132, 141.5, 150.5, 159, 167.2, 174.9, 189.5, 203.2, 216, 228.1, 239.7, 250.7, 261.3, 271.4, 281.2, 290.7, 299.8, 308.7, 317.3, 325.6, 364.2, 398.4, 429.1, 456.8, 482.1, 505.1, 526.2, 545.4, 579, 607, 630.1, 649.1, 664.4, 676.6, 686.2, 693.4, 698.8, 702.4, 704.6, 705.7, 705.7, 704.9, 692.5, 672.6, 650.3, 627.6, 606, 585.6, 566.3, 548, 514, 483.4, 455.8, 431, 408.4, 388, 369.6, 353.7, 339.1, 325.7, 313.4, 302, 291.7, 282.3 };
+ for(i=0; i<78; i++) {e[22][i]=e22[i]*MeV*cm2/g;}
+AddData(T0,e22, 22);
 name [23] = "G4_Fe";
 G4double e23[78] = { 54.06, 65.42, 74.91, 83.2, 90.66, 103.8, 115.3, 125.6, 135.1, 143.8, 152, 159.8, 177.4, 193.3, 207.8, 221.3, 233.9, 245.7, 256.9, 267.6, 287.7, 306.2, 323.5, 339.8, 355.2, 369.8, 383.8, 397.1, 410, 422.3, 434.2, 445.7, 456.9, 467.6, 517.1, 560.6, 599.4, 634.3, 665.9, 694.6, 720.8, 744.8, 786.6, 821.5, 850.4, 874.1, 893.1, 908.1, 919.6, 928, 933.6, 936.8, 938, 937.3, 935.1, 931.5, 899.9, 856.7, 810.9, 766.9, 727.3, 691.9, 660.2, 631.5, 581.8, 540.1, 504.6, 473.9, 447.2, 423.6, 402.6, 383.5, 366.9, 352, 338.3, 325.7, 314.1, 303.6 };
+ for(i=0; i<78; i++) {e[23][i]=e23[i]*MeV*cm2/g;}
+AddData(T0,e23, 23);
 name [24] = "G4_FERROUS_SULFATE";
 G4double e24[78] = { 99.58, 123.5, 144, 162.1, 178.6, 208.1, 234.3, 258.2, 280.2, 300.8, 320.3, 338.7, 381.4, 420.2, 456, 489.5, 521, 551, 579.5, 606.8, 658.3, 706.3, 751.5, 794.2, 834.9, 873.7, 910.9, 946.6, 981, 1014, 1046, 1077, 1108, 1137, 1271, 1390, 1495, 1590, 1675, 1751, 1820, 1882, 1988, 2072, 2138, 2188, 2225, 2250, 2265, 2271, 2271, 2264, 2253, 2237, 2218, 2197, 2048, 1886, 1738, 1609, 1497, 1401, 1317, 1244, 1122, 1025, 944.6, 877.4, 820, 770.7, 727.5, 689.3, 655.4, 625.2, 597.8, 573.1, 550.5, 529.9 };
+ for(i=0; i<78; i++) {e[24][i]=e24[i]*MeV*cm2/g;}
+AddData(T0,e24, 24);
 name [25] = "G4_Gd";
 G4double e25[78] = { 38.11, 45.4, 51.41, 56.61, 61.25, 69.34, 76.36, 82.61, 88.29, 93.53, 98.41, 103, 113.4, 122.7, 131.1, 138.9, 146.1, 152.9, 159.3, 165.4, 176.7, 187.1, 196.8, 205.9, 214.4, 222.5, 230.3, 237.6, 244.7, 251.5, 258, 264.3, 270.3, 276.2, 303.1, 326.6, 347.4, 366.2, 383.1, 398.5, 412.5, 425.4, 447.8, 466.5, 482.1, 494.8, 505.1, 513.2, 519.4, 523.9, 526.9, 528.6, 529.1, 528.6, 527.3, 525.2, 505.6, 481, 456.8, 434.6, 414.6, 396.6, 380.5, 366, 340.9, 319.7, 301.6, 285.8, 272, 259.8, 248.8, 239, 230.1, 222, 214.6, 207.7, 201.4, 195.6 };
+ for(i=0; i<78; i++) {e[25][i]=e25[i]*MeV*cm2/g;}
+AddData(T0,e25, 25);
 name [26] = "G4_Ge";
 G4double e26[78] = { 47.65, 57.57, 65.83, 73.05, 79.53, 90.94, 100.9, 109.9, 118, 125.6, 132.7, 139.4, 154.6, 168.3, 180.8, 192.3, 203.1, 213.3, 222.9, 232, 249.1, 264.8, 279.5, 293.2, 306.1, 318.4, 330, 341.1, 351.7, 361.8, 371.5, 380.8, 389.8, 398.4, 437.2, 469.9, 497.8, 521.7, 542.3, 560.1, 575.5, 588.9, 610.7, 627.4, 640.1, 649.9, 657.3, 662.8, 666.8, 669.6, 671.4, 672.3, 672.4, 671.9, 670.9, 669.4, 656.9, 639.5, 619.8, 599.4, 578.4, 557.6, 537.5, 518.5, 483.6, 452.9, 425.8, 401.8, 380.5, 361.5, 344.3, 328.6, 315.1, 303.1, 292.1, 282, 272.6, 263.8 };
+ for(i=0; i<78; i++) {e[26][i]=e26[i]*MeV*cm2/g;}
+AddData(T0,e26, 26);
 name [27] = "G4_Pyrex_Glass";
 G4double e27[78] = { 83.85, 102.1, 117.5, 131, 143.3, 165, 184.1, 201.3, 217.2, 232, 245.9, 259, 289.2, 316.5, 341.5, 364.8, 386.7, 407.4, 427.1, 445.8, 481.1, 513.8, 544.4, 573.2, 600.6, 626.6, 651.5, 675.3, 698.1, 720.1, 741.3, 761.7, 781.5, 800.6, 888, 963.9, 1031, 1090, 1142, 1189, 1231, 1268, 1330, 1378, 1414, 1441, 1460, 1473, 1481, 1485, 1484, 1481, 1475, 1466, 1456, 1445, 1389, 1323, 1249, 1171, 1095, 1029, 971.4, 920.7, 835.9, 768, 711.5, 663.8, 622.8, 587.4, 556.1, 528.4, 503.7, 481.5, 461.4, 443.2, 426.5, 411.2 };
+ for(i=0; i<78; i++) {e[27][i]=e27[i]*MeV*cm2/g;}
+AddData(T0,e27, 27);
 name [28] = "G4_H";
 G4double e28[78] = { 212, 275.4, 331.7, 383, 430.9, 518.8, 599.2, 674, 744.5, 811.5, 875.6, 937.1, 1082, 1217, 1344, 1465, 1580, 1691, 1798, 1901, 2098, 2285, 2463, 2634, 2798, 2956, 3108, 3256, 3399, 3538, 3674, 3805, 3933, 4058, 4637, 5152, 5610, 6019, 6383, 6705, 6988, 7235, 7632, 7915, 8100, 8203, 8240, 8222, 8161, 8067, 7947, 7808, 7655, 7494, 7327, 7157, 6345, 5647, 5068, 4588, 4188, 3860, 3585, 3351, 2971, 2675, 2438, 2242, 2078, 1939, 1818, 1713, 1620, 1538, 1464, 1398, 1337, 1283 };
+ for(i=0; i<78; i++) {e[28][i]=e28[i]*MeV*cm2/g;}
+name [29] = "G4_HELIUM";
+AddData(T0,e28, 28);
+name [29] = "G4_He";
 G4double e29[78] = { 87.26, 110.8, 131.3, 149.8, 166.8, 197.7, 225.5, 251.1, 275, 297.5, 318.9, 339.4, 387, 430.9, 471.8, 510.4, 547, 581.9, 615.3, 647.5, 708.7, 766.1, 820.5, 872.3, 921.8, 969.3, 1015, 1059, 1102, 1143, 1183, 1221, 1259, 1296, 1465, 1614, 1748, 1867, 1975, 2071, 2156, 2233, 2361, 2460, 2535, 2588, 2624, 2644, 2652, 2650, 2639, 2621, 2598, 2571, 2540, 2507, 2323, 2139, 1976, 1832, 1706, 1593, 1493, 1402, 1249, 1130, 1033, 953.8, 886.8, 829.5, 779.8, 736.4, 697.9, 663.7, 632.9, 605.2, 580, 557 };
+ for(i=0; i<78; i++) {e[29][i]=e29[i]*MeV*cm2/g;}
+AddData(T0,e29, 29);
 name [30] = "G4_KAPTON";
 G4double e30[78] = { 165.5, 197.6, 224.2, 247.2, 267.8, 304, 335.4, 363.5, 389.1, 412.8, 434.8, 455.6, 502.9, 545.2, 583.8, 619.4, 652.6, 683.8, 713.3, 741.2, 793.5, 841.6, 886.3, 928.2, 967.7, 1005, 1041, 1074, 1107, 1138, 1167, 1196, 1223, 1250, 1369, 1471, 1560, 1636, 1703, 1762, 1812, 1857, 1928, 1981, 2018, 2042, 2056, 2062, 2061, 2054, 2043, 2028, 2010, 1990, 1969, 1946, 1819, 1688, 1565, 1451, 1350, 1264, 1190, 1125, 1017, 929.8, 858.3, 798.2, 747, 702.8, 664, 629.8, 599.3, 571.9, 547.2, 524.8, 504.4, 485.7 };
+ for(i=0; i<78; i++) {e[30][i]=e30[i]*MeV*cm2/g;}
+AddData(T0,e30, 30);
 name [31] = "G4_Kr";
 G4double e31[78] = { 10.15, 13.69, 16.93, 19.96, 22.84, 28.23, 33.29, 38.08, 42.66, 47.08, 51.35, 55.5, 65.43, 74.84, 83.85, 92.52, 100.9, 109.1, 117, 124.7, 139.7, 154.1, 168, 181.5, 194.6, 207.4, 219.9, 232.1, 244, 255.7, 267.2, 278.4, 289.5, 300.3, 351.9, 399.6, 443.7, 484.4, 522.1, 556.7, 588.4, 617.2, 666.6, 705.7, 735.5, 757, 771.4, 779.9, 783.4, 783, 779.4, 773.6, 765.9, 757, 747.2, 736.9, 683.7, 635.6, 595.2, 561.5, 533, 508.6, 487.3, 468.5, 439.9, 417.9, 398.8, 381.4, 364.9, 349.2, 334.2, 319.8, 306.2, 293.7, 282.8, 272.8, 263.6, 255.2 };
+ for(i=0; i<78; i++) {e[31][i]=e31[i]*MeV*cm2/g;}
+AddData(T0,e31, 31);
 name [32] = "G4_LITHIUM_TETRABORATE";
 G4double e32[78] = { 132.7, 159.4, 181.6, 200.9, 218.2, 248.6, 275, 298.7, 320.4, 340.4, 359.1, 376.6, 416.8, 452.7, 485.5, 515.8, 544, 570.6, 595.8, 619.7, 664.3, 705.6, 743.9, 779.9, 813.9, 846.1, 876.8, 906.1, 934.2, 961.1, 987, 1012, 1036, 1059, 1166, 1258, 1338, 1410, 1474, 1531, 1583, 1628, 1706, 1767, 1814, 1849, 1874, 1891, 1899, 1902, 1899, 1891, 1875, 1852, 1825, 1795, 1638, 1494, 1375, 1276, 1193, 1121, 1058, 1002, 908.8, 833.2, 770.5, 717.6, 672.4, 633.2, 598.8, 568.3, 541.2, 516.9, 494.8, 474.9, 456.6, 439.9 };
+ for(i=0; i<78; i++) {e[32][i]=e32[i]*MeV*cm2/g;}
+AddData(T0,e32, 32);
 name [33] = "G4_LITHIUM_FLUORIDE";
 G4double e33[78] = { 118.7, 142.6, 162.5, 179.7, 195.2, 222.4, 246, 267.2, 286.5, 304.3, 321, 336.6, 372.4, 404.4, 433.5, 460.4, 485.5, 509.1, 531.4, 552.6, 592.1, 628.5, 662.4, 694.1, 724.1, 752.4, 779.4, 805.1, 829.6, 853.2, 875.9, 897.6, 918.7, 938.9, 1031, 1110, 1179, 1240, 1294, 1341, 1383, 1421, 1483, 1530, 1566, 1592, 1610, 1621, 1627, 1627, 1624, 1618, 1609, 1598, 1585, 1571, 1483, 1387, 1296, 1214, 1140, 1074, 1015, 962.2, 872, 799.7, 739.5, 688.5, 644.8, 606.9, 573.7, 544.4, 518.3, 494.9, 473.6, 454.3, 436.7, 420.6 };
+ for(i=0; i<78; i++) {e[33][i]=e33[i]*MeV*cm2/g;}
+AddData(T0,e33, 33);
 name [34] = "G4_M3_WAX";
 G4double e34[78] = { 173.6, 209, 238.5, 264.3, 287.6, 328.7, 364.7, 397.1, 426.9, 454.5, 480.4, 504.9, 561, 611.6, 658, 701.1, 741.6, 779.8, 816, 850.6, 915.4, 975.6, 1032, 1085, 1135, 1182, 1228, 1271, 1313, 1353, 1392, 1429, 1465, 1499, 1657, 1792, 1910, 2012, 2101, 2179, 2247, 2305, 2398, 2463, 2507, 2533, 2544, 2544, 2534, 2517, 2494, 2468, 2437, 2405, 2371, 2335, 2154, 1981, 1825, 1686, 1564, 1460, 1372, 1295, 1167, 1064, 980.4, 910.2, 850.4, 798.9, 753.8, 714.2, 678.9, 647.3, 618.8, 593, 569.4, 547.9 };
+ for(i=0; i<78; i++) {e[34][i]=e34[i]*MeV*cm2/g;}
+AddData(T0,e34, 34);
 name [35] = "G4_MS20_TISSUE";
 G4double e35[78] = { 163.5, 196.6, 224.1, 248.2, 269.8, 308, 341.4, 371.4, 398.9, 424.4, 448.3, 470.9, 522.5, 569, 611.6, 651.1, 688, 722.9, 756, 787.5, 846.6, 901.2, 952.3, 1000, 1046, 1089, 1130, 1169, 1207, 1243, 1278, 1311, 1344, 1375, 1516, 1638, 1744, 1836, 1916, 1986, 2048, 2101, 2185, 2247, 2288, 2314, 2327, 2330, 2325, 2312, 2295, 2273, 2249, 2222, 2193, 2163, 2002, 1845, 1703, 1575, 1463, 1368, 1286, 1215, 1097, 1001, 923.2, 857.7, 802, 753.9, 711.7, 674.6, 641.6, 611.9, 585.2, 561, 539, 518.8 };
+ for(i=0; i<78; i++) {e[35][i]=e35[i]*MeV*cm2/g;}
+AddData(T0,e35, 35);
 name [36] = "G4_METHANE";
 G4double e36[78] = { 197.5, 241.8, 279.3, 312.2, 342, 394.9, 441.5, 483.7, 522.4, 558.5, 592.4, 624.4, 698.1, 764.8, 826, 883.1, 936.6, 987.3, 1035, 1081, 1168, 1249, 1324, 1396, 1464, 1529, 1591, 1650, 1708, 1764, 1818, 1870, 1920, 1970, 2198, 2402, 2586, 2754, 2907, 3047, 3175, 3291, 3492, 3652, 3773, 3856, 3905, 3921, 3899, 3849, 3783, 3708, 3627, 3544, 3460, 3378, 2998, 2685, 2432, 2226, 2055, 1911, 1789, 1683, 1508, 1370, 1257, 1163, 1084, 1015, 955.9, 903.7, 857.5, 816.2, 779.1, 745.5, 714.9, 687.1 };
+ for(i=0; i<78; i++) {e[36][i]=e36[i]*MeV*cm2/g;}
+AddData(T0,e36, 36);
 name [37] = "G4_Mo";
 G4double e37[78] = { 58.22, 68.98, 77.79, 85.4, 92.16, 103.9, 114.1, 123.1, 131.3, 138.8, 145.8, 152.4, 167.3, 180.5, 192.5, 203.5, 213.8, 223.4, 232.4, 241, 256.9, 271.6, 285.1, 297.8, 309.8, 321.1, 331.8, 342.1, 351.9, 361.3, 370.3, 379, 387.4, 395.5, 432.4, 464.5, 492.9, 518.2, 541, 561.6, 580.4, 597.4, 626.9, 651.2, 671.2, 687.3, 700.1, 710, 717.3, 722.3, 725.4, 726.7, 726.5, 725, 722.3, 718.8, 690.9, 655, 617.8, 582.6, 552.1, 525.7, 502.3, 481.5, 445.5, 415.5, 389.9, 367.7, 348.1, 330.6, 314.8, 300.9, 288.6, 277.3, 266.9, 257.6, 249, 241.2 };
+ for(i=0; i<78; i++) {e[37][i]=e37[i]*MeV*cm2/g;}
+AddData(T0,e37, 37);
 name [38] = "G4_MUSCLE_WITH_SUCROSE";
 G4double e38[78] = { 111.7, 137.5, 159.4, 178.8, 196.5, 227.9, 255.7, 281, 304.4, 326.2, 346.7, 366.2, 411.2, 452, 489.7, 525, 558.1, 589.5, 619.5, 648.1, 702.2, 752.5, 799.9, 844.6, 887.2, 927.9, 966.8, 1004, 1040, 1075, 1108, 1141, 1172, 1203, 1343, 1467, 1576, 1674, 1762, 1841, 1912, 1975, 2081, 2165, 2230, 2277, 2310, 2331, 2342, 2344, 2339, 2329, 2313, 2293, 2270, 2244, 2074, 1896, 1739, 1607, 1494, 1398, 1314, 1241, 1120, 1022, 942.4, 875.3, 818.1, 768.9, 725.8, 687.7, 653.9, 623.7, 596.4, 571.7, 549.2, 528.6 };
+ for(i=0; i<78; i++) {e[38][i]=e38[i]*MeV*cm2/g;}
+AddData(T0,e38, 38);
 name [39] = "G4_MUSCLE_WITHOUT_SUCROSE";
 G4double e39[78] = { 108.2, 133.5, 155, 174.1, 191.4, 222.4, 249.8, 274.8, 297.8, 319.3, 339.6, 358.9, 403.3, 443.7, 481, 515.9, 548.7, 579.8, 609.5, 637.9, 691.4, 741.4, 788.3, 832.7, 875, 915.3, 953.9, 991.1, 1027, 1061, 1095, 1127, 1158, 1189, 1328, 1451, 1560, 1658, 1745, 1824, 1895, 1958, 2065, 2150, 2215, 2263, 2298, 2320, 2332, 2335, 2331, 2321, 2306, 2287, 2265, 2240, 2075, 1901, 1746, 1613, 1501, 1404, 1320, 1247, 1125, 1027, 946.2, 878.8, 821.4, 772, 728.6, 690.4, 656.4, 626.1, 598.7, 573.9, 551.3, 530.6 };
+ for(i=0; i<78; i++) {e[39][i]=e39[i]*MeV*cm2/g;}
+AddData(T0,e39, 39);
 name [40] = "G4_MUSCLE_SKELETAL_ICRP";
 G4double e40[78] = { 104.5, 129.2, 150.2, 168.8, 185.8, 216.1, 242.9, 267.4, 290, 311.1, 331, 349.8, 393.5, 433.1, 469.7, 503.9, 536.2, 566.7, 595.9, 623.7, 676.3, 725.4, 771.5, 815.1, 856.6, 896.2, 934.1, 970.6, 1006, 1040, 1072, 1104, 1135, 1165, 1302, 1422, 1530, 1626, 1712, 1790, 1860, 1922, 2029, 2113, 2178, 2228, 2263, 2286, 2299, 2304, 2302, 2293, 2280, 2262, 2242, 2218, 2059, 1888, 1735, 1604, 1492, 1396, 1312, 1240, 1118, 1021, 941.1, 874.1, 817, 767.9, 724.9, 686.8, 653.1, 622.9, 595.7, 571, 548.6, 528 };
+ for(i=0; i<78; i++) {e[40][i]=e40[i]*MeV*cm2/g;}
+AddData(T0,e40, 40);
 name [41] = "G4_MUSCLE_STRIATED_ICRU";
 G4double e41[78] = { 104.7, 129.4, 150.5, 169.2, 186.2, 216.5, 243.4, 267.9, 290.5, 311.7, 331.6, 350.5, 394.2, 433.9, 470.6, 504.9, 537.2, 567.8, 596.9, 624.9, 677.5, 726.7, 772.8, 816.5, 858.1, 897.8, 935.8, 972.3, 1007, 1041, 1074, 1106, 1137, 1167, 1304, 1425, 1532, 1629, 1715, 1793, 1863, 1925, 2032, 2116, 2181, 2230, 2265, 2289, 2302, 2306, 2304, 2295, 2282, 2264, 2244, 2220, 2063, 1894, 1742, 1611, 1498, 1401, 1318, 1244, 1123, 1025, 944.5, 877.2, 819.9, 770.6, 727.3, 689.2, 655.3, 625, 597.7, 572.9, 550.4, 529.7 };
+ for(i=0; i<78; i++) {e[41][i]=e41[i]*MeV*cm2/g;}
+AddData(T0,e41, 41);
 name [42] = "G4_N";
 G4double e42[78] = { 82.8, 103.7, 121.6, 137.7, 152.3, 178.7, 202.3, 223.8, 243.8, 262.5, 280.2, 297.1, 336.2, 372, 405.1, 436.2, 465.5, 493.4, 520.1, 545.7, 594.1, 639.3, 682, 722.5, 761, 797.9, 833.4, 867.4, 900.3, 932, 962.8, 992.5, 1021, 1049, 1179, 1293, 1395, 1486, 1567, 1640, 1706, 1765, 1864, 1940, 1999, 2041, 2069, 2086, 2093, 2091, 2083, 2069, 2051, 2030, 2005, 1978, 1819, 1660, 1522, 1406, 1308, 1224, 1151, 1088, 982.9, 898.5, 829.5, 771.1, 721.3, 678.5, 641, 608, 578.6, 552.3, 528.5, 506.9, 487.2, 469.1 };
+ for(i=0; i<78; i++) {e[42][i]=e42[i]*MeV*cm2/g;}
+AddData(T0,e42, 42);
 name [43] = "G4_SODIUM_IODIDE";
 G4double e43[78] = { 35.86, 44.19, 51.24, 57.48, 63.13, 73.21, 82.12, 90.2, 97.64, 104.6, 111.1, 117.3, 131.6, 144.5, 156.4, 167.6, 178, 187.9, 197.3, 206.3, 223.3, 239.1, 253.9, 268, 281.3, 294, 306.2, 317.9, 329.2, 340.1, 350.6, 360.8, 370.6, 380.2, 424.5, 463.5, 498.4, 529.9, 558.2, 583.8, 607, 627.8, 663.4, 691.6, 713.4, 729.6, 740.9, 748.1, 751.7, 752.4, 750.7, 747, 741.7, 735.1, 727.6, 719.5, 664.4, 611.2, 569.4, 538.3, 514, 491.6, 472.1, 454, 422.9, 393.7, 370.2, 349.6, 331.4, 315.3, 301.2, 288.5, 276.8, 266.1, 256.3, 247.1, 238.9, 231.5 };
+ for(i=0; i<78; i++) {e[43][i]=e43[i]*MeV*cm2/g;}
+AddData(T0,e43, 43);
 name [44] = "G4_Ne";
 G4double e44[78] = { 68.73, 83.7, 96.26, 107.3, 117.2, 134.8, 150.3, 164.2, 177, 188.8, 199.9, 210.4, 234.5, 256.2, 276.1, 294.6, 311.9, 328.3, 343.8, 358.6, 386.3, 412, 436.1, 458.8, 480.3, 500.8, 520.3, 539.1, 557.1, 574.5, 591.2, 607.5, 623.2, 638.4, 708.4, 770.3, 825.6, 875.7, 921.2, 962.8, 1001, 1036, 1098, 1150, 1194, 1230, 1260, 1285, 1304, 1319, 1330, 1338, 1343, 1344, 1344, 1341, 1296, 1229, 1160, 1095, 1035, 981.4, 932.6, 888.5, 812.1, 748.3, 695.6, 650.4, 611.3, 577, 546.8, 520, 496, 474.4, 454.8, 437, 420.7, 405.7 };
+ for(i=0; i<78; i++) {e[44][i]=e44[i]*MeV*cm2/g;}
+name [45] = "G4_NYLON-6/6";
+AddData(T0,e44, 44);
+name [45] = "G4_NYLON-6-6";
 G4double e45[78] = { 167.4, 201.6, 230.3, 255.4, 278, 317.9, 352.9, 384.4, 413.4, 440.3, 465.5, 489.3, 544, 593.3, 638.6, 680.6, 720.1, 757.3, 792.7, 826.4, 889.7, 948.5, 1003, 1055, 1104, 1151, 1195, 1238, 1279, 1318, 1356, 1392, 1427, 1461, 1617, 1750, 1867, 1969, 2059, 2138, 2207, 2267, 2363, 2433, 2482, 2512, 2527, 2531, 2525, 2511, 2491, 2467, 2439, 2408, 2375, 2340, 2160, 1987, 1830, 1690, 1567, 1463, 1374, 1297, 1169, 1066, 981.3, 910.8, 850.9, 799.3, 754.1, 714.4, 679, 647.4, 618.9, 593, 569.5, 547.9 };
+ for(i=0; i<78; i++) {e[45][i]=e45[i]*MeV*cm2/g;}
+AddData(T0,e45, 45);
 name [46] = "G4_O";
+G4double e46[78] = { 105.8, 117.3, 257.6, 1.139e-05, 5.976e-06, 0.005, 248.1, 71.83, 352, 3.186e-05, 2.012e-05, 0.015, 412.7, 40.96, 503.1, 6.782e-05, 5.098e-05, 0.035, 610.6, 24.07, 700.7, 0.0001156, 9.613e-05, 0.07, 820, 15.89, 884.2, 0.0001583, 0.0001354, 0.125, 1124, 8.719, 1280, 0.0002775, 0.0002641, 0.3, 1573, 4.478, 1697, 0.0004528, 0.000448, 0.65, 1818, 2.655, 1822, 0.0006468, 0.0006403, 1, 1667, 1.474, 1431, 0.00138, 0.001539, 2.75, 1038, 0.7076, 860.9, 0.003906, 0.004519, 6, 616.1, 0.3845, 556.8, 0.009419, 0.01034, 9.5, 452, 0.2295, 334.7, 0.03447, 0.04325, 27.5, 196.3, 0.09039, 156.5, 0.1784, 0.2149, 60 };
+ for(i=0; i<78; i++) {e[46][i]=e46[i]*MeV*cm2/g;}
+G4double e46[78] = { 1.058E+02, 1.283E+02, 1.471E+02, 1.636E+02, 1.784E+02, 2.046E+02, 2.275E+02, 2.481E+02, 2.670E+02, 2.845E+02, 3.009E+02, 3.163E+02, 3.518E+02, 3.836E+02, 4.127E+02, 4.398E+02, 4.650E+02, 4.889E+02, 5.115E+02, 5.330E+02, 5.733E+02, 6.106E+02, 6.455E+02, 6.783E+02, 7.094E+02, 7.389E+02, 7.671E+02, 7.941E+02, 8.200E+02, 8.450E+02, 8.690E+02, 8.923E+02, 9.147E+02, 9.365E+02, 1.036E+03, 1.124E+03, 1.202E+03, 1.272E+03, 1.335E+03, 1.392E+03, 1.444E+03, 1.491E+03, 1.573E+03, 1.639E+03, 1.693E+03, 1.735E+03, 1.768E+03, 1.792E+03, 1.808E+03, 1.818E+03, 1.821E+03, 1.820E+03, 1.814E+03, 1.805E+03, 1.792E+03, 1.777E+03, 1.667E+03, 1.544E+03, 1.430E+03, 1.329E+03, 1.241E+03, 1.164E+03, 1.097E+03, 1.038E+03, 9.395E+02, 8.602E+02, 7.947E+02, 7.395E+02, 6.924E+02, 6.519E+02, 6.161E+02, 5.845E+02, 5.564E+02, 5.313E+02, 5.086E+02, 4.880E+02, 4.692E+02, 4.520E+02};
+AddData(T0,e46, 46);
 name [47] = "G4_PARAFFIN";
 G4double e47[78] = { 193.8, 233, 265.8, 294.4, 320.3, 365.9, 405.9, 441.9, 475, 505.7, 534.5, 561.7, 624.2, 680.6, 732.3, 780.4, 825.5, 868.2, 908.6, 947.2, 1020, 1087, 1150, 1209, 1265, 1319, 1370, 1419, 1465, 1510, 1554, 1595, 1636, 1675, 1852, 2004, 2137, 2253, 2354, 2442, 2518, 2584, 2688, 2762, 2810, 2837, 2848, 2845, 2831, 2810, 2782, 2749, 2713, 2674, 2633, 2592, 2381, 2184, 2007, 1851, 1714, 1598, 1500, 1414, 1272, 1158, 1066, 988.4, 922.7, 866.1, 816.7, 773.2, 734.5, 699.9, 668.8, 640.6, 614.9, 591.4 };
+ for(i=0; i<78; i++) {e[47][i]=e47[i]*MeV*cm2/g;}
+AddData(T0,e47, 47);
 name [48] = "G4_Pb";
 G4double e48[78] = { 17.96, 22.18, 25.76, 28.92, 31.8, 36.93, 41.47, 45.6, 49.4, 52.95, 56.3, 59.46, 66.77, 73.41, 79.52, 85.23, 90.6, 95.69, 100.5, 105.2, 113.9, 122, 129.7, 136.9, 143.8, 150.3, 156.6, 162.7, 168.5, 174.1, 179.5, 184.8, 189.9, 194.9, 217.7, 237.9, 256, 272.3, 287, 300.4, 312.6, 323.6, 342.6, 358.2, 370.7, 380.6, 388.3, 394.2, 398.4, 401.3, 403.1, 404, 404.1, 403.5, 402.4, 401, 392.5, 380.4, 365.3, 348.6, 332, 317.6, 304.9, 293.7, 274.4, 258.3, 244.7, 232.9, 222.5, 213.2, 205, 197.5, 190.7, 184.4, 178.7, 173.4, 168.4, 163.9 };
+ for(i=0; i<78; i++) {e[48][i]=e48[i]*MeV*cm2/g;}
+name [49] = "G4_PHOTOGRAPHIC_EMULSION";
+AddData(T0,e48, 48);
+name [49] = "G4_PHOTO_EMULSION";
 G4double e49[78] = { 46.69, 57.18, 66.06, 73.91, 81.04, 93.75, 105, 115.2, 124.7, 133.5, 141.8, 149.6, 167.8, 184.3, 199.6, 213.8, 227.3, 240, 252.1, 263.8, 285.7, 306.2, 325.4, 343.6, 361, 377.5, 393.4, 408.7, 423.3, 437.5, 451.2, 464.5, 477.3, 489.8, 547, 597.3, 641.7, 681.2, 716.3, 747.6, 775.5, 800.2, 841.5, 873.5, 897.8, 915.8, 928.6, 937.1, 940, 938.4, 933.8, 927, 918.6, 909.2, 899.1, 888.5, 833.7, 781.8, 735.1, 693.7, 657.1, 624.6, 595.5, 569.4, 524.5, 487.2, 455.6, 428.5, 404.9, 383.9, 365.2, 348.6, 333.8, 320.5, 308.3, 297.2, 287, 277.8 };
+ for(i=0; i<78; i++) {e[49][i]=e49[i]*MeV*cm2/g;}
+AddData(T0,e49, 49);
 name [50] = "G4_PLASTIC_SC_VINYLTOLUENE";
 G4double e50[78] = { 192.4, 229.8, 260.8, 287.8, 312, 354.4, 391.4, 424.6, 454.8, 482.8, 509, 533.7, 590, 640.5, 686.6, 729.3, 769.2, 806.7, 842.2, 876, 939.2, 997.5, 1052, 1103, 1151, 1197, 1240, 1281, 1321, 1359, 1395, 1430, 1464, 1497, 1644, 1769, 1878, 1971, 2053, 2123, 2184, 2236, 2319, 2377, 2414, 2436, 2445, 2443, 2433, 2417, 2396, 2371, 2343, 2314, 2283, 2251, 2091, 1936, 1791, 1657, 1537, 1435, 1349, 1273, 1148, 1047, 964.8, 895.9, 837.3, 786.7, 742.4, 703.5, 668.8, 637.7, 609.7, 584.3, 561.2, 540 };
+ for(i=0; i<78; i++) {e[50][i]=e50[i]*MeV*cm2/g;}
+AddData(T0,e50, 50);
 name [51] = "G4_POLYCARBONATE";
 G4double e51[78] = { 146.3, 178.1, 204.7, 228.1, 249.2, 286.4, 319.1, 348.5, 375.5, 400.6, 424.1, 446.2, 497, 542.8, 584.7, 623.5, 659.9, 694.2, 726.6, 757.6, 815.5, 869.1, 919, 965.9, 1010, 1052, 1092, 1130, 1167, 1202, 1235, 1268, 1299, 1329, 1465, 1581, 1681, 1768, 1843, 1908, 1965, 2013, 2090, 2144, 2180, 2201, 2210, 2209, 2202, 2188, 2170, 2149, 2125, 2099, 2072, 2044, 1912, 1785, 1661, 1543, 1433, 1340, 1261, 1191, 1076, 982.4, 906, 842, 787.5, 740.5, 699.2, 662.9, 630.5, 601.5, 575.3, 551.6, 529.9, 510.1 };
+ for(i=0; i<78; i++) {e[51][i]=e51[i]*MeV*cm2/g;}
+AddData(T0,e51, 51);
 name [52] = "G4_POLYETHYLENE";
 G4double e52[78] = { 168.2, 205.8, 237.5, 265.4, 290.7, 335.4, 374.8, 410.5, 443.2, 473.7, 502.3, 529.3, 591.4, 647.6, 699.1, 747.1, 792.1, 834.6, 874.9, 913.5, 985.9, 1053, 1116, 1175, 1232, 1285, 1336, 1385, 1432, 1478, 1521, 1564, 1604, 1644, 1825, 1983, 2122, 2246, 2355, 2453, 2539, 2615, 2740, 2833, 2899, 2940, 2962, 2967, 2958, 2938, 2908, 2871, 2829, 2782, 2732, 2681, 2418, 2183, 1987, 1826, 1691, 1577, 1480, 1396, 1257, 1145, 1053, 977.1, 912.4, 856.5, 807.8, 764.9, 726.7, 692.6, 661.8, 633.9, 608.6, 585.4 };
+ for(i=0; i<78; i++) {e[52][i]=e52[i]*MeV*cm2/g;}
+AddData(T0,e52, 52);
 name [53] = "G4_MYLAR";
 G4double e53[78] = { 163.2, 195.3, 221.8, 244.9, 265.6, 301.9, 333.5, 361.8, 387.6, 411.5, 433.8, 454.8, 502.7, 545.7, 584.8, 621, 654.8, 686.6, 716.7, 745.3, 798.7, 847.9, 893.8, 936.8, 977.4, 1016, 1052, 1087, 1121, 1153, 1183, 1213, 1241, 1269, 1393, 1500, 1593, 1673, 1744, 1806, 1860, 1908, 1985, 2042, 2083, 2110, 2126, 2133, 2133, 2126, 2115, 2100, 2082, 2061, 2038, 2014, 1874, 1731, 1599, 1482, 1379, 1290, 1215, 1148, 1038, 948.5, 875.3, 813.8, 761.5, 716.3, 676.6, 641.6, 610.5, 582.5, 557.3, 534.4, 513.6, 494.5 };
+ for(i=0; i<78; i++) {e[53][i]=e53[i]*MeV*cm2/g;}
+AddData(T0,e53, 53);
 name [54] = "G4_PLEXIGLASS";
 G4double e54[78] = { 118.7, 146.6, 170.3, 191.4, 210.4, 244.5, 274.7, 302.1, 327.3, 350.9, 373.1, 394.2, 442.7, 486.8, 527.4, 565.2, 600.9, 634.6, 666.7, 697.4, 755.1, 808.9, 859.3, 906.9, 952, 995, 1036, 1075, 1113, 1150, 1185, 1219, 1252, 1283, 1428, 1554, 1665, 1762, 1848, 1923, 1990, 2049, 2144, 2216, 2266, 2300, 2320, 2328, 2327, 2318, 2302, 2282, 2259, 2232, 2203, 2173, 2008, 1847, 1702, 1574, 1464, 1369, 1288, 1217, 1099, 1004, 925.6, 860.1, 804.4, 756.3, 714.1, 676.9, 643.8, 614.2, 587.4, 563.2, 541.1, 520.8 };
+ for(i=0; i<78; i++) {e[54][i]=e54[i]*MeV*cm2/g;}
+AddData(T0,e54, 54);
 name [55] = "G4_POLYPROPYLENE";
 G4double e55[78] = { 193.7, 232.8, 265.4, 293.9, 319.6, 365, 404.8, 440.6, 473.4, 503.9, 532.5, 559.6, 621.6, 677.5, 728.8, 776.5, 821.2, 863.4, 903.5, 941.8, 1014, 1080, 1142, 1201, 1257, 1309, 1360, 1408, 1454, 1499, 1541, 1583, 1622, 1661, 1836, 1986, 2117, 2231, 2331, 2417, 2492, 2557, 2660, 2732, 2779, 2806, 2817, 2814, 2801, 2780, 2752, 2720, 2684, 2646, 2606, 2565, 2359, 2165, 1991, 1836, 1700, 1585, 1488, 1403, 1263, 1150, 1058, 981.3, 916.1, 860, 810.9, 767.8, 729.5, 695.1, 664.3, 636.2, 610.8, 587.5 };
+ for(i=0; i<78; i++) {e[55][i]=e55[i]*MeV*cm2/g;}
+AddData(T0,e55, 55);
 name [56] = "G4_POLYSTYRENE";
 G4double e56[78] = { 153, 187.5, 216.6, 242.2, 265.3, 306.5, 342.7, 375.5, 405.6, 433.6, 460, 484.9, 542.1, 593.8, 641.3, 685.4, 726.9, 766, 803.1, 838.5, 905, 966.6, 1024, 1078, 1130, 1178, 1225, 1269, 1312, 1352, 1392, 1429, 1466, 1501, 1661, 1797, 1915, 2017, 2106, 2183, 2249, 2305, 2394, 2454, 2492, 2511, 2516, 2509, 2494, 2471, 2443, 2410, 2376, 2339, 2301, 2262, 2070, 1895, 1742, 1609, 1493, 1395, 1312, 1239, 1119, 1021, 941.4, 874.6, 817.8, 768.7, 725.7, 687.9, 654.1, 623.9, 596.6, 571.9, 549.4, 528.7 };
+ for(i=0; i<78; i++) {e[56][i]=e56[i]*MeV*cm2/g;}
+AddData(T0,e56, 56);
 name [57] = "G4_TEFLON";
 G4double e57[78] = { 82.7, 99.97, 114.4, 127.1, 138.4, 158.5, 176.2, 192, 206.5, 220, 232.6, 244.5, 271.9, 296.4, 319, 339.8, 359.4, 377.8, 395.3, 412, 443.3, 472.2, 499.3, 524.7, 548.8, 571.7, 593.6, 614.5, 634.6, 653.9, 672.5, 690.4, 707.8, 724.6, 801.6, 868.9, 928.6, 981.9, 1030, 1073, 1112, 1148, 1209, 1260, 1301, 1334, 1361, 1382, 1397, 1408, 1415, 1419, 1420, 1418, 1414, 1409, 1399, 1373, 1319, 1246, 1165, 1095, 1034, 979.4, 887.4, 813.7, 752.5, 700.8, 656.5, 618.1, 584.5, 554.8, 528.3, 504.6, 483, 463.5, 445.6, 429.3 };
+ for(i=0; i<78; i++) {e[57][i]=e57[i]*MeV*cm2/g;}
+AddData(T0,e57, 57);
 name [58] = "G4_POLYVINYL_CHLORIDE";
 G4double e58[78] = { 94.27, 114.4, 131.3, 146.3, 159.9, 184, 205.5, 224.9, 242.9, 259.7, 275.5, 290.5, 325.3, 357, 386.3, 413.7, 439.5, 464.1, 487.6, 510.1, 552.6, 592.4, 629.9, 665.5, 699.4, 731.8, 762.9, 792.9, 821.8, 849.7, 876.7, 902.9, 928.2, 952.9, 1067, 1167, 1255, 1335, 1405, 1468, 1525, 1574, 1657, 1719, 1764, 1795, 1814, 1823, 1824, 1818, 1807, 1792, 1774, 1753, 1731, 1708, 1591, 1482, 1385, 1299, 1222, 1153, 1092, 1037, 941.7, 862.4, 795.8, 739.8, 692.3, 651.2, 615.4, 583.7, 555.6, 530.3, 507.5, 486.9, 468, 450.8 };
+ for(i=0; i<78; i++) {e[58][i]=e58[i]*MeV*cm2/g;}
+AddData(T0,e58, 58);
 name [59] = "G4_PROPANE";
 G4double e59[78] = { 194.5, 234.7, 268.4, 298, 324.7, 372, 413.6, 451.2, 485.8, 518, 548.2, 576.8, 642.6, 702.2, 756.9, 808, 855.9, 901.2, 944.4, 985.6, 1063, 1135, 1203, 1267, 1327, 1385, 1440, 1492, 1543, 1592, 1639, 1684, 1728, 1770, 1964, 2131, 2277, 2404, 2516, 2613, 2698, 2771, 2887, 2969, 3022, 3053, 3065, 3061, 3046, 3021, 2990, 2953, 2912, 2868, 2822, 2775, 2564, 2372, 2191, 2022, 1868, 1739, 1629, 1534, 1377, 1252, 1150, 1065, 993, 931.1, 877.2, 829.9, 787.8, 750.2, 716.4, 685.8, 658, 632.5 };
+ for(i=0; i<78; i++) {e[59][i]=e59[i]*MeV*cm2/g;}
+AddData(T0,e59, 59);
 name [60] = "G4_Pt";
 G4double e60[78] = { 14.45, 17.87, 20.78, 23.37, 25.71, 29.9, 33.61, 36.99, 40.1, 43.01, 45.75, 48.35, 54.36, 59.81, 64.84, 69.54, 73.97, 78.17, 82.17, 86, 93.22, 99.96, 106.3, 112.3, 118, 123.5, 128.7, 133.8, 138.7, 143.4, 147.9, 152.4, 156.7, 160.8, 180.3, 197.6, 213.3, 227.7, 240.9, 253, 264.3, 274.7, 293.2, 309, 322.4, 333.7, 343.1, 350.7, 356.8, 361.6, 365.1, 367.6, 369.1, 369.8, 369.9, 369.3, 364.7, 357, 347.3, 336.6, 325.5, 314.4, 303.6, 293.2, 274.3, 258.5, 245.1, 233.4, 223.1, 214, 205.8, 198.4, 191.6, 185.4, 179.7, 174.4, 169.5, 164.9 };
+ for(i=0; i<78; i++) {e[60][i]=e60[i]*MeV*cm2/g;}
+AddData(T0,e60, 60);
 name [61] = "G4_Si";
 G4double e61[78] = { 47.32, 61.63, 74.34, 85.98, 96.82, 116.8, 135.1, 152.1, 168.2, 183.4, 198.1, 212.1, 245.3, 276.1, 305.2, 332.7, 359.1, 384.4, 408.7, 432.2, 477, 519.3, 559.4, 597.5, 633.9, 668.6, 701.9, 733.7, 764.3, 793.5, 821.6, 848.5, 874.4, 899.1, 1008, 1097, 1168, 1225, 1270, 1307, 1336, 1359, 1390, 1408, 1416, 1417, 1413, 1405, 1395, 1383, 1370, 1356, 1341, 1326, 1310, 1295, 1218, 1146, 1081, 1023, 970.6, 923.9, 881.4, 842.4, 773.1, 713.1, 661.2, 617.4, 579.7, 547, 518.2, 492.7, 470, 449.5, 430.9, 414, 398.6, 384.4 };
+ for(i=0; i<78; i++) {e[61][i]=e61[i]*MeV*cm2/g;}
+AddData(T0,e61, 61);
 name [62] = "G4_SILICON_DIOXIDE";
 G4double e62[78] = { 68.9, 85.1, 98.85, 111, 122.1, 141.8, 159.3, 175.1, 189.8, 203.4, 216.3, 228.5, 256.6, 282.1, 305.7, 327.6, 348.3, 367.9, 386.5, 404.4, 437.9, 469.2, 498.5, 526.3, 552.6, 577.7, 601.7, 624.7, 646.9, 668.2, 688.8, 708.7, 728, 746.7, 832.2, 906.8, 972.6, 1031, 1083, 1129, 1170, 1207, 1268, 1315, 1351, 1377, 1396, 1409, 1417, 1421, 1421, 1419, 1414, 1406, 1397, 1387, 1349, 1301, 1237, 1163, 1087, 1021, 964, 913.7, 829.4, 762.2, 706.3, 659, 618.4, 583.3, 552.3, 524.9, 500.4, 478.4, 458.5, 440.4, 423.9, 408.7 };
+ for(i=0; i<78; i++) {e[62][i]=e62[i]*MeV*cm2/g;}
+AddData(T0,e62, 62);
 name [63] = "G4_STILBENE";
 G4double e63[78] = { 192, 228.9, 259.4, 286, 309.7, 351.2, 387.4, 419.7, 449.2, 476.4, 501.9, 525.8, 580.4, 629.2, 673.8, 714.9, 753.3, 789.4, 823.5, 856, 916.5, 972.3, 1024, 1073, 1119, 1162, 1203, 1243, 1280, 1316, 1351, 1384, 1416, 1446, 1585, 1703, 1805, 1892, 1968, 2034, 2090, 2139, 2215, 2268, 2303, 2323, 2331, 2330, 2321, 2307, 2287, 2265, 2240, 2212, 2184, 2155, 1995, 1841, 1703, 1582, 1477, 1385, 1305, 1233, 1113, 1015, 936, 869.6, 813, 764.1, 721.3, 683.7, 650.1, 620, 592.9, 568.3, 545.9, 525.4 };
+ for(i=0; i<78; i++) {e[63][i]=e63[i]*MeV*cm2/g;}
+AddData(T0,e63, 63);
 name [64] = "G4_Ti";
 G4double e64[78] = { 59.24, 72.81, 84.28, 94.41, 103.6, 119.9, 134.3, 147.4, 159.4, 170.6, 181.1, 191.1, 214, 234.7, 253.8, 271.6, 288.3, 304.1, 319.1, 333.5, 360.5, 385.5, 409, 431.2, 452.2, 472.2, 491.4, 509.7, 527.3, 544.3, 560.6, 576.4, 591.7, 606.5, 674.2, 733.1, 785, 831, 871.7, 907.9, 940, 968.3, 1015, 1051, 1077, 1095, 1106, 1112, 1114, 1112, 1107, 1100, 1092, 1082, 1071, 1059, 995.6, 933.7, 877.6, 827.9, 785.2, 747.8, 714.5, 684.4, 631.9, 587.1, 548.3, 514.3, 484.2, 457.3, 433.4, 412.5, 393.7, 376.7, 361.5, 347.6, 334.9, 323.2 };
+ for(i=0; i<78; i++) {e[64][i]=e64[i]*MeV*cm2/g;}
+AddData(T0,e64, 64);
 name [65] = "G4_Sn";
 G4double e65[78] = { 27.39, 33.96, 39.55, 44.52, 49.04, 57.11, 64.28, 70.8, 76.82, 82.45, 87.76, 92.79, 104.4, 115, 124.8, 133.9, 142.5, 150.6, 158.4, 165.8, 179.8, 192.9, 205.2, 216.8, 227.8, 238.4, 248.4, 258.1, 267.4, 276.4, 285.1, 293.5, 301.6, 309.5, 345.7, 377.3, 405.3, 430.1, 452.1, 471.8, 489.3, 504.8, 530.7, 550.9, 566.3, 577.9, 586.3, 592.2, 596.1, 598.4, 599.3, 599.1, 598.1, 596.4, 594.2, 591.5, 573.8, 552.8, 531.2, 510.1, 488.3, 467, 447, 428.6, 396.3, 369.4, 346.8, 327.7, 311.4, 297.1, 283.9, 271.9, 260.8, 250.6, 241.7, 233.6, 226, 218.9 };
+ for(i=0; i<78; i++) {e[65][i]=e65[i]*MeV*cm2/g;}
+AddData(T0,e65, 65);
 name [66] = "G4_TISSUE_METHANE";
 G4double e66[78] = { 135.1, 165.6, 191.3, 213.9, 234.4, 270.7, 302.8, 331.8, 358.4, 383.2, 406.5, 428.6, 479.3, 525.2, 567.4, 606.7, 643.6, 678.5, 711.7, 743.4, 803.1, 858.6, 910.7, 960.1, 1007, 1052, 1095, 1136, 1176, 1214, 1251, 1287, 1322, 1356, 1514, 1655, 1783, 1899, 2006, 2104, 2193, 2275, 2418, 2535, 2626, 2693, 2737, 2760, 2764, 2752, 2728, 2695, 2655, 2612, 2566, 2519, 2278, 2060, 1878, 1727, 1602, 1494, 1403, 1323, 1191, 1085, 998.2, 926, 864.6, 811.7, 765.6, 724.9, 688.8, 656.5, 627.4, 601.1, 577.1, 555.2 };
+ for(i=0; i<78; i++) {e[66][i]=e66[i]*MeV*cm2/g;}
+AddData(T0,e66, 66);
 name [67] = "G4_TISSUE_PROPANE";
 G4double e67[78] = { 149.7, 181.5, 208.2, 231.7, 252.8, 290.4, 323.5, 353.4, 380.9, 406.5, 430.5, 453.3, 505.7, 553, 596.6, 637.2, 675.4, 711.5, 745.8, 778.6, 840.4, 897.8, 951.6, 1003, 1051, 1097, 1141, 1183, 1224, 1263, 1301, 1337, 1372, 1407, 1563, 1701, 1822, 1929, 2024, 2109, 2185, 2252, 2362, 2446, 2507, 2549, 2573, 2583, 2581, 2569, 2550, 2524, 2494, 2461, 2426, 2389, 2211, 2043, 1887, 1744, 1616, 1507, 1415, 1334, 1201, 1094, 1006, 933.3, 871.4, 818.1, 771.5, 730.5, 694.1, 661.5, 632.1, 605.6, 581.4, 559.3 };
+ for(i=0; i<78; i++) {e[67][i]=e67[i]*MeV*cm2/g;}
+AddData(T0,e67, 67);
 name [68] = "G4_TOLUENE";
 G4double e68[78] = { 192.5, 230, 261, 288.1, 312.3, 354.9, 392, 425.3, 455.6, 483.7, 510, 534.8, 591.3, 642.1, 688.4, 731.3, 771.4, 809.1, 844.8, 878.8, 942.4, 1001, 1056, 1107, 1155, 1201, 1245, 1287, 1327, 1365, 1401, 1437, 1471, 1504, 1652, 1779, 1888, 1983, 2065, 2136, 2197, 2250, 2333, 2392, 2430, 2452, 2461, 2459, 2449, 2433, 2411, 2386, 2358, 2328, 2296, 2264, 2109, 1960, 1817, 1683, 1560, 1456, 1368, 1291, 1163, 1060, 976.6, 906.6, 847.1, 795.7, 750.8, 711.3, 676.1, 644.6, 616.2, 590.5, 567, 545.6 };
+ for(i=0; i<78; i++) {e[68][i]=e68[i]*MeV*cm2/g;}
+AddData(T0,e68, 68);
 name [69] = "G4_U";
 G4double e69[78] = { 13.2, 16.72, 19.77, 22.52, 25.04, 29.61, 33.73, 37.51, 41.03, 44.35, 47.5, 50.51, 57.52, 63.96, 69.97, 75.62, 80.99, 86.11, 91.01, 95.73, 104.7, 113.1, 121.1, 128.7, 136, 143, 149.8, 156.3, 162.6, 168.8, 174.7, 180.5, 186.2, 191.7, 217.4, 240.5, 261.5, 280.8, 298.5, 314.8, 329.8, 343.7, 368, 388.4, 405.3, 419, 429.8, 438.1, 444.2, 448.4, 450.8, 451.8, 451.6, 450.3, 448.2, 445.4, 420, 390.1, 362.9, 339.6, 319.8, 303.1, 288.9, 276.7, 256.9, 241.7, 229.4, 218.6, 209.1, 200.6, 193, 186.1, 179.8, 174, 168.6, 163.7, 159.1, 154.8 };
+ for(i=0; i<78; i++) {e[69][i]=e69[i]*MeV*cm2/g;}
+AddData(T0,e69, 69);
 name [70] = "G4_W";
 G4double e70[78] = { 20.75, 25.23, 28.99, 32.29, 35.26, 40.51, 45.11, 49.26, 53.06, 56.59, 59.9, 63.02, 70.18, 76.63, 82.54, 88.02, 93.16, 98.01, 102.6, 107, 115.2, 122.9, 130, 136.7, 143.1, 149.2, 155, 160.6, 165.9, 171.1, 176.1, 180.9, 185.6, 190.1, 211.1, 229.6, 246.2, 261.3, 275.1, 287.7, 299.3, 310, 328.8, 344.7, 358.1, 369.2, 378.3, 385.6, 391.3, 395.6, 398.7, 400.6, 401.7, 401.9, 401.4, 400.4, 389.5, 374.8, 359.5, 344.8, 331, 318.3, 306.5, 295.7, 276.7, 260.8, 247.3, 235.5, 225.2, 216.1, 207.8, 200.3, 193.5, 187.3, 181.5, 176.2, 171.3, 166.7 };
+ for(i=0; i<78; i++) {e[70][i]=e70[i]*MeV*cm2/g;}
+AddData(T0,e70, 70);
 name [71] = "G4_WATER";
 G4double e71[78] = { 98.91, 122.7, 143.1, 161.1, 177.5, 206.9, 233, 256.8, 278.8, 299.3, 318.6, 337, 379.5, 418.1, 453.8, 487.1, 518.6, 548.3, 576.7, 603.9, 655.2, 703, 748, 790.5, 831, 869.6, 906.6, 942.2, 976.4, 1009, 1041, 1072, 1102, 1131, 1265, 1383, 1488, 1582, 1666, 1743, 1811, 1873, 1978, 2062, 2128, 2178, 2215, 2240, 2255, 2262, 2262, 2256, 2245, 2230, 2211, 2190, 2050, 1896, 1752, 1624, 1511, 1414, 1329, 1255, 1132, 1034, 952.7, 884.8, 826.9, 777.1, 733.4, 694.9, 660.7, 630.1, 602.5, 577.6, 554.8, 534 };
+ for(i=0; i<78; i++) {e[71][i]=e71[i]*MeV*cm2/g;}
+AddData(T0,e71, 71);
 name [72] = "G4_WATER_VAPOR";
 G4double e72[78] = { 126.3, 154.7, 178.7, 199.8, 218.8, 252.7, 282.5, 309.5, 334.3, 357.3, 379, 399.5, 446.7, 489.3, 528.5, 565, 599.2, 631.6, 662.4, 691.9, 747.3, 798.8, 847.2, 892.9, 936.3, 977.8, 1018, 1056, 1093, 1128, 1163, 1196, 1228, 1260, 1405, 1535, 1652, 1758, 1855, 1942, 2022, 2094, 2216, 2309, 2377, 2422, 2446, 2455, 2453, 2446, 2436, 2423, 2409, 2392, 2371, 2346, 2169, 1971, 1797, 1653, 1537, 1437, 1351, 1275, 1149, 1049, 965.8, 896.6, 837.6, 786.9, 742.5, 703.3, 668.6, 637.5, 609.5, 584.2, 561.1, 539.9 };
+ for(i=0; i<78; i++) {e[72][i]=e72[i]*MeV*cm2/g;}
+AddData(T0,e72, 72);
 name [73] = "G4_Xe";
 G4double e73[78] = { 18.11, 23.3, 27.86, 31.99, 35.83, 42.84, 49.2, 55.1, 60.63, 65.87, 70.87, 75.65, 86.89, 97.3, 107.1, 116.3, 125.1, 133.5, 141.7, 149.5, 164.4, 178.6, 192, 204.9, 217.3, 229.2, 240.7, 251.8, 262.6, 273.1, 283.4, 293.3, 303, 312.5, 356.7, 396.5, 432.5, 465.2, 494.9, 521.8, 546.1, 567.9, 604.7, 633.2, 654.5, 669.3, 678.8, 683.6, 684.6, 682.5, 678, 671.7, 663.9, 655.1, 645.6, 635.6, 584.6, 538.7, 500.4, 468.8, 446.7, 430.5, 417.1, 405.3, 383.9, 364, 344.9, 326.8, 309.7, 294.6, 281.3, 269.5, 258.7, 248.8, 239.6, 231.1, 223.2, 216.2 };
+ for(i=0; i<78; i++) {e[73][i]=e73[i]*MeV*cm2/g;}
+AddData(T0,e73, 73);
+}
+void G4ASTARStopping::AddData(G4double* ekin, G4double* s, G4int idx)
+{
+sdata[idx] = new G4LPhysicsFreeVector(78, ekin[0]*MeV, ekin[77]*MeV);
+const G4double fac = MeV*cm2/g;
+for(size_t i=0; i<78; ++i) { sdata[idx]->PutValues(i, ekin[i]*MeV, s[i]*fac); }
+sdata[idx]->SetSpline(true);
+}

trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4BetheBlochModel.cc,v 1.36 2009/12/03 17:26:40 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4BetheBlochModel.cc,v 1.37 2010/05/27 10:25:59 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
                                               G4double kineticEnergy)
+{
   // this method is called only for ions
+  // this method is called only for ions, so no check if it is an ion
   return corr->GetParticleCharge(p,mat,kineticEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4BetheBlochModel::SetupParameters()
+{
+  mass = particle->GetPDGMass();
+  spin = particle->GetPDGSpin();
+  G4double q = particle->GetPDGCharge()/eplus;
+  chargeSquare = q*q;
+  ratio = electron_mass_c2/mass;
+  G4double magmom =
+    particle->GetPDGMagneticMoment()*mass/(0.5*eplus*hbar_Planck*c_squared);
+  magMoment2 = magmom*magmom - 1.0;
+  formfact = 0.0;
+  if(particle->GetLeptonNumber() == 0) {
+    G4double x = 0.8426*GeV;
+    if(spin == 0.0 && mass < GeV) {x = 0.736*GeV;}
+    else if(mass > GeV) {
+      x /= nist->GetZ13(mass/proton_mass_c2);
+      //        tlimit = 51.2*GeV*A13[iz]*A13[iz];
+    }
+    formfact = 2.0*electron_mass_c2/(x*x);
+    tlimit   = 2.0/formfact;
+  }
+}
 …
     // +term for spin=1/2 particle
     if( 0.5 == spin ) cross += 0.5*(maxEnergy - cutEnergy)/energy2;
+    if( 0.5 == spin ) { cross += 0.5*(maxEnergy - cutEnergy)/energy2; }
     // High order correction different for hadrons and ions
 …
+{
   G4double tmax      = MaxSecondaryEnergy(p, kineticEnergy);
   G4double cutEnergy = min(cut,tmax);
+  G4double cutEnergy = std::min(cut,tmax);
   G4double tau   = kineticEnergy/mass;
 …
   G4double eexc  = material->GetIonisation()->GetMeanExcitationEnergy();
   G4double eexc2 = eexc*eexc;
-  //G4double cden  = material->GetIonisation()->GetCdensity();
-  //G4double mden  = material->GetIonisation()->GetMdensity();
-  //G4double aden  = material->GetIonisation()->GetAdensity();
-  //G4double x0den = material->GetIonisation()->GetX0density();
-  //G4double x1den = material->GetIonisation()->GetX1density();
   G4double eDensity = material->GetElectronDensity();
 …
   // density correction
   G4double x = log(bg2)/twoln10;
-  //if ( x >= x0den ) {
-  //  dedx -= twoln10*x - cden ;
-  //  if ( x < x1den ) dedx -= aden*pow((x1den-x),mden) ;
-  //}
   dedx -= material->GetIonisation()->DensityCorrection(x);
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-/*
-void G4BetheBlochModel::CorrectionsAlongStep(const G4MaterialCutsCouple*,
-                                             const G4DynamicParticle*,
-                                             G4double&,
-                                             G4double&,
-                                             G4double)
-{}
-*/
 void G4BetheBlochModel::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,

trunk/source/processes/electromagnetic/standard/src/G4BraggModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4BraggModel.cc,v 1.23 2009/11/10 19:25:47 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4BraggModel.cc,v 1.26 2010/06/04 09:08:43 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
   theZieglerFactor = eV*cm2*1.0e-15;
   theElectron = G4Electron::Electron();
+  corr = G4LossTableManager::Instance()->EmCorrections();
+}
 …
 G4double G4BraggModel::MinEnergyCut(const G4ParticleDefinition*,
+                                    const G4MaterialCutsCouple* couple)
+{
+  return couple->GetMaterial()->GetIonisation()->GetMeanExcitationEnergy();
+                                    const G4MaterialCutsCouple*)
+{
+  return 0.1*keV;
+  // return couple->GetMaterial()->GetIonisation()->GetMeanExcitationEnergy();
+}
 …
                               const G4DataVector&)
+{
   if(p != particle) SetParticle(p);
+  if(p != particle) { SetParticle(p); }
   // always false before the run
 …
     G4String pname = particle->GetParticleName();
     if(particle->GetParticleType() == "nucleus" &&
+       pname != "deuteron" && pname != "triton") isIon = true;
+    corr = G4LossTableManager::Instance()->EmCorrections();
+       pname != "deuteron" && pname != "triton") { isIon = true; }
     fParticleChange = GetParticleChangeForLoss();
 …
                                          G4double kineticEnergy)
+{
   // this method is called only for ions
+  // this method is called only for ions, so no check if it is an ion
   return corr->GetParticleCharge(p,mat,kineticEnergy);
+}
 …
   G4double tmax      = MaxSecondaryEnergy(p, kineticEnergy);
   G4double maxEnergy = std::min(tmax,maxKinEnergy);
   if(cutEnergy < tmax) {
+  if(cutEnergy < maxEnergy) {
     G4double energy  = kineticEnergy + mass;
 …
   G4double tkin  = kineticEnergy/massRate;
   G4double dedx  = 0.0;
   if(tkin > lowestKinEnergy) dedx = DEDX(material, tkin);
   else      dedx = DEDX(material, lowestKinEnergy)*sqrt(tkin/lowestKinEnergy);
+  if(tkin > lowestKinEnergy) { dedx = DEDX(material, tkin); }
+  else { dedx = DEDX(material, lowestKinEnergy)*sqrt(tkin/lowestKinEnergy); }
   if (cutEnergy < tmax) {
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-/*
-void G4BraggModel::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
-                                        const G4DynamicParticle* dp,
-                                        G4double& eloss,
-                                        G4double&,
-                                        G4double length)
+{
-  if(nuclearStopping) {
-    G4double preKinEnergy = dp->GetKineticEnergy();
-    G4double e = preKinEnergy - eloss*0.5;
-    if(e < 0.0) e = preKinEnergy*0.5;
-    G4double nloss = length*corr->NuclearDEDX(dp->GetDefinition(),
-                                              couple->GetMaterial(),
-                                              e,false);
-    // too big energy loss
-    if(eloss + nloss > preKinEnergy) {
-      nloss *= (preKinEnergy/(eloss + nloss));
-      eloss = preKinEnergy;
-    } else {
-      eloss += nloss;
+    }
-    G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
-           << " de= " << eloss << " NIEL= " << nloss
-           << " dynQ= " << dp->GetCharge()/eplus << G4endl;
-    fParticleChange->ProposeNonIonizingEnergyDeposit(nloss);
+  }
+}
-*/
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 void G4BraggModel::SampleSecondaries(vector<G4DynamicParticle*>* vdp,
 …
   G4double tmax = MaxSecondaryKinEnergy(dp);
   G4double xmax = std::min(tmax, maxEnergy);
   if(xmin >= xmax) return;
+  if(xmin >= xmax) { return; }
   G4double kineticEnergy = dp->GetKineticEnergy();
 …
                                           G4double kinEnergy)
+{
   if(pd != particle) SetParticle(pd);
+  if(pd != particle) { SetParticle(pd); }
   G4double tau  = kinEnergy/mass;
   G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
 …
   G4int iNist = pstar.GetIndex(material);
   if( iNist >= 0 ) {
+  if( iNist >= 0 && kineticEnergy <= 2.01*MeV) {
     return pstar.GetElectronicDEDX(iNist, kineticEnergy)*material->GetDensity();

trunk/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4CoulombScattering.cc,v 1.25 2009/10/28 10:14:13 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4CoulombScattering.cc,v 1.28 2010/05/25 18:41:12 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4Electron.hh"
 #include "G4Proton.hh"
+#include "G4LossTableManager.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
     isInitialised(false)
+{
+  //  G4cout << "G4CoulombScattering constructor "<< G4endl;
   SetBuildTableFlag(true);
   SetStartFromNullFlag(false);
 …
 void G4CoulombScattering::InitialiseProcess(const G4ParticleDefinition* p)
+{
+  //G4cout << "### G4CoulombScattering::InitialiseProcess : "
+  //     << p->GetParticleName() << G4endl;
+  G4double a =
+    G4LossTableManager::Instance()->FactorForAngleLimit()*CLHEP::hbarc/CLHEP::fermi;
+  q2Max = 0.5*a*a;
   // second initialisation
   if(isInitialised) {
 …
     mod->SetPolarAngleLimit(PolarAngleLimit());
     mod = GetModelByIndex(1);
     if(mod) mod->SetPolarAngleLimit(PolarAngleLimit());
+    if(mod) { mod->SetPolarAngleLimit(PolarAngleLimit()); }
     // first initialisation
 …
     G4double mass = p->GetPDGMass();
     G4String name = p->GetParticleName();
+    //G4cout << name << "  type: " << p->GetParticleType()
+    //<< " mass= " << mass << G4endl;
     if (mass > GeV || p->GetParticleType() == "nucleus") {
       SetBuildTableFlag(false);
       verboseLevel = 0;
+      if(name != "GenericIon") { SetVerboseLevel(0); }
     } else {
       if(name != "e-" && name != "e+" &&
          name != "mu+" && name != "mu-" && name != "pi+" &&
          name != "kaon+" && name != "proton" ) verboseLevel = 0;
+         name != "kaon+" && name != "proton" ) { SetVerboseLevel(0); }
+    }
 …
   else                              G4cout << thEnergy;
   if(q2Max < DBL_MAX) G4cout << "; q2Max(GeV^2)= " << q2Max/(GeV*GeV);
+  if(q2Max < DBL_MAX) { G4cout << "; pLimit(GeV^1)= " << sqrt(q2Max)/GeV; }
   G4cout << G4endl;
+}

trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4CoulombScatteringModel.cc,v 1.44 2009/12/03 09:59:07 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4CoulombScatteringModel.cc,v 1.49 2010/05/27 14:22:05 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // 09.06.08 V.Ivanchenko SelectIsotope is moved to the base class
 // 16.06.09 Consolandi rows 109, 111-112, 183, 185-186
+// 27.05.10 V.Ivanchenko added G4WentzelOKandVIxSection class to
+//              compute cross sections and sample scattering angle
 //
 //
 …
 #include "G4IonTable.hh"
 #include "G4Proton.hh"
+#include "G4NucleiProperties.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
                                 G4double)
+{
+  SetupParticle(p);
+  if(kinEnergy < lowEnergyLimit) return 0.0;
+  SetupKinematic(kinEnergy, cutEnergy);
+  // save lab system kinematics
+  G4double xtkin = tkin;
+  G4double xmom2 = mom2;
+  G4double xinvb = invbeta2;
+  // CM system
+  iz            = G4int(Z);
+  G4double m2   = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
+  G4double etot = tkin + mass;
+  G4double ptot = sqrt(mom2);
+  G4double m12  = mass*mass;
+  G4double momCM= ptot*m2/sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  mom2 = momCM*momCM;
+  tkin = sqrt(mom2 + m12) - mass;
+  //invbeta2 = 1.0 +  m12/mom2;
+  //  G4double fm = m2/(mass + m2);
+  // 03.09.2009 C.Consaldi
+  G4double Ecm=sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  G4double mu_rel=mass*m2/Ecm;
+  invbeta2 = 1.0 +  mu_rel*mu_rel/mom2;
+  //
+  SetupTarget(Z, tkin);
+  G4double xsec = CrossSectionPerAtom();
+  // restore Lab system kinematics
+  tkin = xtkin;
+  mom2 = xmom2;
+  invbeta2 = xinvb;
+  //G4cout << "### G4CoulombScatteringModel::ComputeCrossSectionPerAtom  for "
+  //     << p->GetParticleName()<<" Z= "<<Z<<" e(MeV)= "<< kinEnergy/MeV
+  //     <<" cut(MeV)= " << cutEnergy<< G4endl;
+  G4double xsec = 0.0;
+  if(p != particle) { SetupParticle(p); }
+  if(kinEnergy < lowEnergyLimit) { return 0.0; }
+  DefineMaterial(CurrentCouple());
+  // Lab system
+  G4int iz = G4int(Z);
+  G4double etot = kinEnergy + mass;
+  G4double m2 = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
+  // 03.09.2009 C.Consaldi suggested to use relativistic reduced mass
+  //            from publucation
+  // A.P. Martynenko, R.N. Faustov, Teoret. mat. Fiz. 64 (1985) 179
+  G4double Ecm  = sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
+  G4double mu_rel = mass*m2/Ecm;
+  G4double tkin = Ecm - mu_rel;
+  wokvi->SetRelativisticMass(mu_rel);
+  cosTetMinNuc = wokvi->SetupKinematic(tkin, currentMaterial);
+  if(cosThetaMax < cosTetMinNuc) {
+    cosTetMinNuc = wokvi->SetupTarget(iz, cutEnergy);
+    cosTetMaxNuc = cosThetaMax;
+    if(iz == 1 && cosTetMaxNuc < 0.0 && particle == theProton) {
+      cosTetMaxNuc = 0.0;
+    }
+    xsec =  wokvi->ComputeNuclearCrossSection(cosTetMinNuc, cosTetMaxNuc);
+    elecRatio = wokvi->ComputeElectronCrossSection(cosTetMinNuc, cosThetaMax);
+    xsec += elecRatio;
+    if(xsec > 0.0) { elecRatio /= xsec; }
+  }
+  /*
+  G4cout << "e(MeV)= " << kinEnergy/MeV << " xsec(b)= " << xsec/barn
+         << "cosTetMinNuc= " << cosTetMinNuc
+         << " cosTetMaxNuc= " << cosTetMaxNuc
+         << " cosTetMaxElec= " << cosTetMaxElec
+         << " screenZ= " << screenZ
+         << " formfactA= " << formfactA << G4endl;
+  */
   return xsec;
+}
 …
+{
   G4double kinEnergy = dp->GetKineticEnergy();
   if(kinEnergy < lowEnergyLimit) return;
+  if(kinEnergy < lowEnergyLimit) { return; }
   DefineMaterial(couple);
   SetupParticle(dp->GetDefinition());
-  SetupKinematic(kinEnergy, cutEnergy);
   // Choose nucleus
   currentElement = SelectRandomAtom(couple,particle,
+                                    kinEnergy,ecut,kinEnergy);
+  G4double Z  = currentElement->GetZ();
+  iz          = G4int(Z);
+  G4int ia    = SelectIsotopeNumber(currentElement);
+  G4double m2 = theParticleTable->GetIonTable()->GetNucleusMass(iz, ia);
+  // CM system
+  G4double etot = tkin + mass;
+  G4double ptot = sqrt(mom2);
+  G4double momCM= ptot*m2/sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
+  mom2 = momCM*momCM;
+  G4double m12 = mass*mass;
+  G4double eCM = sqrt(mom2 + m12);
+  // a correction for heavy projectile
+  //  G4double fm = m2/(mass + m2);
+  //  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+  // 03.09.2009 C.Consaldi
+  G4double Ecm=sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  G4double mu_rel=mass*m2/Ecm;
+  invbeta2 = 1.0 +  mu_rel*mu_rel/mom2;
+  //
+  // sample scattering angle in CM system
+  SetupTarget(Z, eCM - mass);
+  G4double cost = SampleCosineTheta();
+  G4double z1   = 1.0 - cost;
+  if(z1 < 0.0) return;
+  G4double sint = sqrt(z1*(1.0 + cost));
+  G4double phi  = twopi * G4UniformRand();
+                                    kinEnergy,cutEnergy,kinEnergy);
+  G4double Z = currentElement->GetZ();
+  G4int iz = G4int(Z);
+  G4int ia = SelectIsotopeNumber(currentElement);
+  G4double targetMass = G4NucleiProperties::GetNuclearMass(ia, iz);
+  if(ComputeCrossSectionPerAtom(particle,kinEnergy, Z,
+                                kinEnergy, cutEnergy, kinEnergy) == 0.0)
+    { return; }
+  G4ThreeVector newDirection =
+    wokvi->SampleSingleScattering(cosTetMinNuc, cosTetMaxNuc, elecRatio);
   // kinematics in the Lab system
+  G4double bet  = ptot/(etot + m2);
+  G4double etot = mass + kinEnergy;
+  G4double ptot = sqrt(kinEnergy*(etot + mass));
+  G4double bet  = ptot/(etot + targetMass);
   G4double gam  = 1.0/sqrt((1.0 - bet)*(1.0 + bet));
+  G4double pzCM = momCM*cost;
+  G4ThreeVector v1(momCM*cos(phi)*sint,momCM*sin(phi)*sint,gam*(pzCM + bet*eCM));
+  G4double eCM  = sqrt(mass*mass + targetMass*targetMass + 2*targetMass*etot);
+  G4double pCM  = ptot*targetMass/eCM;
+  G4double e1   = sqrt(mass*mass + pCM*pCM);
+  newDirection *= pCM;
+  G4ThreeVector v1(newDirection.x(),newDirection.y(),gam*(newDirection.z() + bet*e1));
+  G4double finalT = gam*(e1 + bet*newDirection.z()) - mass;
+  newDirection = v1.unit();
   G4ThreeVector dir = dp->GetMomentumDirection();
-  G4ThreeVector newDirection = v1.unit();
   newDirection.rotateUz(dir);
   fParticleChange->ProposeMomentumDirection(newDirection);
- //   G4double elab = gam*(eCM + bet*pzCM);
- // G4double Ecm  = sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
-  G4double elab = etot - m2*(ptot/Ecm)*(ptot/Ecm)*(1.-cost) ;
+  G4double finalT = elab - mass;
+  if(finalT < 0.0) finalT = 0.0;
+  // recoil
+  G4double trec = kinEnergy - finalT;
+  if(finalT <= lowEnergyLimit) {
+    trec = kinEnergy;
+    finalT = 0.0;
+  }
   fParticleChange->SetProposedKineticEnergy(finalT);
+  // recoil
+  G4double erec = kinEnergy - finalT;
+  //  G4cout << "sint= " << sint << " Erec(eV)= " << erec/eV << G4endl;
   G4double tcut = recoilThreshold;
   if(pCuts) { tcut= std::max(tcut,(*pCuts)[currentMaterialIndex]); }
+  if(erec > tcut) {
+  /*
+  G4cout << "sint= " << sint << " Erec(eV)= " << erec/eV
+         << " tcut(eV)= " << tcut/eV << " th(eV)= " << recoilThreshold/eV
+         << " cut(eV)= " << (*pCuts)[currentMaterialIndex]/eV
+         << "  "  << fvect->size()
+         << G4endl;
+  */
+  if(trec > tcut) {
     G4ParticleDefinition* ion = theParticleTable->FindIon(iz, ia, 0, iz);
     G4double plab = sqrt(finalT*(finalT + 2.0*mass));
     G4ThreeVector p2 = (ptot*dir - plab*newDirection).unit();
     G4DynamicParticle* newdp  = new G4DynamicParticle(ion, p2, erec);
+    G4DynamicParticle* newdp  = new G4DynamicParticle(ion, p2, trec);
     fvect->push_back(newdp);
   } else if(erec > 0.0) {
     fParticleChange->ProposeLocalEnergyDeposit(erec);
     fParticleChange->ProposeNonIonizingEnergyDeposit(erec);
+  } else if(trec > 0.0) {
+    fParticleChange->ProposeLocalEnergyDeposit(trec);
+    fParticleChange->ProposeNonIonizingEnergyDeposit(trec);
+  }
+}

trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonMscModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4GoudsmitSaundersonMscModel.cc,v 1.20 2009/12/16 17:50:11 gunter Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GoudsmitSaundersonMscModel.cc,v 1.24 2010/05/17 15:11:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 //                     assuming the case of lambdan<1 as single scattering regime
 //                     tuning theta sampling for theta below the screening angle
+// 08.02.2010 O.Kadri: bugfix in compound xsection calculation and small angle computation
+//                     adding a rejection condition to hard collision angular sampling
+//                     ComputeTruePathLengthLimit was taken from G4WentzelVIModel
+// 26.03.2010 O.Kadri: direct xsection calculation not inverse of the inverse
+//                     angular sampling without large angle rejection method
+//                     longitudinal displacement is computed exactly from <z>
+// 12.05.2010 O.Kadri: exchange between target and projectile has as a condition the particle type (e-/e-)
+//                     some cleanup to minimize time consuming (adding lamdan12 & Qn12, changing the error to 1.0e-12 for scrA)
 //
 //
 …
 //Ref.4:Bielajew et al.,".....", NIMB 173 (2001) 332-343;
 //Ref.5:F. Salvat et al.,"ELSEPA--Dirac partial ...molecules", Comp.Phys.Comm.165 (2005) pp 157-190;
+//Ref.6:G4UrbanMscModel G4_v9.1Ref09;
+//Ref.7:G4eCoulombScatteringModel G4_v9.1Ref09.
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//Ref.6:G4UrbanMscModel G4 9.2;
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #include "G4GoudsmitSaundersonMscModel.hh"
 #include "G4GoudsmitSaundersonTable.hh"
 …
 #include "G4PhysicsTable.hh"
 #include "Randomize.hh"
-#include "G4Poisson.hh"
 using namespace std;
 …
                        G4double kineticEnergy,G4double Z, G4double, G4double, G4double)
+{
-  //Build cross section table : Taken from Ref.7
   G4double cs=0.0;
   G4double kinEnergy = kineticEnergy;
 …
   if(kinEnergy>highKEnergy)kinEnergy=highKEnergy;
   G4double value0,value1;
   CalculateIntegrals(p,Z,kinEnergy,value0,value1);
+  G4double cs0;
+  CalculateIntegrals(p,Z,kinEnergy,cs0,cs);
-  if(value1 > 0.0) cs = 1./value1;
   return cs;
+}
 …
+{
   G4double kineticEnergy = dynParticle->GetKineticEnergy();
+  if((kineticEnergy <= 0.0) || (tPathLength <= tlimitminfix)) return ;
+  G4double cosTheta1,sinTheta1,cosTheta2,sinTheta2;
+  G4double phi1,phi2,cosPhi1=1.0,sinPhi1=0.0,cosPhi2=1.0,sinPhi2=0.0;
+  G4double q1,Gamma,Eta,delta,nu,nu0,nu1,nu2;
+  if((kineticEnergy <= 0.0) || (tPathLength <= tlimitminfix)||
+     (tPathLength/tausmall < lambda1)) return ;
   ///////////////////////////////////////////
   // Effective energy and path-length from Eq. 4.7.15+16 of Ref.4
+  // Effective energy
   G4double  eloss = theManager->GetEnergy(particle,tPathLength,currentCouple);
+  if(eloss>0.5*kineticEnergy)eloss=kineticEnergy-eloss;//exchange possibility between target atomic e- and incident particle
+  if(eloss>0.5*kineticEnergy)
+   {if((dynParticle->GetCharge())==-eplus)eloss=kineticEnergy-eloss;//exchange between target and projectile if they are electrons
+    else eloss=0.5*kineticEnergy;
+   }
   G4double ee       = kineticEnergy - 0.5*eloss;
   G4double ttau     = ee/electron_mass_c2;
 …
   kineticEnergy *= (1 - cst1);
   ///////////////////////////////////////////
   // additivity rule for mixture and compound xsection calculation
+  // additivity rule for mixture and compound xsection's
   const G4Material* mat = currentCouple->GetMaterial();
+  const G4ElementVector* theElementVector = mat->GetElementVector();
+  const G4double* theAtomNumDensityVector = mat->GetVecNbOfAtomsPerVolume();
   G4int nelm = mat->GetNumberOfElements();
+  const G4ElementVector* theElementVector = mat->GetElementVector();
+  const G4double* theFraction = mat->GetFractionVector();
+  G4double atomPerVolume = mat->GetTotNbOfAtomsPerVolume();
+  G4double llambda0=0.,llambda1=0.;
+  G4double s0,s1;
+  lambda0=0.;
   for(G4int i=0;i<nelm;i++)
+    {
+      G4double l0,l1;
+      CalculateIntegrals(particle,(*theElementVector)[i]->GetZ(),kineticEnergy,l0,l1);
+      llambda0 += (theFraction[i]/l0);
+      llambda1 += (theFraction[i]/l1);
+    {
+      CalculateIntegrals(particle,(*theElementVector)[i]->GetZ(),kineticEnergy,s0,s1);
+      lambda0 += (theAtomNumDensityVector[i]*s0);
+    }
+  if(llambda0>DBL_MIN) llambda0 =1./llambda0;
+  if(llambda1>DBL_MIN) llambda1 =1./llambda1;
+  if(lambda0>DBL_MIN) lambda0 =1./lambda0;
+// Newton-Raphson root's finding method of scrA from:
+// Sig1(PWA)/Sig0(PWA)=g1=2*scrA*((1+scrA)*log(1+1/scrA)-1)
   G4double g1=0.0;
   if(llambda1>DBL_MIN) g1 = llambda0/llambda1;
   G4double x1,x0;
   x0=g1/2.;
+  if(lambda1>DBL_MIN) g1 = lambda0/lambda1;
+  G4double logx0,x1,delta;
+  G4double x0=g1/2.;
   do
+    {
+      x1 = x0-(x0*((1.+x0)*log(1.+1./x0)-1.0)-g1/2.)/( (1.+2.*x0)*log(1.+1./x0)-2.0);// x1=x0-f(x0)/f'(x0)
+      logx0=std::log(1.+1./x0);
+      x1 = x0-(x0*((1.+x0)*logx0-1.0)-g1/2.)/( (1.+2.*x0)*logx0-2.0);
       delta = std::abs( x1 - x0 );
       x0 = x1;  // new approximation becomes the old approximation for the next iteration
     } while (delta > 1e-10);
+      x0 = x1;
+    } while (delta > 1.0e-12);
   G4double scrA = x1;
-  G4double us=0.0,vs=0.0,ws=1.0,x_coord=0.0,y_coord=0.0,z_coord=1.0;
   G4double lambdan=0.;
+  G4bool mscatt=false,noscatt=false;
+  if(llambda0>0.)lambdan=atomPerVolume*tPathLength/llambda0;
+  if((lambdan<=1.0e-12))return;
+  if(lambda0>0.)lambdan=tPathLength/lambda0;
+  if(lambdan<=1.0e-12)return;
+  G4double lambdan12=0.5*lambdan;
+  Qn1 = lambdan *g1;//2.* lambdan *scrA*((1.+scrA)*log(1.+1./scrA)-1.);
+  Qn12 = 0.5*Qn1;
+  G4double cosTheta1,sinTheta1,cosTheta2,sinTheta2;
+  G4double cosPhi1=1.0,sinPhi1=0.0,cosPhi2=1.0,sinPhi2=0.0;
+  G4double us=0.0,vs=0.0,ws=1.0,wss=0.,x_coord=0.0,y_coord=0.0,z_coord=1.0;
   G4double epsilon1=G4UniformRand();
+  G4double expn = exp(-lambdan);
+  if((epsilon1<expn)||insideskin)// no scattering
+    {noscatt=true;}
+  else if((epsilon1<((1.+lambdan)*expn)||(lambdan<1.)))
+    {
+      mscatt=false;
+      ws=G4UniformRand();
+      ws= 1.-2.*scrA*ws/(1.-ws + scrA);
+      if(acos(ws)<sqrt(scrA))//small angle approximation for theta less than screening angle
+      {G4int i=0;
+      do{i++;
+      ws=1.+0.5*atomPerVolume*tPathLength*log(G4UniformRand())/llambda1;
+      }while((fabs(ws)>1.)&&(i<20));//i<20 to avoid time consuming during the run
+      if(i==19)ws=cos(sqrt(scrA));
+      }
+      G4double phi0=twopi*G4UniformRand();
+      us=sqrt(1.-ws*ws)*cos(phi0);
+      vs=sqrt(1.-ws*ws)*sin(phi0);
+      G4double rr=G4UniformRand();
+      x_coord=(rr*us);
+      y_coord=(rr*vs);
+      z_coord=((1.-rr)+rr*ws);
+    }
+  else
+    {
+      mscatt=true;
+  G4double expn = std::exp(-lambdan);
+  if(epsilon1<expn)// no scattering
+    {return;}
+  else if((epsilon1<((1.+lambdan)*expn))||(lambdan<1.))//single scattering (Rutherford DCS's)
+    {
+      G4double xi=G4UniformRand();
+      xi= 2.*scrA*xi/(1.-xi + scrA);
+      if(xi<0.)xi=0.;
+      else if(xi>2.)xi=2.;
+      ws=1.-xi;
+      wss=std::sqrt(xi*(2.-xi));
+      G4double phi0=CLHEP::twopi*G4UniformRand();
+      us=wss*cos(phi0);
+      vs=wss*sin(phi0);
+    }
+  else // multiple scattering
+    {
       // Ref.2 subsection 4.4 "The best solution found"
       // Sample first substep scattering angle
       SampleCosineTheta(0.5*lambdan,scrA,cosTheta1,sinTheta1);
       phi1  = twopi*G4UniformRand();
+      SampleCosineTheta(lambdan12,scrA,cosTheta1,sinTheta1);
+      G4double phi1  = CLHEP::twopi*G4UniformRand();
       cosPhi1 = cos(phi1);
       sinPhi1 = sin(phi1);
       // Sample second substep scattering angle
       SampleCosineTheta(0.5*lambdan,scrA,cosTheta2,sinTheta2);
       phi2  = twopi*G4UniformRand();
+      SampleCosineTheta(lambdan12,scrA,cosTheta2,sinTheta2);
+      G4double phi2  = CLHEP::twopi*G4UniformRand();
       cosPhi2 = cos(phi2);
       sinPhi2 = sin(phi2);
       // Scattering direction
+      // Overall scattering direction
       us = sinTheta2*(cosTheta1*cosPhi1*cosPhi2 - sinPhi1*sinPhi2) + cosTheta2*sinTheta1*cosPhi1;
       vs = sinTheta2*(cosTheta1*sinPhi1*cosPhi2 + cosPhi1*sinPhi2) + cosTheta2*sinTheta1*sinPhi1;
       ws = cosTheta1*cosTheta2 - sinTheta1*sinTheta2*cosPhi2;
+      G4double sqrtA=sqrt(scrA);
+      if(acos(ws)<sqrtA)//small angle approximation for theta less than screening angle
+      {
+       G4int i=0;
+       do{i++;
+       ws=1.+Qn12*log(G4UniformRand());
+       }while((fabs(ws)>1.)&&(i<20));//i<20 to avoid time consuming during the run
+       if(i>=19)ws=cos(sqrtA);
+       wss=std::sqrt((1.-ws)*(1.0+ws));
+       us=wss*cos(phi1);
+       vs=wss*sin(phi1);
+     }
+    }
 …
   fParticleChange->ProposeMomentumDirection(newDirection);
+  if((safety > tlimitminfix)&&(latDisplasment))
+    {
+      if(mscatt)
+        {
+          if(scrA<DBL_MIN)scrA=DBL_MIN;
+          if(llambda1<DBL_MIN)llambda1=DBL_MIN;
+          q1 = 2.*scrA*((1. + scrA)*log(1. + 1./scrA) - 1.);
+          if(q1<DBL_MIN)q1=DBL_MIN;
+          Gamma  = 6.*scrA*(1. + scrA)*((1. + 2.*scrA)*log(1. + 1./scrA) - 2.)/q1;
+          Eta    = atomPerVolume*tPathLength/llambda1;
+          delta  = 0.90824829 - Eta*(0.102062073-Gamma*0.026374715);
+          nu = G4UniformRand();
+          nu = std::sqrt(nu);
+          nu0 = (1.0 - nu)/2.;
+          nu1 = nu*delta;
+          nu2 = nu*(1.0-delta);
+          x_coord=(nu1*sinTheta1*cosPhi1+nu2*sinTheta2*(cosPhi1*cosPhi2-cosTheta1*sinPhi1*sinPhi2)+nu0*us);
+          y_coord=(nu1*sinTheta1*sinPhi1+nu2*sinTheta2*(sinPhi1*cosPhi2+cosTheta1*cosPhi1*sinPhi2)+nu0*vs);
+          z_coord=(nu0+nu1*cosTheta1+nu2*cosTheta2+ nu0*ws)  ;
+        }
+  if((safety > tlimitminfix)&&latDisplasment)
+    {
+      if(Qn1<0.02)// corresponding to error less than 1% in the exact formula of <z>
+      z_coord = 1.0 - Qn1*(0.5 - Qn1/6.);
+      else z_coord = (1.-std::exp(-Qn1))/Qn1;
+      G4double rr=std::sqrt((1.- z_coord*z_coord)/(1.-ws*ws));
+      x_coord = rr*us;
+      y_coord = rr*vs;
       // displacement is computed relatively to the end point
       if(!noscatt)z_coord -= 1.0;//for noscatt zcoord z_coord !=0.
       G4double rr = sqrt(x_coord*x_coord+y_coord*y_coord+z_coord*z_coord);
+      z_coord -= 1.0;
+      rr = std::sqrt(x_coord*x_coord+y_coord*y_coord+z_coord*z_coord);
       G4double r  = rr*zPathLength;
       /*
 …
              << G4endl;
       */
+      if(tPathLength<=zPathLength)return;
       if(r > tlimitminfix) {
         G4ThreeVector latDirection(x_coord/rr,y_coord/rr,z_coord/rr);
         latDirection.rotateUz(oldDirection);
         ComputeDisplacement(fParticleChange, latDirection, r, safety);
+        G4ThreeVector Direction(x_coord/rr,y_coord/rr,z_coord/rr);
+        Direction.rotateUz(oldDirection);
+        ComputeDisplacement(fParticleChange, Direction, r, safety);
+      }
+    }
 …
                                                 G4double &cost, G4double &sint)
+{
-  G4double u,Qn1,r1,tet;
   G4double xi=0.;
+  Qn1=2.* lambdan *scrA*((1.+scrA)*log(1.+1./scrA)-1.);
+if (Qn1<0.001)xi=-0.5*Qn1*log(G4UniformRand());
+else if(Qn1>0.5)xi=2.*G4UniformRand();//isotropic distribution
+else
+{
+      // procedure described by Benedito in Ref.1
+  if (Qn12<0.001)
+  {G4double r1,tet;
       do{
+        r1=G4UniformRand();
+        u=GSTable->SampleTheta(lambdan,scrA,G4UniformRand());
+        xi = 2.*u;
+        tet=acos(1.-xi);
+        r1=G4UniformRand();
+        xi=-Qn12*log(G4UniformRand());
+        tet=acos(1.-xi);
       }while(tet*r1*r1>sin(tet));
+}
+  }
+  else if(Qn12>0.5)xi=2.*G4UniformRand();
+  else xi=2.*(GSTable->SampleTheta(lambdan,scrA,G4UniformRand()));
   if(xi<0.)xi=0.;
+  if(xi>2.)xi=2.;
+  else if(xi>2.)xi=2.;
   cost=(1. - xi);
   sint=sqrt(xi*(2.-xi));
 …
 void
 G4GoudsmitSaundersonMscModel::CalculateIntegrals(const G4ParticleDefinition* p,G4double Z,
                                                  G4double kinEnergy,G4double &Lam0,
                                                  G4double &Lam1)
+                                                 G4double kinEnergy,G4double &Sig0,
+                                                 G4double &Sig1)
+{
-  G4double summ00=0.0;
-  G4double summ10=0.0;
   G4double x1,x2,y1,y2,acoeff,bcoeff;
   G4double kineticE = kinEnergy;
 …
   if(kineticE>highKEnergy)kineticE=highKEnergy;
   kineticE /= eV;
   G4double logE=log(kineticE);
+  G4double logE=std::log(kineticE);
   G4int  iZ = G4int(Z);
 …
   G4int enerInd=0;
   for(G4int i=1;i<106;i++)
+  for(G4int i=0;i<105;i++)
+  {
   if((logE>=ener[i])&&(logE<ener[i+1])){enerInd=i;break;}
 …
         acoeff=(y2-y1)/(x2*x2-x1*x1);
         bcoeff=y2-acoeff*x2*x2;
         summ00=acoeff*logE*logE+bcoeff;
         summ00 =exp(summ00);
+        Sig0=acoeff*logE*logE+bcoeff;
+        Sig0 =std::exp(Sig0);
         y1=FTCSE[iZ-1][enerInd];
         y2=FTCSE[iZ-1][enerInd+1];
         acoeff=(y2-y1)/(x2*x2-x1*x1);
         bcoeff=y2-acoeff*x2*x2;
         summ10=acoeff*logE*logE+bcoeff;
         summ10 =exp(summ10);
+        Sig1=acoeff*logE*logE+bcoeff;
+        Sig1=std::exp(Sig1);
+      }
     else  //Interpolation of the form y=ax+b
 …
         y1=TCSE[iZ-1][104];
         y2=TCSE[iZ-1][105];
         summ00=(y2-y1)*(logE-x1)/(x2-x1)+y1;
         summ00 =exp(summ00);
+        Sig0=(y2-y1)*(logE-x1)/(x2-x1)+y1;
+        Sig0=std::exp(Sig0);
         y1=FTCSE[iZ-1][104];
         y2=FTCSE[iZ-1][105];
         summ10=(y2-y1)*(logE-x1)/(x2-x1)+y1;
         summ10 =exp(summ10);
+        Sig1=(y2-y1)*(logE-x1)/(x2-x1)+y1;
+        Sig1=std::exp(Sig1);
+      }
+    }
 …
         acoeff=(y2-y1)/(x2*x2-x1*x1);
         bcoeff=y2-acoeff*x2*x2;
         summ00=acoeff*logE*logE+bcoeff;
         summ00 =exp(summ00);
+        Sig0=acoeff*logE*logE+bcoeff;
+        Sig0 =std::exp(Sig0);
         y1=FTCSP[iZ-1][enerInd];
         y2=FTCSP[iZ-1][enerInd+1];
         acoeff=(y2-y1)/(x2*x2-x1*x1);
         bcoeff=y2-acoeff*x2*x2;
         summ10=acoeff*logE*logE+bcoeff;
         summ10 =exp(summ10);
+        Sig1=acoeff*logE*logE+bcoeff;
+        Sig1=std::exp(Sig1);
+      }
     else
 …
         y1=TCSP[iZ-1][104];
         y2=TCSP[iZ-1][105];
         summ00=(y2-y1)*(logE-x1)/(x2-x1)+y1;
         summ00 =exp(summ00);
+        Sig0=(y2-y1)*(logE-x1)/(x2-x1)+y1;
+        Sig0 =std::exp(Sig0);
         y1=FTCSP[iZ-1][104];
         y2=FTCSP[iZ-1][105];
         summ10=(y2-y1)*(logE-x1)/(x2-x1)+y1;
         summ10 =exp(summ10);
+        Sig1=(y2-y1)*(logE-x1)/(x2-x1)+y1;
+        Sig1=std::exp(Sig1);
+      }
+    }
+  summ00 *=barn;
+  summ10 *=barn;
+  Lam0=1./((1.+1./Z)*summ00);
+  Lam1=1./((1.+1./Z)*summ10);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//t->g->t step transformations taken from Ref.6
+  Sig0 *= barn;
+  Sig1 *= barn;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//t->g->t step transformations taken from Ref.6
 G4double
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+// taken from Ref.6
 G4double G4GoudsmitSaundersonMscModel::ComputeGeomPathLength(G4double)
+{
 …
   if(samplez) {
     const G4double  ztmax = 0.99, onethird = 1./3. ;
+    const G4double  ztmax = 0.99;
     G4double zt = zmean/tPathLength ;
 …
       G4double u,cz1;
       if(zt >= onethird) {
+      if(zt >= 0.333333333) {
         G4double cz = 0.5*(3.*zt-1.)/(1.-zt) ;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+// taken from Ref.6
 G4double
 G4GoudsmitSaundersonMscModel::ComputeTrueStepLength(G4double geomStepLength)

trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonTable.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4GoudsmitSaundersonTable.cc,v 1.4 2009/08/28 16:36:52 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GoudsmitSaundersonTable.cc,v 1.7 2010/05/17 15:11:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // Modifications:
 // 04.03.2009 V.Ivanchenko cleanup and format according to Geant4 EM style
+// 26.08.2009 O.Kadri: avoiding unuseful calculations and optimizing the root finding parameter error's
+//                     within SampleTheta method
+//
+// 26.08.2009 O.Kadri: avoiding unuseful calculations and optimizing the root
+//                     finding parameter error's within SampleTheta method
+// 08.02.2010 O.Kadri: reduce delared variables; reduce error of finding root
+//                     in secant method
+// 26.03.2010 O.Kadri: minimum of used arrays in computation within the dichotomie
+//                     finding method the error was the lowest value of uvalues
+// 12.05.2010 O.Kadri: changing of sqrt((b-a)*(b-a)) with fabs(b-a)
+//
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
   //Benedito's procedure
   G4double A[11],ThisPDF[320],ThisCPDF[320];
   G4double PDF1[320],PDF2[320],PDF3[320],PDF4[320],CPDF1[320],CPDF2[320],CPDF3[320],CPDF4[320];
   G4double coeff,Ckj,CkjPlus1,CkPlus1j,CkPlus1jPlus1,aa,b,m,F;
+  G4int Ind0,Ind1,Ind2,Ind3,KIndex=0,JIndex=0,IIndex=0;
+  G4double coeff,Ckj,CkjPlus1,CkPlus1j,CkPlus1jPlus1,a,b,m,F;
+  G4int Ind0,KIndex=0,JIndex=0,IIndex=0;
   ///////////////////////////////////////////////////////////////////////////
 …
   // Calculate Interpolated PDF and CPDF arrays
   Ind0=320*(11*KIndex+JIndex);
-  Ind1=320*(11*KIndex+JIndex+1);
-  Ind2=320*(11*(KIndex+1)+JIndex);
-  Ind3=320*(11*(KIndex+1)+JIndex+1);
   for(G4int i=0 ; i<320 ;i++){
+    PDF1[i]=PDF[Ind0+i];PDF2[i]=PDF[Ind1+i];
+    PDF3[i]=PDF[Ind2+i];PDF4[i]=PDF[Ind3+i];
+    CPDF1[i]=CPDF[Ind0+i];CPDF2[i]=CPDF[Ind1+i];
+    CPDF3[i]=CPDF[Ind2+i];CPDF4[i]=CPDF[Ind3+i];
+    ThisPDF[i]=Ckj*PDF1[i]+CkjPlus1*PDF2[i]+CkPlus1j*PDF3[i]+CkPlus1jPlus1*PDF4[i];
+    ThisCPDF[i]=Ckj*CPDF1[i]+CkjPlus1*CPDF2[i]+CkPlus1j*CPDF3[i]+CkPlus1jPlus1*CPDF4[i];
+    ThisPDF[i]=Ckj*PDF[Ind0]+CkjPlus1*PDF[Ind0+320]+CkPlus1j*PDF[Ind0+3520]+CkPlus1jPlus1*PDF[Ind0+3840];
+    ThisCPDF[i]=Ckj*CPDF[Ind0]+CkjPlus1*CPDF[Ind0+320]+CkPlus1j*CPDF[Ind0+3520]+CkPlus1jPlus1*CPDF[Ind0+3840];
   // Find u Index using secant method
+  if((i!=0)&&((rndm>=ThisCPDF[i-1])&&(rndm<ThisCPDF[i])))  {IIndex=i-1;break;}
+    if((i!=0)&&((rndm>=ThisCPDF[i-1])&&(rndm<ThisCPDF[i])))  {IIndex=i-1;break;}
+    Ind0++;
+  }
   ///////////////////////////////////////////////////////////////////////////
   //CPDF^-1(rndm)=x ==> CPDF(x)=rndm;
   aa=uvalues[IIndex];
+  a=uvalues[IIndex];
   b=uvalues[IIndex+1];
   do{
     m=0.5*(aa+b);
+    m=0.5*(a+b);
     F=(ThisCPDF[IIndex]+(m-uvalues[IIndex])*ThisPDF[IIndex]
        +((m-uvalues[IIndex])*(m-uvalues[IIndex])*(ThisPDF[IIndex+1]-ThisPDF[IIndex]))
        /(2.*(uvalues[IIndex+1]-uvalues[IIndex])))-rndm;
     if(F>0.)b=m;
     else aa=m;
   } while(sqrt((b-aa)*(b-aa))>1.0e-6);
+    else a=m;
+  } while(fabs(b-a)>1.0e-9);
   return m;

trunk/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4MollerBhabhaModel.cc,v 1.35 2009/11/09 19:16:13 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4MollerBhabhaModel.cc,v 1.38 2010/04/06 17:10:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 G4double G4MollerBhabhaModel::MinEnergyCut(const G4ParticleDefinition*,
+                                           const G4MaterialCutsCouple* couple)
+{
+  G4double electronDensity = couple->GetMaterial()->GetElectronDensity();
+  G4double Zeff  = electronDensity/couple->GetMaterial()->GetTotNbOfAtomsPerVolume();
+  return 0.25*sqrt(Zeff)*keV;
+                                           const G4MaterialCutsCouple* /*couple*/)
+{
+  //  G4double electronDensity = couple->GetMaterial()->GetElectronDensity();
+  //G4double Zeff  = electronDensity/couple->GetMaterial()->GetTotNbOfAtomsPerVolume();
+  //return 0.25*sqrt(Zeff)*keV;
+  //return couple->GetMaterial()->GetIonisation()->GetMeanExcitationEnergy();
+  return 0.1*keV;
+}

trunk/source/processes/electromagnetic/standard/src/G4PAIModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4PAIModel.cc,v 1.51 2009/08/12 21:28:50 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PAIModel.cc,v 1.52 2010/06/03 07:28:39 grichine Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // File name:     G4PAIModel.cc
 //
 // Author: Vladimir.Grichine@cern.ch on base of Vladimir Ivanchenko code
+// Author: Vladimir.Grichine@cern.ch on base of Vladimir Ivanchenko model interface
 //
 // Creation date: 05.10.2003
 …
                             const G4DataVector&)
+{
+  G4cout<<"G4PAIModel::Initialise for "<<p->GetParticleName()<<G4endl;
   if(isInitialised) return;
   isInitialised = true;

trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4PAIPhotonModel.cc,v 1.23 2009/07/26 15:51:01 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PAIPhotonModel.cc,v 1.24 2010/06/03 07:28:39 grichine Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
                                    const G4DataVector&)
+{
+  G4cout<<"G4PAIPhotonModel::Initialise for "<<p->GetParticleName()<<G4endl;
   if(isInitialised) return;
   isInitialised = true;

trunk/source/processes/electromagnetic/standard/src/G4PSTARStopping.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4PSTARStopping.cc,v 1.8 2008/11/24 18:28:09 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PSTARStopping.cc,v 1.14 2010/04/26 17:40:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //---------------------------------------------------------------------------
 …
 // Contract:            CSMAN-5288
 //
+// Modifications:
+// Modifications:
+// 25.04.2010 V.Ivanchenko introduce G4LPhysicsFreeVector
+// 26.04.2010 A.Ivanchenko fixed data for G4_PROPANE and G4_Pt,
+//                         checked all data
 //
 //----------------------------------------------------------------------------
 …
 G4PSTARStopping::G4PSTARStopping()
+{
-  currentE = 0.0;
   currentMaterial = 0;
-  index = 0;
   matIndex = -1;
+  name.resize(74,"");
+  sdata.resize(74,0);
   Initialise();
+}
 …
 G4PSTARStopping::~G4PSTARStopping()
+{}
+{
+  for(size_t i=0; i<74; ++i) { delete sdata[i]; }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
   if (mat == currentMaterial) return matIndex;
   G4String matName = mat->GetName();
   for (G4int i=0; i<74; i++){
+  for (G4int i=0; i<74; ++i){
     if (matName == name[i]){
       matIndex = i;
 …
 G4double G4PSTARStopping::GetElectronicDEDX(G4int i, G4double energy)
+{
+  if (matIndex == i && energy == currentE) return res;
+  G4double res = 0.0;
   if (i<0 || i>73){
     G4cout << "### G4PSTARStopping WARNING: index "
            << i << " is out of range!" << G4endl;
-    res = 0.0;
     return res;
+  }
+  matIndex = i;
+  currentE = energy;
+  if (energy < kinE[index] || energy > kinE[index+1]){
+    if (energy <= kinE[0]) {
+      index = 0;
+      res = e[matIndex][0]*std::sqrt(energy/kinE[0]);
+      return res;
+    } else if (energy >= kinE[59]) {
+      index = 58;
+      res = e[matIndex][59];
+      return res;
+    }
+    for (index = 0; index<59; index++){if (energy <= kinE[index+1]) break;}
+  }
+  G4double t1 = kinE[index];
+  G4double t2 = kinE[index+1];
+  G4double e1 = e[matIndex][index];
+  G4double e2 = e[matIndex][index+1];
+  res = e1*std::exp(std::log(energy/t1)*std::log(e2/e1)/std::log(t2/t1));
+  if(energy < emin) { res = (*(sdata[i]))[0]*std::sqrt(energy/emin); }
+  else              { res = sdata[i]->Value(energy); }
   return res;
+}
 …
 void G4PSTARStopping::Initialise()
+{
-  G4int i;
   name [0] = "G4_A-150_TISSUE";
   G4double T0[60] = {
 …
 .085, 0.09,   0.095, 0.1,    0.125, 0.15,  0.175,   0.2, 0.225, 0.25,
 .275, 0.3,    0.35,  0.4,    0.45,  0.5,    0.55,   0.6, 0.65,  0.7,
+.75,  0.8,    0.85,  0.9,    0.95,  1.,     1.25,   1.5, 1.75,  2. };
+.75,  0.8,    0.85,  0.9,    0.95,  1.,     1.25,   1.5, 1.75,  2. };
+  emin = T0[0]*MeV;
   G4double e0[60] = { 176.8, 216.6, 250.1, 279.6, 306.3, 351.1, 390.9, 426.8, 459.8, 489.9, 517.8, 544, 596.4, 641.3, 680.6, 715.7, 747, 775, 800, 822.6, 861.7, 894.2, 920.7, 941.5, 957.3, 968.6, 976.2, 980.5, 982, 981, 978, 973.2, 967, 959.5, 910.4, 853.6, 797.9, 746.9, 701.5, 661.5, 626.4, 595.6, 544.8, 504.4, 471.1, 442.8, 416.4, 392, 369.9, 350, 332.2, 316.4, 302.2, 289.5, 278.1, 267.9, 228.9, 200.8, 179.5, 162.6 };
+  for(i=0; i<60; i++) {e[0][i]=e0[i]*MeV*cm2/g;}
+  for(i=0; i<60; i++) {kinE[i]=T0[i]*MeV;}
+  AddData(T0, e0, 0);
   name [1] = "G4_ACETYLENE";
   G4double e1[60] = { 185.5, 227.2, 262.3, 293.2, 321.2, 364.8, 404, 439.3, 471.6, 500.3, 526.4, 550.6, 600.2, 641.6, 677.4, 709.2, 737.3, 762, 783.7, 803.1, 837.2, 866.8, 891.7, 911.6, 926.6, 937.4, 944.7, 949, 950.8, 950.3, 947.9, 943.9, 938.4, 931.8, 887.1, 833.7, 779.9, 729.5, 686.8, 650.4, 618.5, 590.2, 541.4, 500.4, 465.3, 434.8, 408, 384.6, 364.4, 346.5, 330.5, 316.1, 303.2, 291.3, 280.4, 270.4, 230.7, 202.2, 180.5, 163.5 };
   for(i=0; i<60; i++) {e[1][i]=e1[i]*MeV*cm2/g;}
+  AddData(T0, e1, 1);
   name [2] = "G4_ADIPOSE_TISSUE_ICRP";
   G4double e2[60] = { 195.9, 239.9, 277, 309.7, 339.3, 387.5, 430.6, 469.4, 505, 537.2, 566.9, 594.6, 649.9, 696.7, 737.4, 773.3, 805.2, 833.4, 858.3, 880.5, 918.9, 951, 977.2, 997.6, 1013, 1023, 1030, 1034, 1034, 1033, 1029, 1023, 1016, 1008, 955.6, 895, 835.1, 779.6, 729.7, 685.6, 646.6, 612.3, 555, 509.1, 471.6, 440.3, 413.7, 390.4, 370.1, 352.1, 336, 321.4, 308.3, 296.3, 285.3, 275.2, 234.9, 206, 184, 166.7 };
   for(i=0; i<60; i++) {e[2][i]=e2[i]*MeV*cm2/g;}
+  AddData(T0, e2, 2);
   name [3] = "G4_Ag";
   G4double e3[60] = { 29.73, 36.41, 42.05, 47.01, 51.5, 59.46, 66.48, 72.83, 78.66, 84.09, 89.2, 94.02, 103.7, 112.1, 119.7, 126.6, 132.8, 138.5, 143.7, 148.5, 157.1, 164.3, 170.5, 175.7, 180.1, 183.7, 186.7, 189.1, 191.1, 192.5, 193.6, 194.4, 194.8, 195, 193.4, 189.3, 184.4, 179.2, 174.1, 169.3, 164.8, 160.5, 152.7, 145.7, 139.5, 133.8, 128.6, 123.9, 119.5, 115.4, 111.7, 108.1, 104.8, 101.7, 98.74, 95.98, 84.49, 75.92, 69.3, 64.05 };
   for(i=0; i<60; i++) {e[3][i]=e3[i]*MeV*cm2/g;}
+  AddData(T0, e3, 3);
   name [4] = "G4_AIR";
   G4double e4[60] = { 119.7, 146.7, 169.3, 189.3, 207.4, 239.5, 267.8, 293.3, 316.8, 338.7, 359.2, 378.7, 417, 450.4, 480.1, 506.7, 530.7, 552.6, 572.4, 590.5, 622.1, 648.3, 670, 687.7, 702, 713.2, 721.7, 727.8, 731.9, 734.1, 734.8, 734, 732, 729, 702.9, 667.2, 629.1, 592.2, 558.3, 527.8, 500.6, 476.3, 434.9, 401.2, 373.3, 349.8, 329.7, 312.1, 296.4, 282.4, 269.9, 258.7, 248.5, 239.1, 230.6, 222.7, 191.1, 168.2, 150.8, 137 };
   for(i=0; i<60; i++) {e[4][i]=e4[i]*MeV*cm2/g;}
+  AddData(T0, e4, 4);
   name [5] = "G4_Al";
   G4double e5[60] = { 92.38, 113.1, 130.6, 146.1, 160, 184.8, 206.6, 226.3, 244.4, 261.3, 277.1, 292.1, 320.6, 344.8, 365.7, 383.8, 399.6, 413.2, 425, 435.1, 451, 462, 469.2, 473.4, 475.2, 475.1, 473.7, 471.2, 468, 464.2, 460.1, 455.8, 451.3, 446.8, 424.5, 404.5, 386.7, 371, 356.8, 344, 332.3, 321.5, 301.7, 284.2, 268.6, 254.8, 242.5, 231.4, 221.5, 212.4, 204.2, 196.6, 189.7, 183.3, 177.4, 171.9, 149.4, 132.7, 119.8, 109.4 };
   for(i=0; i<60; i++) {e[5][i]=e5[i]*MeV*cm2/g;}
+  AddData(T0, e5, 5);
   name [6] = "G4_ALUMINUM_OXIDE";
   G4double e6[60] = { 73.51, 90.03, 104, 116.2, 127.3, 147, 164.4, 180.1, 194.5, 207.9, 220.5, 232.5, 256.1, 276.8, 295.3, 311.9, 327, 340.8, 353.4, 364.9, 385.3, 402.5, 417, 429.2, 439.3, 447.6, 454.3, 459.6, 463.7, 466.6, 468.6, 469.8, 470.2, 470, 461.9, 447.2, 430.1, 412.7, 396.5, 381.4, 367.5, 354.5, 331.1, 310.6, 292.6, 276.5, 262.2, 249.4, 238.1, 227.9, 218.7, 210.2, 202.6, 195.7, 189.2, 183.2, 158.9, 140.9, 127, 116 };
   for(i=0; i<60; i++) {e[6][i]=e6[i]*MeV*cm2/g;}
+  AddData(T0, e6, 6);
   name [7] = "G4_Ar";
   G4double e7[60] = { 86.08, 105.4, 121.7, 136.1, 149.1, 172.2, 192.5, 210.9, 227.7, 243.5, 258.2, 272.2, 299.7, 323.5, 344.5, 363.3, 380.2, 395.3, 409, 421.4, 442.5, 459.4, 472.8, 483.1, 490.7, 496, 499.2, 500.7, 500.8, 499.5, 497.2, 494, 490, 485.5, 457.4, 426.7, 397.7, 371.9, 349.5, 330.1, 313.2, 298.5, 274.2, 254.9, 239, 225.6, 214.4, 204.7, 196.1, 188.4, 181.3, 174.9, 168.9, 163.4, 158.2, 153.3, 133, 118.2, 106.8, 97.72 };
   for(i=0; i<60; i++) {e[7][i]=e7[i]*MeV*cm2/g;}
+  AddData(T0, e7, 7);
   name [8] = "G4_Au";
   G4double e8[60] = { 14.76, 18.07, 20.87, 23.33, 25.56, 29.51, 33, 36.15, 39.04, 41.74, 44.27, 46.66, 51.51, 55.8, 59.66, 63.18, 66.43, 69.43, 72.23, 74.84, 79.58, 83.77, 87.5, 90.81, 93.77, 96.4, 98.74, 100.8, 102.6, 104.3, 105.7, 106.9, 108, 108.9, 111.5, 112, 111.2, 109.6, 107.6, 105.4, 103.2, 101, 96.33, 91.8, 87.7, 84.05, 80.83, 78, 75.47, 73.18, 71.11, 69.21, 67.46, 65.83, 64.32, 62.91, 56.98, 52.39, 48.68, 45.58 };
   for(i=0; i<60; i++) {e[8][i]=e8[i]*MeV*cm2/g;}
+  AddData(T0, e8, 8);
   name [9] = "G4_B-100_BONE";
   G4double e9[60] = { 142.5, 174.5, 201.5, 225.2, 246.7, 283.1, 315.3, 344.4, 371.1, 395.5, 418.2, 439.6, 482.3, 519, 551.3, 580.1, 606, 629.2, 650.1, 669, 701.9, 729.5, 752.2, 770.4, 784.5, 795.1, 802.6, 807.4, 810, 810.5, 809.3, 806.6, 802.7, 797.7, 762.5, 719.5, 676.2, 635.8, 599.3, 566.7, 537.9, 512.3, 468.1, 431.4, 400.8, 375, 353, 333.7, 316.9, 301.9, 288.5, 276.3, 265.3, 255.1, 245.9, 237.4, 203.4, 178.9, 160.2, 145.4 };
   for(i=0; i<60; i++) {e[9][i]=e9[i]*MeV*cm2/g;}
+  AddData(T0, e9, 9);
   name [10] = "G4_Be";
   G4double e10[60] = { 149.7, 183.3, 211.7, 236.7, 259.2, 299.3, 334.7, 366.6, 396, 423.3, 449, 473.3, 517.2, 553.4, 583.6, 608.7, 629.6, 646.8, 660.7, 671.9, 687.3, 695.5, 698.4, 697.6, 694.2, 689.1, 682.8, 675.7, 668.2, 660.5, 652.7, 644.9, 637.2, 629.6, 594.2, 563, 535.4, 510.7, 488.4, 468.2, 449.8, 432.8, 404.4, 380.1, 358.1, 337.6, 318.8, 302.2, 287.4, 274.2, 262.3, 251.5, 241.7, 232.7, 224.4, 216.8, 186, 163.6, 146.3, 132.6 };
   for(i=0; i<60; i++) {e[10][i]=e10[i]*MeV*cm2/g;}
+  AddData(T0, e10, 10);
   name [11] = "G4_BONE_COMPACT_ICRU";
   G4double e11[60] = { 141.6, 173.4, 200.2, 223.8, 245.2, 281.3, 313.3, 342.2, 368.8, 393.1, 415.6, 436.8, 479, 515.2, 547, 575.3, 600.7, 623.4, 643.8, 662.1, 694.2, 721, 743.2, 760.9, 774.8, 785.2, 792.6, 797.6, 800.3, 801.1, 800.3, 797.9, 794.4, 789.9, 756.4, 714.5, 671.4, 630.5, 593.2, 559.7, 530, 503.5, 459, 423, 393.3, 368.3, 346.9, 328.1, 311.6, 296.9, 283.7, 271.8, 261, 251.1, 242, 233.7, 200.3, 176.3, 158, 143.5 };
   for(i=0; i<60; i++) {e[11][i]=e11[i]*MeV*cm2/g;}
+  AddData(T0, e11, 11);
   name [12] = "G4_C";
   G4double e12[60] = { 138.4, 169.5, 195.7, 218.8, 239.7, 270.2, 297.8, 322.7, 345.4, 365.1, 382.6, 398.7, 433.5, 462.4, 487.4, 509.9, 530, 547.7, 563.4, 577.6, 603.9, 628.3, 650.1, 668.6, 683.5, 695.3, 704.5, 711.4, 716.3, 719.4, 720.8, 720.9, 719.7, 717.4, 694.5, 661.1, 624.7, 589.1, 556, 526, 499.1, 475, 435.8, 404.4, 377.9, 354.6, 334, 315.9, 300.2, 286.2, 273.7, 262.4, 252.2, 242.7, 234.1, 226.1, 194.2, 171.1, 153.4, 139.4 };
   for(i=0; i<60; i++) {e[12][i]=e12[i]*MeV*cm2/g;}
   name [13] = "G4_GRAPHITE";
+  AddData(T0, e12, 12);
+  name [13] = "G4_GRAPHITE_POROUS";
   G4double e13[60] = { 142.6, 175.3, 203.1, 228, 250.5, 283.4, 313.3, 340.4, 365.1, 386.7, 405.9, 423.5, 462, 494, 521.9, 546.9, 569.3, 589.2, 606.9, 622.9, 652.4, 679.9, 704.5, 725.3, 742.2, 755.6, 766.1, 774, 779.6, 783.1, 784.7, 784.8, 783.4, 780.7, 753.8, 714.5, 671.4, 629.1, 590.2, 555.6, 524.9, 497.7, 453.9, 419.3, 390.3, 365.1, 343, 323.7, 307.1, 292.3, 279.1, 267.3, 256.6, 246.8, 237.8, 229.5, 196.7, 173, 155, 140.8 };
   for(i=0; i<60; i++) {e[13][i]=e13[i]*MeV*cm2/g;}
+  AddData(T0, e13, 13);
   name [14] = "G4_ETHYLENE";
   G4double e14[60] = { 225.8, 276.5, 319.3, 357, 391.1, 445.9, 494.9, 539.1, 579.6, 616, 649.5, 680.6, 742.9, 795.1, 840.1, 879.9, 914.8, 945.5, 972.4, 996.1, 1037, 1071, 1099, 1120, 1135, 1145, 1150, 1152, 1152, 1148, 1142, 1135, 1126, 1115, 1052, 981.5, 912.8, 849.7, 795.6, 749, 708.3, 672.4, 611.7, 562.1, 520.6, 485.3, 454.9, 428.4, 405.5, 385.2, 367.1, 350.8, 336.2, 322.8, 310.5, 299.3, 254.6, 222.7, 198.6, 179.6 };
   for(i=0; i<60; i++) {e[14][i]=e14[i]*MeV*cm2/g;}
+  AddData(T0, e14, 14);
   name [15] = "G4_C-552";
   G4double e15[60] = { 119.2, 146, 168.6, 188.5, 206.5, 235.1, 260.7, 283.8, 305, 323.9, 341.3, 357.4, 390.7, 418.9, 443.7, 465.8, 485.7, 503.6, 519.5, 534.1, 560.1, 583.2, 603.2, 620, 633.7, 644.7, 653.4, 660.1, 665, 668.4, 670.3, 671.1, 670.7, 669.5, 652.9, 626.4, 596.2, 565.7, 537, 510.7, 486.8, 465.1, 427.5, 396.1, 369.6, 347, 327.4, 310.1, 294.9, 281.3, 269, 258, 247.9, 238.6, 230.2, 222.4, 191, 168.2, 150.8, 137 };
   for(i=0; i<60; i++) {e[15][i]=e15[i]*MeV*cm2/g;}
+  AddData(T0, e15, 15);
   name [16] = "G4_CARBON_DIOXIDE";
   G4double e16[60] = { 106.4, 130.3, 150.4, 168.2, 184.2, 212.7, 237.9, 260.6, 281.4, 300.9, 319.1, 336.4, 370.9, 401.2, 428.3, 452.8, 475.1, 495.6, 514.4, 531.8, 562.6, 588.8, 611.2, 630.2, 646.1, 659.3, 670.1, 678.6, 685.2, 690, 693.2, 694.9, 695.4, 694.8, 679, 650.5, 617.3, 583.6, 552.1, 523.6, 497.8, 474.6, 434.7, 401.8, 374.3, 351, 330.9, 313.2, 297.6, 283.7, 271.2, 259.9, 249.6, 240.3, 231.7, 223.7, 191.9, 168.9, 151.4, 137.5 };
   for(i=0; i<60; i++) {e[16][i]=e16[i]*MeV*cm2/g;}
+  AddData(T0, e16, 16);
   name [17] = "G4_CALCIUM_FLUORIDE";
   G4double e17[60] = { 74.48, 91.21, 105.3, 117.8, 129, 149, 166.5, 182.4, 197, 210.6, 223.4, 235.5, 259.6, 280.7, 299.6, 316.6, 332, 346.2, 359.1, 371.1, 392.2, 410.1, 425.2, 438, 448.7, 457.5, 464.6, 470.3, 474.7, 477.9, 480.1, 481.4, 481.9, 481.7, 473, 456.7, 437.6, 417.8, 398.6, 380.6, 364, 348.7, 322.9, 301.7, 283.5, 267.5, 253.4, 240.9, 229.8, 219.9, 210.8, 202.5, 194.8, 187.7, 181.3, 175.5, 151.6, 134.4, 121.1, 110.6 };
   for(i=0; i<60; i++) {e[17][i]=e17[i]*MeV*cm2/g;}
+  AddData(T0, e17, 17);
   name [18] = "G4_CERIC_SULFATE";
   G4double e18[60] = { 135.4, 165.8, 191.5, 214.1, 234.5, 270.8, 302.8, 331.7, 358.2, 383, 406.2, 428.2, 471.7, 509.8, 543.6, 574, 601.5, 626.5, 649.3, 670.1, 706.4, 736.5, 761.2, 781.4, 797.4, 809.8, 819, 825.3, 829.2, 830.8, 830.6, 828.7, 825.4, 820.9, 785.9, 741.4, 696, 653.6, 618.4, 588.8, 562.8, 539.6, 499.3, 464.8, 434.6, 407.9, 384.2, 363.4, 344.9, 328.4, 313.6, 300.3, 288.2, 277.2, 267, 257.7, 220.4, 193.5, 173, 156.9 };
   for(i=0; i<60; i++) {e[18][i]=e18[i]*MeV*cm2/g;}
+  AddData(T0, e18, 18);
   name [19] = "G4_CELLULOSE_NITRATE";
   G4double e19[60] = { 132.2, 161.9, 187, 209, 229, 262.6, 292.5, 319.4, 344.2, 366.8, 387.8, 407.5, 447, 481, 510.8, 537.6, 561.6, 583.2, 602.7, 620.4, 651.5, 677.9, 700, 718.2, 732.7, 744.1, 752.7, 759, 763.2, 765.5, 766.2, 765.5, 763.5, 760.6, 734.4, 698.2, 659.3, 621.4, 586, 553.8, 524.9, 498.9, 452.4, 413.9, 382.9, 358, 337.7, 319.7, 303.9, 289.7, 277.1, 265.6, 255.2, 245.6, 236.9, 228.8, 196.4, 173, 155, 140.8 };
   for(i=0; i<60; i++) {e[19][i]=e19[i]*MeV*cm2/g;}
+  AddData(T0, e19, 19);
   name [20] = "G4_BONE_CORTICAL_ICRP";
   G4double e20[60] = { 123.5, 151.3, 174.7, 195.3, 214, 246.1, 274.5, 300.2, 323.8, 345.6, 365.9, 385, 423, 455.7, 484.7, 510.5, 533.8, 554.8, 573.7, 590.9, 620.8, 645.9, 666.5, 683.3, 696.6, 706.8, 714.4, 719.7, 723, 724.5, 724.5, 723.1, 720.6, 717.1, 689.6, 653.5, 615.8, 579.8, 546.6, 516.7, 490, 466.2, 426.1, 393.6, 366.6, 343.7, 324, 306.7, 291.5, 278, 265.8, 254.7, 244.7, 235.5, 227.1, 219.4, 188.4, 166.1, 149, 135.4 };
   for(i=0; i<60; i++) {e[20][i]=e20[i]*MeV*cm2/g;}
+  AddData(T0, e20, 20);
   name [21] = "G4_CESIUM_IODIDE";
   G4double e21[60] = { 34.67, 42.46, 49.03, 54.82, 60.05, 69.34, 77.52, 84.92, 91.73, 98.06, 104, 109.6, 121, 130.9, 139.9, 148, 155.5, 162.3, 168.6, 174.5, 184.9, 194, 201.8, 208.5, 214.2, 219, 223, 226.3, 228.9, 231, 232.5, 233.4, 234, 234.1, 230.4, 221.9, 211.4, 200.6, 190.1, 180.6, 171.9, 164.1, 151.1, 140.6, 132.1, 125.1, 119.1, 114, 109.6, 105.6, 102.1, 98.92, 95.83, 92.83, 89.95, 87.22, 75.76, 67.41, 61.26, 56.63 };
   for(i=0; i<60; i++) {e[21][i]=e21[i]*MeV*cm2/g;}
+  AddData(T0, e21, 21);
   name [22] = "G4_Cu";
   G4double e22[60] = { 34.9, 42.74, 49.35, 55.18, 60.45, 69.8, 78.04, 85.48, 92.33, 98.71, 104.7, 110.4, 121.4, 130.9, 139.2, 146.6, 153.2, 159, 164.3, 168.9, 176.9, 183.2, 188.4, 192.5, 195.9, 198.7, 201, 202.8, 204.4, 205.6, 206.7, 207.5, 208.2, 208.7, 209.9, 209.2, 207.5, 205.1, 202.3, 199.1, 195.8, 192.3, 185.4, 178.6, 172, 165.8, 159.6, 153.6, 148, 142.7, 137.8, 133.3, 129.1, 125.2, 121.7, 118.3, 104.7, 94.43, 86.45, 79.87 };
   for(i=0; i<60; i++) {e[22][i]=e22[i]*MeV*cm2/g;}
+  AddData(T0, e22, 22);
   name [23] = "G4_Fe";
   G4double e23[60] = { 37.81, 46.31, 53.47, 59.78, 65.49, 75.62, 84.54, 92.61, 100, 106.9, 113.4, 119.6, 132, 143, 153, 162, 170.4, 178.2, 185.4, 192.2, 204.6, 215.6, 225.4, 234.2, 242.1, 249.2, 255.5, 261.2, 266.2, 270.7, 274.6, 278.1, 281, 283.6, 290.9, 291.5, 287.6, 281, 272.8, 263.9, 254.9, 246, 229.5, 214.8, 202.1, 191.1, 181.6, 173.4, 166.2, 159.7, 153.8, 148.5, 143.6, 139.1, 135, 131.1, 115.3, 103.5, 94.02, 86.52 };
   for(i=0; i<60; i++) {e[23][i]=e23[i]*MeV*cm2/g;}
+  AddData(T0, e23, 23);
   name [24] = "G4_FERROUS_SULFATE";
   G4double e24[60] = { 135.1, 165.5, 191.1, 213.6, 234, 270.2, 302.1, 330.9, 357.4, 382.1, 405.3, 427.2, 470.7, 508.7, 542.4, 572.8, 600.3, 625.3, 648, 668.8, 705, 735.1, 759.9, 780.1, 796.1, 808.5, 817.7, 824.1, 827.9, 829.6, 829.4, 827.5, 824.2, 819.7, 784.9, 740.5, 695.1, 652.8, 617.8, 588.4, 562.8, 539.9, 499.9, 465.6, 435.5, 408.8, 385, 364.1, 345.6, 329.1, 314.3, 300.9, 288.8, 277.7, 267.6, 258.3, 220.8, 193.9, 173.4, 157.2 };
   for(i=0; i<60; i++) {e[24][i]=e24[i]*MeV*cm2/g;}
+  AddData(T0, e24, 24);
   name [25] = "G4_Gd";
   G4double e25[60] = { 25.71, 31.49, 36.37, 40.66, 44.54, 51.43, 57.5, 62.99, 68.03, 72.73, 77.14, 81.32, 89.78, 97.24, 104, 110.1, 115.8, 121, 125.8, 130.4, 138.5, 145.7, 152.1, 157.7, 162.6, 166.9, 170.7, 173.9, 176.7, 179, 181, 182.5, 183.8, 184.7, 185.6, 182.1, 176.3, 169.4, 162.2, 155.2, 148.7, 142.6, 132, 123.3, 116.2, 110.2, 105, 100.6, 96.67, 93.2, 90.08, 87.27, 84.72, 82.38, 80.24, 78.26, 70.14, 63.87, 58.87, 54.76 };
   for(i=0; i<60; i++) {e[25][i]=e25[i]*MeV*cm2/g;}
+  AddData(T0, e25, 25);
   name [26] = "G4_Ge";
   G4double e26[60] = { 45.91, 56.23, 64.93, 72.59, 79.52, 91.82, 102.7, 112.5, 121.5, 129.9, 137.7, 145.2, 159.7, 172.3, 183.3, 193.1, 201.7, 209.4, 216.3, 222.3, 232.3, 240, 245.6, 249.6, 252.3, 253.9, 254.5, 254.5, 253.9, 252.9, 251.5, 250, 248.2, 246.4, 236.5, 227.2, 218.9, 211.6, 205.1, 199.3, 193.9, 189, 180.1, 172.3, 165.2, 158.8, 152.6, 146.6, 140.9, 135.7, 130.8, 126.3, 122.1, 118.3, 114.7, 111.3, 97.72, 87.77, 80.18, 74.18 };
   for(i=0; i<60; i++) {e[26][i]=e26[i]*MeV*cm2/g;}
+  AddData(T0, e26, 26);
   name [27] = "G4_Pyrex_Glass";
   G4double e27[60] = { 88.74, 108.7, 125.5, 140.3, 153.7, 177.5, 198.4, 217.4, 234.8, 251, 266.2, 280.6, 308.9, 333.6, 355.6, 375.3, 393.1, 409.2, 423.9, 437.3, 460.8, 480.4, 496.7, 510.2, 521.2, 530.1, 537.1, 542.5, 546.4, 549.1, 550.6, 551.2, 551, 550.1, 537.6, 518.1, 496.1, 473.9, 451.2, 429.2, 408.8, 390.1, 357.9, 331.5, 309.8, 291.7, 276.2, 262.4, 250.1, 239.1, 229.2, 220.2, 212, 204.6, 197.7, 191.4, 165.6, 146.7, 132.1, 120.4 };
   for(i=0; i<60; i++) {e[27][i]=e27[i]*MeV*cm2/g;}
+  AddData(T0, e27, 27);
   name [28] = "G4_H";
   G4double e28[60] = { 746.5, 914.3, 1056, 1180, 1293, 1493, 1669, 1829, 1975, 2112, 2240, 2361, 2586, 2777, 2942, 3084, 3208, 3316, 3409, 3490, 3618, 3710, 3771, 3808, 3823, 3822, 3807, 3781, 3745, 3702, 3654, 3601, 3545, 3487, 3183, 2890, 2629, 2402, 2204, 2031, 1882, 1753, 1544, 1384, 1258, 1159, 1077, 1007, 947, 894.2, 847.5, 805.9, 768.6, 734.9, 704.3, 676.4, 566.7, 489.7, 432.5, 388.1 };
   for(i=0; i<60; i++) {e[28][i]=e28[i]*MeV*cm2/g;}
+  AddData(T0, e28, 28);
   name [29] = "G4_He";
   G4double e29[60] = { 184.2, 225.6, 260.6, 291.3, 319.1, 368.5, 412, 451.3, 487.4, 521.1, 552.7, 582.6, 641.3, 691.9, 736.7, 776.6, 812.5, 844.9, 874.2, 900.8, 946.6, 984.1, 1014, 1039, 1058, 1072, 1083, 1089, 1093, 1094, 1093, 1090, 1085, 1079, 1032, 973, 911.2, 852.1, 797.5, 748.3, 704.5, 665.8, 600.4, 547.7, 504.5, 468.3, 437.7, 411.3, 388.2, 368, 349.9, 333.8, 319.3, 306.2, 294.2, 283.2, 239.6, 208.6, 185.2, 167 };
   for(i=0; i<60; i++) {e[29][i]=e29[i]*MeV*cm2/g;}
+  AddData(T0, e29, 29);
   name [30] = "G4_KAPTON";
   G4double e30[60] = { 145.4, 178.1, 205.6, 229.9, 251.8, 286.2, 317.1, 344.9, 370.4, 393.1, 413.7, 432.9, 472.6, 506.1, 535.2, 561.3, 584.6, 605.3, 623.8, 640.4, 670.2, 696.5, 719.1, 737.7, 752.5, 763.9, 772.5, 778.6, 782.6, 784.6, 784.9, 783.8, 781.4, 778, 749.2, 710.6, 669.6, 630, 593.5, 560.4, 530.8, 504.4, 459.6, 423.3, 393.3, 368.2, 346.8, 328, 311.6, 296.9, 283.8, 272, 261.3, 251.5, 242.4, 234.1, 200.8, 176.8, 158.4, 143.8 };
   for(i=0; i<60; i++) {e[30][i]=e30[i]*MeV*cm2/g;}
+  AddData(T0, e30, 30);
   name [31] = "G4_Kr";
   G4double e31[60] = { 45.92, 56.24, 64.94, 72.6, 79.53, 91.84, 102.7, 112.5, 121.5, 129.9, 137.8, 145.2, 160.1, 173.2, 184.9, 195.5, 205.1, 213.8, 221.8, 229.1, 242, 252.7, 261.6, 268.8, 274.6, 279, 282.3, 284.5, 285.8, 286.2, 286, 285.1, 283.8, 281.9, 268.6, 252.2, 236.2, 221.7, 209, 198.2, 188.9, 180.9, 168.1, 158.1, 150.2, 143.7, 138.1, 133.2, 128.8, 124.8, 121.2, 117.8, 114.6, 111.6, 108.8, 106.1, 94.63, 85.43, 77.91, 71.84 };
   for(i=0; i<60; i++) {e[31][i]=e31[i]*MeV*cm2/g;}
+  AddData(T0, e31, 31);
   name [32] = "G4_LITHIUM_TETRABORATE";
   G4double e32[60] = { 111, 135.9, 157, 175.5, 192.2, 222, 248.2, 271.9, 293.6, 313.9, 333, 351, 386.5, 417.4, 444.8, 469.4, 491.6, 511.7, 530.1, 546.7, 575.8, 599.9, 619.8, 636, 649.1, 659.3, 667.2, 672.9, 676.7, 678.9, 679.6, 679.1, 677.6, 675.1, 653, 622.4, 589.5, 557.3, 525.5, 495.6, 468.4, 444.1, 403.1, 370.6, 344.6, 323.5, 305.9, 290.3, 276.4, 263.9, 252.7, 242.4, 233.2, 224.7, 216.9, 209.6, 180.4, 159.2, 142.8, 129.9 };
   for(i=0; i<60; i++) {e[32][i]=e32[i]*MeV*cm2/g;}
+  AddData(T0, e32, 32);
   name [33] = "G4_LITHIUM_FLUORIDE";
   G4double e33[60] = { 80.87, 99.04, 114.4, 127.9, 140.1, 161.7, 180.8, 198.1, 214, 228.7, 242.6, 255.7, 281.9, 304.9, 325.4, 344, 360.9, 376.5, 390.8, 404, 427.6, 447.8, 465.3, 480.3, 493.1, 504.1, 513.3, 521.1, 527.4, 532.5, 536.5, 539.6, 541.7, 543, 540.3, 527.4, 509.2, 488.8, 467.4, 446.5, 426.9, 408.7, 376.9, 350.4, 328, 309.1, 292.7, 278.1, 265.1, 253.3, 242.5, 232.8, 223.9, 215.6, 208.2, 201.2, 173.1, 152.5, 136.8, 124.4 };
   for(i=0; i<60; i++) {e[33][i]=e33[i]*MeV*cm2/g;}
+  AddData(T0, e33, 33);
   name [34] = "G4_M3_WAX";
   G4double e34[60] = { 198.1, 242.6, 280.2, 313.3, 343.1, 391.9, 435.4, 474.6, 510.6, 543.1, 573, 601, 656.7, 703.7, 744.4, 780.4, 812.2, 840.3, 865, 887, 925, 956.5, 982.1, 1002, 1016, 1026, 1032, 1035, 1036, 1033, 1029, 1023, 1016, 1007, 953.3, 891.9, 831.3, 775.4, 725.1, 680.6, 641.3, 606.6, 546.6, 497.8, 458.8, 427.4, 401.7, 379.2, 359.6, 342.2, 326.7, 312.7, 300.1, 288.5, 277.8, 268.1, 229.1, 201, 179.7, 162.8 };
   for(i=0; i<60; i++) {e[34][i]=e34[i]*MeV*cm2/g;}
+  AddData(T0, e34, 34);
   name [35] = "G4_MS20_TISSUE";
   G4double e35[60] = { 174.4, 213.6, 246.7, 275.8, 302.1, 345, 383.2, 417.7, 449.4, 477.9, 504.3, 528.8, 578.1, 619.8, 656, 688.2, 716.7, 742, 764.4, 784.4, 819.3, 848.7, 872.8, 892, 906.4, 916.8, 923.7, 927.8, 929.4, 928.8, 926.4, 922.3, 916.9, 910.4, 866.6, 814.5, 762, 712.8, 668.3, 628.6, 593.3, 562.1, 507.7, 463.3, 427.6, 398.9, 375.3, 354.7, 336.7, 320.6, 306.2, 293.3, 281.6, 270.9, 261, 252, 215.7, 189.5, 169.6, 153.9 };
   for(i=0; i<60; i++) {e[35][i]=e35[i]*MeV*cm2/g;}
+  AddData(T0, e35, 35);
   name [36] = "G4_METHANE";
   G4double e36[60] = { 272.8, 334.1, 385.8, 431.4, 472.5, 545.6, 610, 668.2, 721.8, 771.6, 818.4, 862.7, 949.2, 1024, 1090, 1148, 1200, 1246, 1288, 1325, 1387, 1436, 1473, 1500, 1518, 1528, 1532, 1530, 1524, 1514, 1501, 1485, 1467, 1447, 1338, 1227, 1127, 1041, 967.3, 904.6, 850.4, 803.2, 724.6, 661.8, 610.5, 567.7, 531.4, 499.8, 472.5, 448.3, 426.7, 407.4, 390, 374.1, 359.6, 346.4, 293.7, 256.2, 227.9, 205.7 };
   for(i=0; i<60; i++) {e[36][i]=e36[i]*MeV*cm2/g;}
+  AddData(T0, e36, 36);
   name [37] = "G4_Mo";
   G4double e37[60] = { 40.18, 49.21, 56.82, 63.53, 69.59, 80.35, 89.84, 98.41, 106.3, 113.6, 120.5, 127, 140.2, 151.7, 162.1, 171.5, 180.1, 188, 195.4, 202.1, 214.3, 224.8, 233.8, 241.6, 248.3, 253.9, 258.7, 262.6, 265.7, 268.2, 270, 271.3, 272.1, 272.4, 268.7, 259.5, 248, 235.8, 224, 213.1, 203.1, 194.1, 178.9, 166.6, 156.5, 148.1, 141, 134.9, 129.5, 124.7, 120.4, 116.4, 112.6, 109.1, 105.8, 102.6, 89.8, 80.34, 73.15, 67.51 };
   for(i=0; i<60; i++) {e[37][i]=e37[i]*MeV*cm2/g;}
+  AddData(T0, e37, 37);
   name [38] = "G4_MUSCLE_WITH_SUCROSE";
   G4double e38[60] = { 149.4, 183, 211.3, 236.2, 258.7, 298.3, 333.3, 364.8, 393.8, 420.8, 446, 469.8, 516.6, 557.2, 593.1, 625.2, 654, 680, 703.5, 724.8, 761.7, 792, 816.7, 836.5, 851.9, 863.6, 871.9, 877.4, 880.4, 881.2, 880.1, 877.3, 873.2, 867.9, 829.5, 781.9, 733.4, 688, 647.9, 612.8, 581.8, 554.2, 507.1, 468.4, 435.9, 408.3, 384.4, 363.5, 344.9, 328.4, 313.7, 300.3, 288.2, 277.2, 267, 257.7, 220.4, 193.5, 173, 156.9 };
   for(i=0; i<60; i++) {e[38][i]=e38[i]*MeV*cm2/g;}
+  AddData(T0, e38, 38);
   name [39] = "G4_MUSCLE_WITHOUT_SUCROSE";
   G4double e39[60] = { 146.6, 179.5, 207.3, 231.8, 253.9, 292.9, 327.3, 358.4, 386.9, 413.5, 438.4, 461.9, 508.2, 548.4, 584, 615.8, 644.5, 670.4, 693.8, 715.1, 752, 782.3, 807.1, 827, 842.5, 854.3, 862.9, 868.5, 871.6, 872.6, 871.6, 869, 865, 859.8, 822, 774.9, 726.9, 682, 643, 609.2, 579.4, 552.9, 507.4, 469.6, 437.7, 410.1, 386.1, 365.1, 346.5, 329.9, 315, 301.6, 289.4, 278.3, 268.2, 258.8, 221.3, 194.3, 173.7, 157.5 };
   for(i=0; i<60; i++) {e[39][i]=e39[i]*MeV*cm2/g;}
+  AddData(T0, e39, 39);
   name [40] = "G4_MUSCLE_SKELETAL_ICRP";
   G4double e40[60] = { 141.3, 173.1, 199.9, 223.5, 244.8, 282.5, 315.8, 345.8, 373.5, 399.2, 423.3, 446.1, 491.1, 530.2, 565, 596.1, 624.2, 649.7, 672.8, 693.8, 730.4, 760.6, 785.3, 805.3, 821.1, 833.1, 841.9, 847.9, 851.4, 852.6, 852, 849.7, 846.1, 841.2, 804.8, 758.9, 712.2, 668.5, 631.2, 599, 570.8, 545.6, 502.2, 465.8, 434.6, 407.5, 383.7, 362.8, 344.4, 327.9, 313.1, 299.8, 287.7, 276.7, 266.6, 257.3, 220, 193.2, 172.8, 156.7 };
   for(i=0; i<60; i++) {e[40][i]=e40[i]*MeV*cm2/g;}
+  AddData(T0, e40, 40);
   name [41] = "G4_MUSCLE_STRIATED_ICRU";
   G4double e41[60] = { 141.7, 173.5, 200.4, 224, 245.4, 283.2, 316.5, 346.6, 374.3, 400, 424.2, 447, 492.1, 531.3, 566.1, 597.3, 625.4, 650.9, 674, 695.1, 731.6, 761.9, 786.7, 806.6, 822.4, 834.4, 843.3, 849.2, 852.6, 853.9, 853.2, 851, 847.3, 842.4, 805.8, 759.8, 713, 669.2, 632, 600.1, 572.1, 547.1, 504, 467.7, 436.5, 409.3, 385.3, 364.3, 345.7, 329.2, 314.4, 300.9, 288.8, 277.8, 267.6, 258.3, 220.8, 193.9, 173.4, 157.2 };
   for(i=0; i<60; i++) {e[41][i]=e41[i]*MeV*cm2/g;}
+  AddData(T0, e41, 41);
   name [42] = "G4_N";
   G4double e42[60] = { 126.5, 155, 179, 200.1, 219.2, 253.1, 283, 310, 334.8, 357.9, 379.6, 400.2, 440.6, 475.8, 507, 535, 560.2, 583.1, 603.8, 622.7, 655.5, 682.7, 704.9, 722.9, 737.3, 748.4, 756.6, 762.3, 765.9, 767.5, 767.5, 766, 763.3, 759.4, 729.3, 689.8, 648.6, 609.1, 572.9, 540.4, 511.6, 486.2, 443.4, 408.8, 380.1, 356, 335.4, 317.2, 301.2, 286.8, 274.1, 262.6, 252.2, 242.7, 234, 225.9, 193.8, 170.5, 152.8, 138.8 };
   for(i=0; i<60; i++) {e[42][i]=e42[i]*MeV*cm2/g;}
+  AddData(T0, e42, 42);
   name [43] = "G4_SODIUM_IODIDE";
   G4double e43[60] = { 41.1, 50.34, 58.12, 64.98, 71.19, 82.2, 91.9, 100.7, 108.7, 116.2, 123.3, 130, 143.4, 155.2, 165.8, 175.4, 184.2, 192.3, 199.7, 206.6, 219, 229.6, 238.9, 246.8, 253.5, 259.2, 264, 268, 271.1, 273.6, 275.4, 276.7, 277.4, 277.7, 273.7, 264.2, 252.3, 239.7, 227.6, 216.2, 205.9, 196.6, 180.7, 167.8, 157.3, 148.5, 141.1, 134.7, 129.1, 124.1, 119.7, 115.7, 111.9, 108.4, 105.1, 101.9, 88.79, 78.99, 71.48, 65.54 };
   for(i=0; i<60; i++) {e[43][i]=e43[i]*MeV*cm2/g;}
+  AddData(T0, e43, 43);
   name [44] = "G4_Ne";
   G4double e44[60] = { 58.01, 71.05, 82.04, 91.73, 100.5, 116, 129.7, 142.1, 153.5, 164.1, 174, 183.5, 202.5, 219.3, 234.5, 248.3, 261, 272.8, 283.8, 294, 312.7, 329.2, 343.8, 356.9, 368.6, 379, 388.3, 396.5, 403.8, 410.2, 415.8, 420.7, 424.8, 428.4, 438.1, 437.9, 431.3, 420.8, 408.2, 394.6, 380.7, 367.1, 339, 313.8, 293.3, 277.2, 264.3, 252.6, 241.9, 232.2, 223.2, 215, 207.4, 200.4, 193.8, 187.7, 163, 144.6, 130.3, 118.9 };
   for(i=0; i<60; i++) {e[44][i]=e44[i]*MeV*cm2/g;}
   name [45] = "G4_NYLON_6/6";
+  AddData(T0, e44, 44);
+  name [45] = "G4_NYLON-6-6";
   G4double e45[60] = { 191, 233.9, 270.1, 302, 330.8, 377.8, 419.7, 457.5, 492.1, 523.4, 552.3, 579.2, 633, 678.5, 717.9, 752.9, 783.8, 811.1, 835.3, 856.8, 894.2, 925.4, 951, 971, 985.8, 996.3, 1003, 1007, 1008, 1006, 1003, 997.7, 991.2, 983.5, 933.5, 875.4, 817.5, 763.6, 715, 671.7, 633.5, 599.6, 542.9, 497.4, 460.4, 429.7, 403.7, 381, 361.2, 343.6, 327.9, 313.8, 301, 289.3, 278.6, 268.8, 229.5, 201.3, 179.8, 162.9 };
   for(i=0; i<60; i++) {e[45][i]=e45[i]*MeV*cm2/g;}
+  AddData(T0, e45, 45);
   name [46] = "G4_O";
   G4double e46[60] = { 99.46, 121.8, 140.7, 157.3, 172.3, 198.9, 222.4, 243.6, 263.1, 281.3, 298.4, 314.5, 346.6, 374.7, 399.8, 422.4, 443, 461.9, 479.1, 495, 523.1, 547, 567.2, 584.4, 598.7, 610.6, 620.2, 628, 633.9, 638.3, 641.3, 643, 643.6, 643.3, 630.5, 606.7, 578.3, 549.1, 520.9, 494.6, 470.9, 449.7, 413.2, 383.1, 357.8, 336.3, 317.6, 301.1, 286.3, 273.2, 261.3, 250.5, 240.8, 231.9, 223.7, 216.1, 185.7, 163.7, 146.7, 133.4 };
   for(i=0; i<60; i++) {e[46][i]=e46[i]*MeV*cm2/g;}
+  AddData(T0, e46, 46);
   name [47] = "G4_PARAFFIN";
   G4double e47[60] = { 228.8, 280.2, 323.5, 361.7, 396.2, 451.9, 501.6, 546.5, 587.6, 624.6, 658.6, 690.2, 753.4, 806.4, 852.1, 892.4, 927.9, 959.1, 986.3, 1010, 1052, 1086, 1114, 1135, 1150, 1160, 1166, 1168, 1166, 1163, 1157, 1149, 1140, 1129, 1064, 992.4, 922.6, 858.6, 801.5, 751.1, 706.8, 667.8, 601.8, 548.9, 506.2, 471.3, 442.2, 416.9, 394.9, 375.4, 358, 342.3, 328.2, 315.3, 303.4, 292.6, 249.3, 218.3, 194.8, 176.3 };
   for(i=0; i<60; i++) {e[47][i]=e47[i]*MeV*cm2/g;}
+  AddData(T0, e47, 47);
   name [48] = "G4_Pb";
   G4double e48[60] = { 15.4, 18.86, 21.78, 24.35, 26.68, 30.81, 34.44, 37.73, 40.75, 43.57, 46.21, 48.71, 53.82, 58.34, 62.45, 66.21, 69.7, 72.94, 75.98, 78.85, 84.11, 88.84, 93.13, 97.02, 100.6, 103.8, 106.8, 109.5, 111.9, 114.1, 116.2, 118, 119.6, 121.1, 126.1, 128.1, 127.9, 126.3, 123.6, 120.4, 116.9, 113.3, 106.4, 99.98, 94.37, 89.5, 85.18, 81.37, 78.01, 75.05, 72.42, 70.08, 67.99, 66.12, 64.44, 62.92, 56.88, 52.22, 48.46, 45.34 };
   for(i=0; i<60; i++) {e[48][i]=e48[i]*MeV*cm2/g;}
+  AddData(T0, e48, 48);
   name [49] = "G4_PHOTO_EMULSION";
   G4double e49[60] = { 61.33, 75.12, 86.74, 96.97, 106.2, 122.2, 136.3, 149.1, 160.8, 171.6, 181.6, 191.1, 210, 226.3, 240.6, 253.5, 265, 275.4, 284.8, 293.3, 308, 320.3, 330.3, 338.4, 344.7, 349.4, 352.8, 355.1, 356.4, 356.9, 356.6, 355.7, 354.3, 352.4, 338.9, 322.3, 305.5, 289.9, 275.7, 263, 251.7, 241.5, 224.4, 210.3, 198.3, 188, 179, 171, 163.9, 157.5, 151.6, 146.3, 141.3, 136.6, 132.1, 128, 110.6, 97.75, 87.92, 80.2 };
   for(i=0; i<60; i++) {e[49][i]=e49[i]*MeV*cm2/g;}
+  AddData(T0, e49, 49);
   name [50] = "G4_PLASTIC_SC_VINYLTOLUENE";
   G4double e50[60] = { 190.1, 232.8, 268.8, 300.5, 329.2, 374.1, 414.4, 450.7, 483.9, 513.5, 540.4, 565.4, 616.5, 659.2, 696, 728.7, 757.6, 783, 805.3, 825.2, 860.1, 890.2, 915.4, 935.4, 950.4, 961.1, 968.2, 972.3, 973.8, 973, 970.2, 965.7, 959.9, 952.8, 906, 850.6, 795.1, 743.3, 696.4, 654.7, 617.9, 585.3, 530.7, 487.1, 451.3, 421.4, 395.9, 373.7, 354.4, 337.2, 321.9, 308.1, 295.7, 284.2, 273.8, 264.1, 225.7, 198.1, 177.1, 160.5 };
   for(i=0; i<60; i++) {e[50][i]=e50[i]*MeV*cm2/g;}
+  AddData(T0, e50, 50);
   name [51] = "G4_POLYCARBONATE";
   G4double e51[60] = { 164.8, 201.8, 233, 260.5, 285.4, 324.6, 359.7, 391.4, 420.3, 446.2, 469.7, 491.7, 536.5, 574.3, 607.1, 636.2, 662.2, 685.1, 705.4, 723.6, 755.9, 783.9, 807.7, 826.9, 841.7, 852.8, 860.8, 866, 868.8, 869.6, 868.6, 866, 862.1, 857.1, 820.5, 774.5, 727.2, 682.2, 641.1, 604.1, 571.2, 542, 492.3, 452.1, 419.1, 391.8, 368.6, 348.4, 330.7, 314.9, 300.8, 288.1, 276.7, 266.1, 256.5, 247.6, 212, 186.3, 166.8, 151.3 };
   for(i=0; i<60; i++) {e[51][i]=e51[i]*MeV*cm2/g;}
+  AddData(T0, e51, 51);
   name [52] = "G4_POLYETHYLENE";
   G4double e52[60] = { 184.9, 226.5, 261.5, 292.4, 320.3, 369.9, 413.5, 453, 489.3, 523, 554.8, 584.8, 643.9, 695.3, 740.8, 781.4, 817.9, 850.9, 880.6, 907.5, 953.7, 990.9, 1021, 1044, 1061, 1073, 1081, 1084, 1085, 1083, 1078, 1072, 1064, 1054, 994.1, 927.8, 865, 808.9, 760.1, 717.9, 681.4, 649.7, 591.2, 541, 499.2, 464.9, 436.3, 411.4, 389.8, 370.6, 353.4, 338.1, 324.2, 311.4, 299.8, 289.1, 246.4, 215.9, 192.7, 174.4 };
   for(i=0; i<60; i++) {e[52][i]=e52[i]*MeV*cm2/g;}
   name [53] = "G4_POLYETHYLENE_TEREPHTHALATE_MYLAR";
+  AddData(T0, e52, 52);
+  name [53] = "G4_MYLAR";
   G4double e53[60] = { 150.9, 184.9, 213.5, 238.7, 261.4, 297.8, 330.2, 359.6, 386.4, 410.5, 432.5, 453, 494.9, 530.3, 561.2, 588.8, 613.4, 635.3, 654.7, 672.3, 703.4, 730.5, 753.5, 772.3, 787, 798.3, 806.6, 812.4, 816, 817.6, 817.4, 815.8, 812.9, 808.9, 777.6, 736.5, 693.4, 651.9, 613.6, 579.1, 548.2, 520.6, 472.9, 434, 402.2, 376.1, 354.3, 335, 318.2, 303.2, 289.8, 277.7, 266.7, 256.6, 247.4, 238.9, 204.8, 180.2, 161.4, 146.5 };
   for(i=0; i<60; i++) {e[53][i]=e53[i]*MeV*cm2/g;}
   name [54] = "G4_PLEXIGLASS";
+  AddData(T0, e53, 53);
+  name [54] = "G4_PLEXIGLASS";  // POLYMETHYL METHACRALATE (LUCITE, PERSPEX, PLEXIGLASS
   G4double e54[60] = { 174.9, 214.2, 247.4, 276.6, 303, 345.9, 384.1, 418.7, 450.4, 479, 505.2, 529.8, 579.1, 620.8, 657.1, 689.3, 717.9, 743.2, 765.7, 785.8, 820.8, 850.5, 875, 894.5, 909.3, 920.1, 927.4, 931.9, 933.9, 933.7, 931.6, 928, 922.9, 916.8, 874.4, 823.2, 771.3, 722.4, 676.2, 634, 596.2, 562.8, 507.2, 463.4, 428.5, 400.2, 376.7, 356.1, 338, 321.9, 307.5, 294.5, 282.8, 272, 262.1, 253, 216.6, 190.4, 170.3, 154.5 };
   for(i=0; i<60; i++) {e[54][i]=e54[i]*MeV*cm2/g;}
+  AddData(T0, e54, 54);
   name [55] = "G4_POLYPROPYLENE";
   G4double e55[60] = { 197.6, 242, 279.4, 312.4, 342.2, 395.1, 441.8, 483.9, 522.7, 558.8, 592.7, 624.8, 687.3, 741.3, 789, 831.4, 869.4, 903.6, 934.3, 962, 1009, 1048, 1078, 1101, 1119, 1132, 1140, 1145, 1146, 1145, 1141, 1135, 1128, 1119, 1060, 991.7, 924.3, 862, 806.1, 756.5, 712.8, 674.2, 605.4, 548.6, 503.3, 467.5, 438.7, 413.6, 391.8, 372.4, 355.2, 339.7, 325.7, 312.9, 301.1, 290.4, 247.5, 216.8, 193.5, 175.1 };
   for(i=0; i<60; i++) {e[55][i]=e55[i]*MeV*cm2/g;}
+  AddData(T0, e55, 55);
   name [56] = "G4_POLYSTYRENE";
   G4double e56[60] = { 186, 227.8, 263.1, 294.1, 322.2, 372.1, 416, 455.7, 492.2, 526.2, 558.1, 588.3, 645.3, 693.8, 735.8, 772.4, 804.5, 832.6, 857.2, 878.7, 913.5, 939.2, 957.2, 969, 975.6, 978, 976.8, 972.8, 966.5, 958.4, 948.9, 938.3, 926.9, 914.9, 851.3, 789.6, 734.2, 685.4, 642.9, 605.7, 573, 543.9, 499.5, 465.2, 435.8, 409.1, 384.6, 363.2, 344.6, 328.1, 313.3, 300, 288, 277, 266.8, 257.5, 220.4, 193.6, 173.2, 157 };
   for(i=0; i<60; i++) {e[56][i]=e56[i]*MeV*cm2/g;}
+  AddData(T0, e56, 56);
   name [57] = "G4_TEFLON";
   G4double e57[60] = { 83.27, 102, 117.8, 131.7, 144.2, 165, 183.4, 200.1, 215.3, 229.2, 242, 254, 278.7, 300, 319, 336.2, 351.9, 366.1, 379.2, 391.2, 413.1, 432.7, 450, 465.1, 478, 489.1, 498.5, 506.4, 513, 518.4, 522.7, 526, 528.4, 530.1, 528.6, 516.7, 499.4, 479.6, 460.4, 442.3, 425.4, 409.6, 381.2, 356.4, 334.6, 315.4, 298.3, 283.1, 269.6, 257.4, 246.5, 236.5, 227.4, 219.1, 211.5, 204.4, 175.9, 155.2, 139.3, 126.7 };
   for(i=0; i<60; i++) {e[57][i]=e57[i]*MeV*cm2/g;}
+  AddData(T0, e57, 57);
   name [58] = "G4_POLYVINYL_CHLORIDE";
   G4double e58[60] = { 140.2, 171.7, 198.3, 221.7, 242.8, 277.9, 309, 337.2, 363, 386.4, 408.1, 428.4, 468.9, 503.4, 533.6, 560.3, 584.1, 605.3, 624.1, 640.9, 670.1, 694.5, 714.3, 729.8, 741.4, 749.6, 755, 757.9, 758.6, 757.6, 755, 751, 746, 740, 701.3, 656.7, 612.9, 572.6, 538.7, 509.8, 484.7, 462.4, 424.2, 392.4, 365.3, 341.8, 321.1, 302.9, 287.3, 273.6, 261.3, 250.1, 240.1, 231.1, 222.7, 215, 184.5, 162.6, 145.9, 132.6 };
   for(i=0; i<60; i++) {e[58][i]=e58[i]*MeV*cm2/g;}
+  AddData(T0, e58, 58);
   name [59] = "G4_PROPANE";
   G4double e59[60] = { 194.5, 234.7, 268.4, 298, 324.7, 372, 413.6, 451.2, 485.8, 518, 548.2, 576.8, 642.6, 702.2, 756.9, 808, 855.9, 901.2, 944.4, 985.6, 1063, 1135, 1203, 1267, 1327, 1385, 1440, 1492, 1543, 1592, 1639, 1684, 1728, 1770, 1964, 2131, 2277, 2404, 2516, 2613, 2698, 2771, 2887, 2969, 3022, 3053, 3065, 3061, 3046, 3021, 2990, 2953, 2912, 2868, 2822, 2775, 2564, 2372, 2191, 2022 };
   for(i=0; i<60; i++) {e[59][i]=e59[i]*MeV*cm2/g;}
+  G4double e59[60] = { 2.183E+02, 2.673E+02, 3.087E+02, 3.451E+02, 3.780E+02, 4.365E+02, 4.880E+02, 5.346E+02, 5.775E+02, 6.173E+02, 6.548E+02, 6.902E+02, 7.595E+02, 8.190E+02, 8.714E+02, 9.180E+02, 9.597E+02, 9.970E+02, 1.031E+03, 1.061E+03, 1.112E+03, 1.153E+03, 1.186E+03, 1.211E+03, 1.229E+03, 1.242E+03, 1.250E+03, 1.254E+03, 1.254E+03, 1.252E+03, 1.247E+03, 1.239E+03, 1.230E+03, 1.220E+03, 1.153E+03, 1.078E+03, 1.005E+03, 9.379E+02, 8.769E+02, 8.222E+02, 7.736E+02, 7.305E+02, 6.583E+02, 6.006E+02, 5.537E+02, 5.150E+02, 4.825E+02, 4.542E+02, 4.297E+02, 4.079E+02, 3.886E+02, 3.712E+02, 3.556E+02, 3.413E+02, 3.282E+02, 3.163E+02, 2.687E+02, 2.348E+02, 2.092E+02, 1.890E+02 };
+  AddData(T0, e59, 59);
   name [60] = "G4_Pt";
   G4double e60[60] = { 30.79, 33.73, 36.43, 38.95, 41.31, 43.55, 48.11, 52.16, 55.83, 59.2, 62.32, 65.23, 67.95, 70.51, 75.22, 79.46, 83.3, 86.79, 89.97, 92.87, 95.51, 97.92, 100.1, 102.1, 103.9, 105.5, 107, 108.3, 112.7, 114.5, 114.4, 113, 110.8, 108.1, 105.3, 102.4, 96.92, 92.12, 87.91, 84.22, 80.97, 78.11, 75.56, 73.26, 71.17, 69.26, 67.5, 65.87, 64.36, 62.94, 57, 52.39, 48.67, 45.57, 42.94, 40.66, 38.67, 36.9, 33.91, 31.45 };
   for(i=0; i<60; i++) {e[60][i]=e60[i]*MeV*cm2/g;}
+  G4double e60[60] =  { 1.377E+01, 1.687E+01, 1.947E+01, 2.177E+01, 2.385E+01, 2.754E+01, 3.079E+01, 3.373E+01, 3.643E+01, 3.895E+01, 4.131E+01, 4.355E+01, 4.811E+01, 5.216E+01, 5.583E+01, 5.920E+01, 6.232E+01, 6.523E+01, 6.795E+01, 7.051E+01, 7.522E+01, 7.946E+01, 8.330E+01, 8.679E+01, 8.997E+01, 9.287E+01, 9.551E+01, 9.792E+01, 1.001E+02, 1.021E+02, 1.039E+02, 1.055E+02, 1.070E+02, 1.083E+02, 1.127E+02, 1.145E+02, 1.144E+02, 1.130E+02, 1.108E+02, 1.081E+02, 1.053E+02, 1.024E+02, 9.692E+01, 9.212E+01, 8.791E+01, 8.422E+01, 8.097E+01, 7.811E+01, 7.556E+01, 7.326E+01, 7.117E+01, 6.926E+01, 6.750E+01, 6.587E+01, 6.436E+01, 6.294E+01, 5.700E+01, 5.239E+01, 4.867E+01, 4.557E+01 };
+  AddData(T0, e60, 60);
   name [61] = "G4_Si";
   G4double e61[60] = { 105, 128.6, 148.5, 166, 181.8, 210, 234.8, 257.2, 277.8, 296.9, 315, 332, 364.6, 392.5, 416.7, 437.8, 456.3, 472.5, 486.6, 498.9, 518.4, 532.3, 541.6, 547, 549.2, 549, 546.8, 543, 538, 532.2, 525.7, 518.8, 511.7, 504.4, 468.7, 437.3, 410.7, 388.4, 369.4, 353, 338.7, 325.9, 304.1, 285.9, 270.3, 256.7, 245.2, 235.1, 225.9, 217.2, 209, 201.1, 193.6, 187, 180.9, 175.3, 152.3, 135.4, 122.2, 111.7 };
   for(i=0; i<60; i++) {e[61][i]=e61[i]*MeV*cm2/g;}
+  AddData(T0, e61, 61);
   name [62] = "G4_SILICON_DIOXIDE";
   G4double e62[60] = { 85.64, 104.9, 121.1, 135.4, 148.3, 171.3, 191.5, 209.8, 226.6, 242.2, 256.9, 270.8, 298.1, 322, 343.1, 362.1, 379.3, 394.9, 409.1, 422.1, 444.8, 463.8, 479.7, 492.8, 503.6, 512.3, 519.2, 524.5, 528.5, 531.2, 532.9, 533.7, 533.6, 532.9, 521.9, 503.9, 483.5, 462.8, 442.9, 424.2, 406.7, 390.6, 358.9, 330.8, 307.6, 288.9, 273.6, 259.9, 247.8, 236.9, 227.1, 218.2, 210.1, 202.7, 195.9, 189.7, 164.2, 145.5, 131.1, 119.6 };
   for(i=0; i<60; i++) {e[62][i]=e62[i]*MeV*cm2/g;}
+  AddData(T0, e62, 62);
   name [63] = "G4_STILBENE";
   G4double e63[60] = { 179.2, 219.5, 253.4, 283.3, 310.4, 352.2, 389.8, 423.8, 454.7, 482.3, 507.2, 530.3, 577.9, 617.7, 652.1, 682.6, 709.7, 733.5, 754.4, 773, 806.1, 835.1, 859.5, 879.2, 894.2, 905.1, 912.7, 917.4, 919.6, 919.6, 917.7, 914.2, 909.3, 903.3, 861.4, 810.7, 759.2, 710.8, 667.1, 628.3, 593.9, 563.4, 511.8, 470.2, 435.9, 407.2, 382.8, 361.4, 342.9, 326.4, 311.6, 298.4, 286.4, 275.4, 265.3, 256.1, 219, 192.4, 172.1, 156.1 };
   for(i=0; i<60; i++) {e[63][i]=e63[i]*MeV*cm2/g;}
+  AddData(T0, e63, 63);
   name [64] = "G4_Ti";
   G4double e64[60] = { 60.88, 74.56, 86.1, 96.26, 105.4, 121.8, 136.1, 149.1, 161.1, 172.2, 182.6, 192.5, 212.3, 229.6, 245.1, 259.1, 271.8, 283.5, 294.2, 304.1, 321.6, 336.5, 349.1, 359.8, 368.7, 376, 382, 386.7, 390.2, 392.7, 394.4, 395.2, 395.3, 394.8, 385.4, 369.3, 351, 332.6, 315.4, 299.6, 285.5, 272.8, 251.3, 233.9, 219.6, 207.6, 197.4, 188.7, 181, 174.1, 167.9, 162.2, 157, 152.2, 147.7, 143.5, 126, 112.5, 101.7, 93.07 };
   for(i=0; i<60; i++) {e[64][i]=e64[i]*MeV*cm2/g;}
+  AddData(T0, e64, 64);
   name [65] = "G4_Sn";
   G4double e65[60] = { 32.4, 39.68, 45.82, 51.23, 56.12, 64.8, 72.45, 79.36, 85.72, 91.64, 97.2, 102.5, 113.1, 122.4, 130.8, 138.5, 145.5, 151.9, 157.9, 163.4, 173.4, 182, 189.5, 196, 201.6, 206.4, 210.4, 213.8, 216.5, 218.7, 220.4, 221.6, 222.4, 222.9, 220.7, 213.8, 204.9, 195.4, 186, 177.3, 169.4, 162.3, 150.1, 140.3, 132.2, 125.5, 119.7, 114.7, 110.1, 106.1, 102.5, 99.14, 96.12, 93.34, 90.77, 88.4, 78.69, 71.47, 65.7, 60.79 };
   for(i=0; i<60; i++) {e[65][i]=e65[i]*MeV*cm2/g;}
+  AddData(T0, e65, 65);
   name [66] = "G4_TISSUE-METHANE";
   G4double e66[60] = { 174.5, 213.8, 246.8, 276, 302.3, 349.1, 390.3, 427.6, 461.8, 493.7, 523.6, 552, 607.8, 656.2, 699.1, 737.4, 771.9, 803, 831.1, 856.5, 900.2, 935.6, 963.8, 985.9, 1003, 1015, 1022, 1027, 1028, 1027, 1023, 1018, 1011, 1002, 947.8, 885.5, 824.9, 769.7, 720.9, 678.2, 641, 608.6, 553.2, 507.9, 470.5, 439.1, 412.4, 389, 368.6, 350.5, 334.4, 319.8, 306.6, 294.6, 283.6, 273.5, 233.2, 204.4, 182.5, 165.2 };
   for(i=0; i<60; i++) {e[66][i]=e66[i]*MeV*cm2/g;}
+  AddData(T0, e66, 66);
   name [67] = "G4_TISSUE-PROPANE";
   G4double e67[60] = { 169.9, 208.1, 240.3, 268.6, 294.3, 339.8, 379.9, 416.2, 449.5, 480.6, 509.7, 537.3, 591.5, 638.4, 679.9, 716.9, 750.2, 780.2, 807.4, 832, 874.4, 909.1, 937.1, 959.3, 976.6, 989.5, 998.7, 1005, 1008, 1008, 1006, 1003, 998, 991.7, 946.9, 891.9, 836, 783.4, 735.7, 693.2, 655.4, 622, 563.5, 515.3, 475.8, 443.4, 416.2, 392.6, 371.9, 353.6, 337.3, 322.5, 309.3, 297.1, 286, 275.8, 235.1, 206, 183.9, 166.5 };
   for(i=0; i<60; i++) {e[67][i]=e67[i]*MeV*cm2/g;}
+  AddData(T0, e67, 67);
   name [68] = "G4_TOLUENE";
   G4double e68[60] = { 191.6, 234.7, 271, 302.9, 331.9, 377.2, 417.8, 454.5, 488, 517.9, 545.1, 570.4, 621.9, 665, 702.2, 735.2, 764.3, 790, 812.4, 832.5, 867.7, 897.9, 923.2, 943.3, 958.3, 969, 976, 980, 981.4, 980.4, 977.5, 972.9, 966.9, 959.8, 912.2, 856.2, 800.1, 747.8, 700.6, 658.5, 621.4, 588.5, 535.1, 492.8, 457.8, 427.9, 401.8, 379.1, 359.4, 341.9, 326.3, 312.3, 299.6, 287.9, 277.3, 267.5, 228.5, 200.4, 179.1, 162.3 };
   for(i=0; i<60; i++) {e[68][i]=e68[i]*MeV*cm2/g;}
+  AddData(T0, e68, 68);
   name [69] = "G4_U";
   G4double e69[60] = { 18.38, 22.51, 25.99, 29.06, 31.83, 36.75, 41.09, 45.01, 48.62, 51.98, 55.13, 58.11, 64.19, 69.57, 74.44, 78.9, 83.02, 86.84, 90.42, 93.78, 99.92, 105.4, 110.3, 114.8, 118.8, 122.4, 125.7, 128.6, 131.2, 133.5, 135.6, 137.4, 139, 140.4, 144.4, 144.8, 142.7, 139.1, 134.5, 129.6, 124.2, 118.8, 108.7, 100, 92.78, 86.72, 81.64, 77.35, 73.71, 70.6, 67.92, 65.59, 63.56, 61.77, 60.19, 58.78, 53.33, 49.08, 45.62, 42.73 };
   for(i=0; i<60; i++) {e[69][i]=e69[i]*MeV*cm2/g;}
+  AddData(T0, e69, 69);
   name [70] = "G4_W";
   G4double e70[60] = { 14.97, 18.34, 21.17, 23.67, 25.93, 29.94, 33.47, 36.67, 39.61, 42.34, 44.91, 47.34, 52.3, 56.7, 60.68, 64.33, 67.7, 70.84, 73.78, 76.55, 81.61, 86.15, 90.24, 93.95, 97.3, 100.3, 103.1, 105.6, 107.8, 109.9, 111.7, 113.3, 114.7, 116, 120, 121.2, 120.5, 118.5, 115.9, 112.9, 109.8, 106.7, 100.2, 94.14, 89.08, 85, 81.68, 78.78, 76.2, 73.88, 71.78, 69.86, 68.09, 66.45, 64.93, 63.5, 57.52, 52.9, 49.15, 46.04 };
   for(i=0; i<60; i++) {e[70][i]=e70[i]*MeV*cm2/g;}
+  AddData(T0, e70, 70);
   name [71] = "G4_WATER";
   G4double e71[60] = { 133.7, 163.8, 189.1, 211.4, 231.6, 267.5, 299, 327.6, 353.8, 378.2, 401.2, 422.9, 466, 503.6, 537.2, 567.3, 594.6, 619.5, 642.1, 662.8, 698.9, 729, 753.8, 774, 790.1, 802.6, 811.9, 818.3, 822.3, 824.1, 823.9, 822.2, 819, 814.5, 780.1, 736, 695.9, 660.4, 628.6, 599.9, 573.7, 549.7, 507.5, 471.4, 440.1, 412.8, 388.8, 367.6, 348.9, 332.2, 317.2, 303.7, 291.4, 280.3, 270, 260.6, 222.8, 195.5, 174.8, 158.5 };
   for(i=0; i<60; i++) {e[71][i]=e71[i]*MeV*cm2/g;}
+  AddData(T0, e71, 71);
   name [72] = "G4_WATER_VAPOR";
   G4double e72[60] = { 152.2, 186.5, 215.3, 240.7, 263.7, 304.5, 340.4, 372.9, 402.8, 430.6, 456.7, 481.4, 530.5, 573.2, 611.3, 645.4, 676.4, 704.4, 730, 753.3, 793.8, 827.4, 855, 877.2, 894.8, 908.2, 918.1, 924.7, 928.5, 929.9, 929.1, 926.5, 922.3, 916.9, 876.3, 825.9, 775.3, 728.5, 686.8, 650.1, 618, 589.9, 536.1, 489.2, 450.8, 420.2, 395.5, 373.8, 354.6, 337.5, 322.2, 308.3, 295.8, 284.4, 273.9, 264.3, 225.7, 198, 176.9, 160.4 };
   for(i=0; i<60; i++) {e[72][i]=e72[i]*MeV*cm2/g;}
+  AddData(T0, e72, 72);
   name [73] = "G4_Xe";
   G4double e73[60] = { 38.1, 46.67, 53.88, 60.24, 65.99, 76.2, 85.2, 93.33, 100.8, 107.8, 114.3, 120.5, 132.8, 143.6, 153.2, 161.8, 169.6, 176.7, 183.2, 189.1, 199.4, 208, 215, 220.7, 225.2, 228.7, 231.2, 232.9, 233.9, 234.3, 234.1, 233.5, 232.5, 231.1, 221.3, 209.3, 197.4, 186.5, 177, 168.6, 161.3, 155, 144.4, 135.9, 128.8, 122.8, 117.5, 112.7, 108.4, 104.5, 101, 97.75, 94.8, 92.09, 89.6, 87.29, 77.8, 70.52, 64.84, 60.13 };
   for(i=0; i<60; i++) {e[73][i]=e73[i]*MeV*cm2/g;}
+  AddData(T0, e73, 73);
+}
+void G4PSTARStopping::AddData(G4double* ekin, G4double* s, G4int idx)
+{
+  sdata[idx] = new G4LPhysicsFreeVector(60, ekin[0]*MeV, ekin[59]*MeV);
+  const G4double fac = MeV*cm2/g;
+  for(size_t i=0; i<60; ++i) { sdata[idx]->PutValues(i, ekin[i]*MeV, s[i]*fac); }
+  sdata[idx]->SetSpline(true);
+}

trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel93.cc

-                      r1228
+                      r1315
 //
+//
 // ********************************************************************
 // * License and Disclaimer                                           *
 …
 //
 //
 // $Id: G4UrbanMscModel93.cc,v 1.1 2009/11/01 13:05:01 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UrbanMscModel93.cc,v 1.4 2010/05/20 13:17:25 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 //
+//
 // GEANT4 Class file
 //
+//
 //
 // File name:   G4UrbanMscModel93
 …
   presafety = sp->GetSafety();
   //G4cout << "G4Urban2::StepLimit tPathLength= "
   //     <<tPathLength<<" safety= " << presafety
   //       << " range= " <<currentRange<< " lambda= "<<lambda0
   //     << " Alg: " << steppingAlgorithm <<G4endl;
+ // G4cout << "G4Urban2::StepLimit tPathLength= "
+ //      <<tPathLength<<" safety= " << presafety
+ //        << " range= " <<currentRange<< " lambda= "<<lambda0
+ //      << " Alg: " << steppingAlgorithm <<G4endl;
   // far from geometry boundary
 …
       if(tlimit < stepmin) tlimit = stepmin;
+      if(tPathLength > tlimit) tPathLength = tlimit  ;
+      // randomize 1st step or 1st 'normal' step in volume
+      if((stepStatus == fUndefined) ||
+         ((smallstep == skin) && !insideskin))
+        {
+          G4double temptlimit = tlimit;
+          if(temptlimit > tlimitmin)
+          {
+            do {
+              temptlimit = G4RandGauss::shoot(tlimit,0.3*tlimit);
+               } while ((temptlimit < tlimitmin) ||
+                        (temptlimit > 2.*tlimit-tlimitmin));
+          }
+          else
+            temptlimit = tlimitmin;
+          if(tPathLength > temptlimit) tPathLength = temptlimit;
+        }
+      else
+        {
+          if(tPathLength > tlimit) tPathLength = tlimit  ;
+        }
+    }
 …
       //lower limit for tlimit
       if(tlimit < tlimitmin) tlimit = tlimitmin;
       if(tPathLength > tlimit) tPathLength = tlimit;
+    }
 …
 G4double G4UrbanMscModel93::SampleDisplacement()
+{
+  // compute rmean = sqrt(<r**2>) from theory
   const G4double kappa = 2.5;
   const G4double kappapl1 = kappa+1.;
   const G4double kappami1 = kappa-1.;
+  // Compute rmean = sqrt(<r**2>) from theory
   G4double rmean = 0.0;
   if ((currentTau >= tausmall) && !insideskin) {
 …
+  }
+  if(rmean == 0.) return rmean;
   // protection against z > t ...........................
+  if(rmean > 0.) {
+    G4double zt = (tPathLength-zPathLength)*(tPathLength+zPathLength);
+    if(zt <= 0.)
+      rmean = 0.;
+    else if(rmean*rmean > zt)
+      rmean = sqrt(zt);
+  }
+  G4double rmax = (tPathLength-zPathLength)*(tPathLength+zPathLength);
+    if(rmax <= 0.)
+      rmax = 0.;
+    else
+      rmax = sqrt(rmax);
+  if(rmean >= rmax) return rmax;
   return rmean;
+  // VI comment out for the time being
+  /*
+  //sample r (Gaussian distribution with a mean of rmean )
+  G4double r = 0.;
+  G4double sigma = min(rmean,rmax-rmean);
+  sigma /= 3.;
+  G4double rlow  = rmean-3.*sigma;
+  G4double rhigh = rmean+3.*sigma;
+  do {
+      r = G4RandGauss::shoot(rmean,sigma);
+     } while ((r < rlow) || (r > rhigh));
+  return r;
+  */
+}

trunk/source/processes/electromagnetic/standard/src/G4WaterStopping.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4WaterStopping.cc,v 1.18 2009/06/19 10:39:48 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4WaterStopping.cc,v 1.21 2010/04/26 17:44:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //---------------------------------------------------------------------------
 …
+{
   spline = splineFlag;
+  dedx.reserve(17);
   Initialise(corr);
+}
 …
+{
   G4double res = 0.0;
+  if((iz > 26) || (iz < 3) || (iz > 18 && iz < 26)) return res;
+  G4bool b;
+  if((iz > 26) || (iz < 3) || (iz > 18 && iz < 26)) { return res; }
   G4int idx = iz - 3;
   G4double scaledEnergy = energy/A[idx];
-  G4double emin = 0.025*MeV;
   if(scaledEnergy < emin) {
     res = (dedx[idx])->GetValue(emin, b)*std::sqrt(scaledEnergy/emin);
+    res = (*(dedx[idx]))[0]*std::sqrt(scaledEnergy/emin);
   } else {
     res = (dedx[idx])->GetValue(scaledEnergy, b);
+    res = (dedx[idx])->Value(scaledEnergy);
+  }
   return res;
 …
                               G4double factor)
+{
   G4LPhysicsFreeVector* pv = new G4LPhysicsFreeVector(53,energy[0],energy[52]);
+  G4LPhysicsFreeVector* pv = new G4LPhysicsFreeVector(53,energy[0]*MeV,energy[52]*MeV);
   pv->SetSpline(spline);
   dedx.push_back(pv);
   for(G4int i=0;i<53;i++) {
     pv->PutValues(i,energy[i],stoppower[i]*factor);
+  for(G4int i=0; i<53; ++i) {
+    pv->PutValues(i,energy[i]*MeV,stoppower[i]*factor);
+  }
+}
 …
   G4int zz[17] = {3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,26};
   G4int aa[17] = {7, 9, 11, 12, 14, 16, 19, 20, 23, 24, 27, 28,31,32, 35,40,56};
+  // G4double A_Ion[17] = {6.941,9.0122,10.811,12.011,14.007,15.999,18.998,20.180,22.990,24.305,26.982,28.086,30.974,32.065,35.453,39.948,55.845};
+  for(i=0; i<17; i++) {
+  for(i=0; i<17; ++i) {
     Z[i] = zz[i];
     A[i] = G4double(aa[i]);
 …
   //..Reduced energies
   G4double E[53] = {0.025,0.03,0.04,0.05,0.06,0.07,0.08,0.09,0.1,0.15,0.2,0.25,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1,1.5,2,2.5,3,4,5,6,7,8,9,10,15,20,25,30,40,50,60,70,80,90,100,150,200,250,300,400,500,600,700,800,900,1000};
+  for(i=0; i<53; i++) {E[i] *= MeV;}
+  emin   = E[0]*MeV;
   G4double factor = 1000.*MeV/cm;
 …
   if(corr) {
     for(i=0; i<17; i++) {corr->AddStoppingData(Z[i], aa[i], "G4_WATER", dedx[i]);}
+    for(i=0; i<17; ++i) {corr->AddStoppingData(Z[i], aa[i], "G4_WATER", dedx[i]);}
+  }
+}

trunk/source/processes/electromagnetic/standard/src/G4WentzelVIModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4WentzelVIModel.cc,v 1.37 2009/10/28 10:14:13 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4WentzelVIModel.cc,v 1.60 2010/06/01 11:13:31 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 //
 // Modifications:
+// 27-05-2010 V.Ivanchenko added G4WentzelOKandVIxSection class to
+//              compute cross sections and sample scattering angle
 //
 //
 …
 #include "G4WentzelVIModel.hh"
 #include "Randomize.hh"
-#include "G4LossTableManager.hh"
 #include "G4ParticleChangeForMSC.hh"
 #include "G4PhysicsTableHelper.hh"
 #include "G4ElementVector.hh"
 #include "G4ProductionCutsTable.hh"
+#include "G4PhysicsLogVector.hh"
+#include "G4Electron.hh"
+#include "G4Positron.hh"
+#include "G4Proton.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4WentzelVIModel::ScreenRSquare[] = {0.0};
+G4double G4WentzelVIModel::FormFactor[]    = {0.0};
+#include "G4LossTableManager.hh"
+#include "G4Pow.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 using namespace std;
 …
   G4VMscModel(nam),
   theLambdaTable(0),
+  theLambda2Table(0),
+  numlimit(0.2),
+  nbins(60),
+  nwarnings(0),
+  nwarnlimit(50),
+  numlimit(0.1),
   currentCouple(0),
   cosThetaMin(1.0),
-  q2Limit(TeV*TeV),
-  alpha2(fine_structure_const*fine_structure_const),
   isInitialized(false),
   inside(false)
 …
   invsqrt12 = 1./sqrt(12.);
   tlimitminfix = 1.e-6*mm;
+  theManager = G4LossTableManager::Instance();
+  fNistManager = G4NistManager::Instance();
+  theElectron = G4Electron::Electron();
+  thePositron = G4Positron::Positron();
+  theProton   = G4Proton::Proton();
+  lowEnergyLimit = 0.1*keV;
+  G4double p0 = electron_mass_c2*classic_electr_radius;
+  coeff  = twopi*p0*p0;
+  tkin = targetZ = mom2 = DBL_MIN;
+  ecut = etag = DBL_MAX;
+  lowEnergyLimit = 1.0*eV;
   particle = 0;
   nelments = 5;
   xsecn.resize(nelments);
   prob.resize(nelments);
+  // Thomas-Fermi screening radii
+  // Formfactors from A.V. Butkevich et al., NIM A 488 (2002) 282
+  if(0.0 == ScreenRSquare[0]) {
+    G4double a0 = electron_mass_c2/0.88534;
+    G4double constn = 6.937e-6/(MeV*MeV);
+    ScreenRSquare[0] = alpha2*a0*a0;
+    for(G4int j=1; j<100; j++) {
+      G4double x = a0*fNistManager->GetZ13(j);
+      ScreenRSquare[j] = alpha2*x*x;
+      x = fNistManager->GetA27(j);
+      FormFactor[j] = constn*x*x;
+    }
+  }
+  theManager = G4LossTableManager::Instance();
+  fG4pow = G4Pow::GetInstance();
+  wokvi = new G4WentzelOKandVIxSection();
+}
 …
 G4WentzelVIModel::~G4WentzelVIModel()
+{}
+{
+  delete wokvi;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
   // reset parameters
   SetupParticle(p);
-  tkin = targetZ = mom2 = 0.0;
-  ecut = etag = DBL_MAX;
   currentRange = 0.0;
   cosThetaMax = cos(PolarAngleLimit());
+  wokvi->Initialise(p, cosThetaMax);
+  /*
+  G4cout << "G4WentzelVIModel: factorA2(GeV^2) = " << factorA2/(GeV*GeV)
+         << "  1-cos(ThetaLimit)= " << 1 - cosThetaMax
+         << G4endl;
+  */
   currentCuts = &cuts;
 …
                              G4double cutEnergy, G4double)
+{
+  SetupParticle(p);
+  if(kinEnergy < lowEnergyLimit) return 0.0;
+  SetupKinematic(kinEnergy, cutEnergy);
+  SetupTarget(Z, kinEnergy);
+  G4double xsec = ComputeTransportXSectionPerAtom();
+  /*
+  G4cout << "CS: e= " << tkin << " cosEl= " << cosTetMaxElec2
+         << " cosN= " << cosTetMaxNuc2 << " xsec(bn)= " << xsec/barn
+         << " " << particle->GetParticleName() << G4endl;
+  G4double xsec = 0.0;
+  if(p != particle) { SetupParticle(p); }
+  if(kinEnergy < lowEnergyLimit) { return xsec; }
+  DefineMaterial(CurrentCouple());
+  cosTetMaxNuc = wokvi->SetupKinematic(kinEnergy, currentMaterial);
+  if(cosTetMaxNuc < 1.0) {
+    cosTetMaxNuc = wokvi->SetupTarget(G4int(Z), cutEnergy);
+    xsec = wokvi->ComputeTransportCrossSectionPerAtom(cosTetMaxNuc);
+  /*
+    G4cout << "G4WentzelVIModel::CS: Z= " << G4int(Z) << " e(MeV)= " << kinEnergy
+           << " 1-cosN= " << 1 - costm << " xsec(bn)= " << xsec/barn
+           << " " << particle->GetParticleName() << G4endl;
   */
+  }
   return xsec;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-G4double G4WentzelVIModel::ComputeTransportXSectionPerAtom()
+{
-  G4double xSection = 0.0;
-  G4double x, y, x1, x2, x3, x4;
-  // scattering off electrons
-  if(cosTetMaxElec2 < 1.0) {
-    x = (1.0 - cosTetMaxElec2)/screenZ;
-    if(x < numlimit) y = 0.5*x*x*(1.0 - 1.3333333*x + 1.5*x*x);
-    else             y = log(1.0 + x) - x/(1.0 + x);
-    if(y < 0.0) {
-      nwarnings++;
-      if(nwarnings < nwarnlimit /*&& y < -1.e-10*/) {
-        G4cout << "Electron scattering <0 for L1 " << y
-               << " e(MeV)= " << tkin << " p(MeV/c)= " << sqrt(mom2)
-               << " Z= " << targetZ << "  "
-               << particle->GetParticleName() << G4endl;
-        G4cout << " z= " << 1.0-cosTetMaxElec2 << " screenZ= " << screenZ
-               << " x= " << x << G4endl;
+      }
-      y = 0.0;
+    }
-    xSection = y;
+  }
-  /*
-  G4cout << "G4WentzelVI:XS per A " << " Z= " << targetZ
-         << " e(MeV)= " << tkin/MeV << " XSel= " << xSection
-         << " cut(MeV)= " << ecut/MeV
-         << " zmaxE= " << (1.0 - cosTetMaxElec)/screenZ
-         << " zmaxN= " << (1.0 - cosTetMaxNuc2)/screenZ
-         << " costm= " << cosTetMaxNuc2 << G4endl;
-  */
-  // scattering off nucleus
-  if(cosTetMaxNuc2 < 1.0) {
-    x  = 1.0 - cosTetMaxNuc2;
-    x1 = screenZ*formfactA;
-    x2 = 1.0 - x1;
-    x3 = x/screenZ;
-    x4 = formfactA*x;
-    // low-energy limit
-    if(x3 < numlimit && x1 < numlimit) {
-      y = 0.5*x3*x3*(1.0 - 1.3333333*x3 + 1.5*x3*x3 - 1.5*x1
-                     + 3.0*x1*x1 + 2.666666*x3*x1)/(x2*x2*x2);
-      // high energy limit
-    } else if(x2 <= 0.0) {
-      x4 = x1*(1.0 + x3);
-      y  = x3*(1.0 + 0.5*x3 - (2.0 - x1)*(1.0 + x3 + x3*x3/3.0)/x4)/(x4*x4);
-      // middle energy
-    } else {
-      y = ((1.0 + x1)*x2*log((1. + x3)/(1. + x4))
-           - x3/(1. + x3) - x4/(1. + x4))/(x2*x2);
+    }
-    //G4cout << "y= " << y << " x1= " <<x1<<"  x2= " <<x2
-    //     <<"  x3= "<<x3<<"  x4= " << x4<<G4endl;
-    if(y < 0.0) {
-      nwarnings++;
-      if(nwarnings < nwarnlimit /*&& y < -1.e-10*/) {
-        G4cout << "Nuclear scattering <0 for L1 " << y
-               << " e(MeV)= " << tkin << " Z= " << targetZ << "  "
-               << particle->GetParticleName() << G4endl;
-        G4cout << " formfactA= " << formfactA << " screenZ= " << screenZ
-               << " x= " << " x1= " << x1 << " x2= " << x2
-               << " x3= " << x3 << " x4= " << x4 <<G4endl;
+      }
-      y = 0.0;
+    }
-    xSection += y*targetZ;
+  }
-  xSection *= kinFactor;
-  /*
-  G4cout << "Z= " << targetZ << " XStot= " << xSection/barn
-         << " screenZ= " << screenZ << " formF= " << formfactA
-         << " for " << particle->GetParticleName()
-         << " m= " << mass << " 1/v= " << sqrt(invbeta2) << " p= " << sqrt(mom2)
-         << " x= " << x
-         << G4endl;
-  */
-  return xSection;
+}
 …
   G4StepPoint* sp = track.GetStep()->GetPreStepPoint();
   G4StepStatus stepStatus = sp->GetStepStatus();
+  //G4cout << "G4WentzelVIModel::ComputeTruePathLengthLimit stepStatus= "
+  //     << stepStatus << G4endl;
   // initialisation for 1st step
 …
     inside = false;
     SetupParticle(dp->GetDefinition());
-    theLambdaTable = theTable;
+  }
 …
   preKinEnergy  = dp->GetKineticEnergy();
   DefineMaterial(track.GetMaterialCutsCouple());
+  lambda0 = GetLambda(preKinEnergy);
+  theLambdaTable = theTable;
+  lambdaeff = GetLambda(preKinEnergy);
   currentRange =
     theManager->GetRangeFromRestricteDEDX(particle,preKinEnergy,currentCouple);
+  cosTetMaxNuc = wokvi->SetupKinematic(preKinEnergy, currentMaterial);
   // extra check for abnormal situation
   // this check needed to run MSC with eIoni and eBrem inactivated
   if(tlimit > currentRange) tlimit = currentRange;
+  if(tlimit > currentRange) { tlimit = currentRange; }
   // stop here if small range particle
   if(inside) return tlimit;
+  if(inside) { return tlimit; }
   // pre step
 …
   // compute presafety again if presafety <= 0 and no boundary
   // i.e. when it is needed for optimization purposes
   if(stepStatus != fGeomBoundary && presafety < tlimitminfix)
+  if(stepStatus != fGeomBoundary && presafety < tlimitminfix) {
     presafety = ComputeSafety(sp->GetPosition(), tlimit);
+  }
   /*
+  G4cout << "G4WentzelVIModel::ComputeTruePathLengthLimit tlimit= "
+         <<tlimit<<" safety= " << presafety
+         << " range= " <<currentRange<<G4endl;
+  G4cout << "e(MeV)= " << preKinEnergy/MeV
+         << "  " << particle->GetParticleName()
+         << " CurLimit(mm)= " << tlimit/mm <<" safety(mm)= " << presafety/mm
+         << " R(mm)= " <<currentRange/mm
+         << " L0(mm^-1)= " << lambdaeff*mm
+         <<G4endl;
   */
   // far from geometry boundary
   if(currentRange < presafety) {
     inside = true;
+    // limit mean scattering angle
+  } else {
+    G4double rlimit = facrange*lambda0;
+    G4double rcut = currentCouple->GetProductionCuts()->GetProductionCut(1);
+    if(rcut > rlimit) rlimit = std::pow(rcut*rcut*rlimit,0.33333333);
+    rlimit = std::min(rlimit, facgeom*currentMaterial->GetRadlen());
+    if(rlimit < tlimit) tlimit = rlimit;
+  }
+  /*
+    return tlimit;
+  }
+  // natural limit for high energy
+  G4double rlimit = std::max(facrange*currentRange,
+.7*(1.0 - cosTetMaxNuc)*lambdaeff);
+  // low-energy e-
+  if(cosThetaMax > cosTetMaxNuc) {
+    rlimit = std::min(rlimit, facsafety*presafety);
+  }
+  // cut correction
+  G4double rcut = currentCouple->GetProductionCuts()->GetProductionCut(1);
+  //G4cout << "rcut= " << rcut << " rlimit= " << rlimit << " presafety= " << presafety
+  // << " 1-cosThetaMax= " <<1-cosThetaMax << " 1-cosTetMaxNuc= " << 1-cosTetMaxNuc
+  // << G4endl;
+  if(rcut > rlimit) { rlimit = std::min(rlimit, rcut*sqrt(rlimit/rcut)); }
+  if(rlimit < tlimit) { tlimit = rlimit; }
+  tlimit = std::max(tlimit, tlimitminfix);
+  // step limit in infinite media
+  tlimit = std::min(tlimit, 20*currentMaterial->GetRadlen());
+  /*
   G4cout << particle->GetParticleName() << " e= " << preKinEnergy
          << " L0= " << lambda0 << " R= " << currentRange
+         << " L0= " << lambdaeff << " R= " << currentRange
          << "tlimit= " << tlimit
          << " currentMinimalStep= " << currentMinimalStep << G4endl;
 …
   tPathLength  = truelength;
   zPathLength  = tPathLength;
+  lambdaeff    = lambda0;
+  if(lambda0 > 0.0) {
+    G4double tau = tPathLength/lambda0;
+  if(lambdaeff > 0.0) {
+    G4double tau = tPathLength/lambdaeff;
     //G4cout << "ComputeGeomPathLength: tLength= " << tPathLength
     //   << " lambda0= " << lambda0 << " tau= " << tau << G4endl;
+    //   << " Leff= " << lambdaeff << " tau= " << tau << G4endl;
     // small step
     if(tau < numlimit) {
 …
       // medium step
     } else {
-      //      zPathLength = lambda0*(1.0 - exp(-tPathLength/lambda0));
       G4double e1 = 0.0;
       if(currentRange > tPathLength) {
 …
                                    currentCouple);
+      }
+      lambdaeff = GetLambda(0.5*(e1 + preKinEnergy));
+      e1 = 0.5*(e1 + preKinEnergy);
+      cosTetMaxNuc = wokvi->SetupKinematic(e1, currentMaterial);
+      lambdaeff = GetLambda(e1);
       zPathLength = lambdaeff*(1.0 - exp(-tPathLength/lambdaeff));
+    }
 …
 G4double G4WentzelVIModel::ComputeTrueStepLength(G4double geomStepLength)
+{
+  // step defined other than transportation
+  if(geomStepLength == zPathLength) return tPathLength;
+  // initialisation of single scattering x-section
+  xtsec = 0.0;
+  // pathalogical case
+  if(lambdaeff <= 0.0) {
+    zPathLength = geomStepLength;
+    tPathLength = geomStepLength;
+    return tPathLength;
+  }
+  G4double tau = geomStepLength/lambdaeff;
   // step defined by transportation
+  tPathLength  = geomStepLength;
+  zPathLength  = geomStepLength;
+  G4double tau = zPathLength/lambdaeff;
+  tPathLength *= (1.0 + 0.5*tau + tau*tau/3.0);
+  if(tau > numlimit) {
+    G4double e1 = 0.0;
+    if(currentRange > tPathLength) {
+      e1 = theManager->GetEnergy(particle,
+                                 currentRange-tPathLength,
+                                 currentCouple);
+    }
+    lambdaeff = GetLambda(0.5*(e1 + preKinEnergy));
+    tau = zPathLength/lambdaeff;
+    if(tau < 0.999999) tPathLength = -lambdaeff*log(1.0 - tau);
+    else               tPathLength = currentRange;
+    if(tPathLength < zPathLength) tPathLength = zPathLength;
+  }
+  if(tPathLength > currentRange) tPathLength = currentRange;
+  //G4cout<<"Comp.true: zLength= "<<zPathLength<<" tLength= "<<tPathLength<<G4endl;
+  if(geomStepLength != zPathLength) {
+    // step defined by transportation
+    zPathLength = geomStepLength;
+    tPathLength = zPathLength*(1.0 + 0.5*tau + tau*tau/3.0);
+    // energy correction for a big step
+    if(tau > numlimit) {
+      G4double e1 = 0.0;
+      if(currentRange > tPathLength) {
+        e1 = theManager->GetEnergy(particle,
+                                   currentRange-tPathLength,
+                                   currentCouple);
+      }
+      e1 = 0.5*(e1 + preKinEnergy);
+      cosTetMaxNuc = wokvi->SetupKinematic(e1, currentMaterial);
+      lambdaeff = GetLambda(e1);
+      tau = zPathLength/lambdaeff;
+      if(tau < 0.999999) { tPathLength = -lambdaeff*log(1.0 - tau); }
+      else               { tPathLength = currentRange; }
+    }
+  }
+  // check of step length
+  // define threshold angle between single and multiple scattering
+  cosThetaMin = 1.0 - 1.5*tPathLength/lambdaeff;
+  // recompute transport cross section - do not change energy
+  // anymore - cannot be applied for big steps
+  if(cosThetaMin > cosTetMaxNuc) {
+    // new computation
+    G4double xsec = ComputeXSectionPerVolume();
+    //G4cout << "%%%% xsec= " << xsec << "  xtsec= " << xtsec << G4endl;
+    if(xtsec > 0.0) {
+      if(xsec > 0.0) { lambdaeff = 1./xsec; }
+      else           { lambdaeff = DBL_MAX; }
+      tau = zPathLength*xsec;
+      if(tau < numlimit) { tPathLength = zPathLength*(1.0 + 0.5*tau + tau*tau/3.0); }
+      else if(tau < 0.999999) { tPathLength = -lambdaeff*log(1.0 - tau); }
+      else               { tPathLength = currentRange; }
+    }
+  }
+  if(tPathLength > currentRange) { tPathLength = currentRange; }
+  if(tPathLength < zPathLength)  { tPathLength = zPathLength; }
+  /*
+  G4cout <<"Comp.true: zLength= "<<zPathLength<<" tLength= "<<tPathLength
+         <<" Leff(mm)= "<<lambdaeff/mm<<" sig0(1/mm)= " << xtsec <<G4endl;
+  G4cout << particle->GetParticleName() << " 1-cosThetaMin= " << 1-cosThetaMin
+         << " 1-cosTetMaxNuc= " << 1-cosTetMaxNuc
+         << " e(MeV)= " << preKinEnergy/MeV << G4endl;
+  */
   return tPathLength;
+}
 …
   //G4cout << "!##! G4WentzelVIModel::SampleScattering for "
   //     << particle->GetParticleName() << G4endl;
+  G4double kinEnergy = dynParticle->GetKineticEnergy();
+  // ignore scattering for zero step length and enegy below the limit
+  if(kinEnergy < lowEnergyLimit || tPathLength <= DBL_MIN) return;
+  G4double ekin = preKinEnergy;
+  if(ekin - kinEnergy > ekin*dtrl) {
+    ekin = 0.5*(preKinEnergy + kinEnergy);
+    lambdaeff = GetLambda(ekin);
+  }
+  // ignore scattering for zero step length and energy below the limit
+  if(dynParticle->GetKineticEnergy() < lowEnergyLimit ||
+     tPathLength <= DBL_MIN || lambdaeff <= DBL_MIN)
+    { return; }
+  G4double x1 = 0.5*tPathLength/lambdaeff;
+  G4double cut= (*currentCuts)[currentMaterialIndex];
+  /*
+  G4cout <<"SampleScat: E0(MeV)= "<< preKinEnergy<<" Eeff(MeV)= "<<ekin/MeV
+         << " L0= " << lambda0 << " Leff= " << lambdaeff
+         << " x1= " << x1 << " safety= " << safety << G4endl;
+  G4double invlambda = 0.0;
+  if(lambdaeff < DBL_MAX) { invlambda = 0.5/lambdaeff; }
+  // use average kinetic energy over the step
+  G4double cut = (*currentCuts)[currentMaterialIndex];
+  /*
+  G4cout <<"SampleScat: E0(MeV)= "<< preKinEnergy/MeV
+         << " Leff= " << lambdaeff <<" sig0(1/mm)= " << xtsec
+         << " x1= " <<  tPathLength*invlambda << " safety= " << safety << G4endl;
   */
+  G4double xsec = 0.0;
+  G4bool largeAng = false;
+  // large scattering angle case
+  if(x1 > 0.5) {
+    x1 *= 0.5;
+    largeAng = true;
+    // normal case
+  } else {
+    // define threshold angle between single and multiple scattering
+    cosThetaMin = 1.0 - 3.0*x1;
+    // for low-energy e-,e+ no limit
+    SetupKinematic(ekin, cut);
+    // recompute transport cross section
+    if(cosThetaMin > cosTetMaxNuc) {
+      xsec = ComputeXSectionPerVolume();
+      if(xtsec > 0.0) x1 = 0.5*tPathLength*xtsec;
+      else            x1 = 0.0;
+      /*
+        G4cout << "cosTetMaxNuc= " << cosTetMaxNuc
+        << " cosThetaMin= " << cosThetaMin
+        << " cosThetaMax= " << cosThetaMax
+        << " cosTetMaxElec2= " << cosTetMaxElec2 << G4endl;
+        G4cout << "Recomputed xsec(1/mm)= " << xsec << " x1= " << x1 << G4endl;
+      */
+    }
+  }
+  // result of central part sampling
+  G4double z;
+  G4double length = tPathLength;
+  G4double lengthlim = tPathLength*1.e-6;
+  // step limit due msc
+  G4double x0 = length;
+  // large scattering angle case - two step approach
+  if(tPathLength*invlambda > 0.5 && length > tlimitminfix) { x0 *= 0.5; }
+  // step limit due single scattering
+  G4double x1 = length;
+  if(xtsec > 0.0) { x1 = -log(G4UniformRand())/xtsec; }
+  const G4ElementVector* theElementVector =
+    currentMaterial->GetElementVector();
+  G4int nelm = currentMaterial->GetNumberOfElements();
+  // geometry
+  G4double sint, cost, phi;
+  G4ThreeVector oldDirection = dynParticle->GetMomentumDirection();
+  G4ThreeVector temp(0.0,0.0,1.0);
+  // current position and direction relative to the end point
+  // because of magnetic field geometry is computed relatively to the
+  // end point of the step
+  G4ThreeVector dir(0.0,0.0,1.0);
+  G4ThreeVector pos(0.0,0.0,-zPathLength);
+  G4double mscfac = zPathLength/tPathLength;
+  // start a loop
   do {
+    z = -x1*log(G4UniformRand());
+  } while (z > 1.0);
+  // cost is sampled ------------------------------
+  G4double cost = 1.0 - 2.0*z;
+  //  if(cost < -1.0) cost = -1.0;
+  // else if(cost > 1.0) cost = 1.0;
+  G4double sint = sqrt((1.0 - cost)*(1.0 + cost));
+  G4double phi  = twopi*G4UniformRand();
+  G4double dirx = sint*cos(phi);
+  G4double diry = sint*sin(phi);
+  //G4cout << "G4WentzelVIModel: step(mm)= " << tPathLength/mm
+  //     << " sint= " << sint << " cost= " << cost<< G4endl;
+  G4ThreeVector oldDirection = dynParticle->GetMomentumDirection();
+  G4ThreeVector newDirection(dirx,diry,cost);
+  G4ThreeVector temp(0.0,0.0,1.0);
+  G4ThreeVector pos(0.0,0.0,-zPathLength);
+  G4ThreeVector dir(0.0,0.0,1.0);
+  G4bool isscat = false;
+  // sample MSC scattering for large angle
+  // extra central scattering for half step
+  if(largeAng) {
+    isscat = true;
+    pos.setZ(-0.5*zPathLength);
+    do {
+      z = -x1*log(G4UniformRand());
+    } while (z > 1.0);
+    G4double step = x0;
+    G4bool singleScat = false;
+    // single scattering case
+    if(x1 < x0) {
+      step = x1;
+      singleScat = true;
+    }
+    // new position
+    pos += step*mscfac*dir;
+    // added multiple scattering
+    G4double z;
+    G4double tet2 = step*invlambda;
+    do { z = -tet2*log(G4UniformRand()); } while (z >= 1.0);
     cost = 1.0 - 2.0*z;
-    //if(std::fabs(cost) > 1.0) cost = 1.0;
     sint = sqrt((1.0 - cost)*(1.0 + cost));
     phi  = twopi*G4UniformRand();
+    // position and direction for secondary scattering
+    dir.set(sint*cos(phi),sint*sin(phi),cost);
+    pos += 0.5*dir*zPathLength;
+    x1 *= 2.0;
+  }
+  // sample Rutherford scattering for large angle
+  if(xsec > DBL_MIN) {
+    G4double t = tPathLength;
+    G4int nelm = currentMaterial->GetNumberOfElements();
+    const G4ElementVector* theElementVector =
+      currentMaterial->GetElementVector();
+    do{
+      G4double x  = -log(G4UniformRand())/xsec;
+      pos += dir*(zPathLength*std::min(x,t)/tPathLength);
+      t -= x;
+      if(t > 0.0) {
+        G4double zz1 = 1.0;
+        G4double qsec = G4UniformRand()*xsec;
+        // scattering off nucleus
+        G4int i = 0;
+        if(nelm > 1) {
+          for (; i<nelm; i++) {if(xsecn[i] >= qsec) break;}
+          if(i >= nelm) i = nelm - 1;
+        }
+        SetupTarget((*theElementVector)[i]->GetZ(), tkin);
+        G4double formf = formfactA;
+        G4double costm = cosTetMaxNuc2;
+        if(prob[i] > 0.0) {
+          if(G4UniformRand() <= prob[i]) {
+            formf = 0.0;
+            costm = cosTetMaxElec2;
+          }
+        }
+        if(cosThetaMin > costm) {
+          G4double w1 = 1. - cosThetaMin + screenZ;
+          G4double w2 = 1. - costm + screenZ;
+          G4double w3 = cosThetaMin - costm;
+          G4double grej, zz;
+          do {
+            zz = w1*w2/(w1 + G4UniformRand()*w3) - screenZ;
+            grej = 1.0/(1.0 + formf*zz);
+          } while ( G4UniformRand() > grej*grej );
+          if(zz < 0.0) zz = 0.0;
+          else if(zz > 2.0) zz = 2.0;
+          zz1 = 1.0 - zz;
+        }
+        if(zz1 < 1.0) {
+          isscat = true;
+          //G4cout << "Rutherford zz1= " << zz1 << " t= " << t << G4endl;
+          sint = sqrt((1.0 - zz1)*(1.0 + zz1));
+          //G4cout << "sint= " << sint << G4endl;
+          phi  = twopi*G4UniformRand();
+          G4double vx1 = sint*cos(phi);
+          G4double vy1 = sint*sin(phi);
+          temp.set(vx1,vy1,zz1);
+          temp.rotateUz(dir);
+          dir = temp;
+        }
+    G4double vx1 = sint*cos(phi);
+    G4double vy1 = sint*sin(phi);
+    // lateral displacement
+    if (latDisplasment && safety > tlimitminfix) {
+      G4double rms = invsqrt12*sqrt(2.0*tet2);
+      G4double dx = step*(0.5*vx1 + rms*G4RandGauss::shoot(0.0,1.0));
+      G4double dy = step*(0.5*vy1 + rms*G4RandGauss::shoot(0.0,1.0));
+      G4double dz;
+      G4double d = (dx*dx + dy*dy)/(step*step);
+      if(d < numlimit)  { dz = -0.5*step*d*(1.0 + 0.25*d); }
+      else if(d < 1.0)  { dz = -step*(1.0 - sqrt(1.0 - d));}
+      else              { dx = dy = dz = 0.0; }
+      // change position
+      temp.set(dx,dy,dz);
+      temp.rotateUz(dir);
+      pos += temp;
+    }
+    // direction is changed
+    temp.set(vx1,vy1,cost);
+    temp.rotateUz(dir);
+    dir = temp;
+    if(singleScat) {
+      // select element
+      G4int i = 0;
+      if(nelm > 1) {
+        G4double qsec = G4UniformRand()*xtsec;
+        for (; i<nelm; ++i) { if(xsecn[i] >= qsec) { break; } }
+        if(i >= nelm) { i = nelm - 1; }
+      }
+    } while (t > 0.0);
+  }
+  if(isscat) newDirection.rotateUz(dir);
+  newDirection.rotateUz(oldDirection);
+      G4double cosTetM =
+        wokvi->SetupTarget(G4int((*theElementVector)[i]->GetZ()), cut);
+      temp = wokvi->SampleSingleScattering(cosThetaMin, cosTetM, prob[i]);
+      temp.rotateUz(dir);
+      // renew direction
+      dir = temp;
+      // new single scatetring
+      x1 = -log(G4UniformRand())/xtsec;
+    }
+    // update step
+    length -= step;
+  } while (length > lengthlim);
+  dir.rotateUz(oldDirection);
+  pos.rotateUz(oldDirection);
   //G4cout << "G4WentzelVIModel sampling of scattering is done" << G4endl;
   // end of sampling -------------------------------
+  fParticleChange->ProposeMomentumDirection(newDirection);
+  if (latDisplasment && safety > tlimitminfix) {
+    G4double rms = invsqrt12*sqrt(2.0*x1);
+    G4double dx = zPathLength*(0.5*dirx + rms*G4RandGauss::shoot(0.0,1.0));
+    G4double dy = zPathLength*(0.5*diry + rms*G4RandGauss::shoot(0.0,1.0));
+    G4double dz;
+    G4double d = (dx*dx + dy*dy)/(zPathLength*zPathLength);
+    if(d < numlimit)  dz = -0.5*zPathLength*d*(1.0 + 0.25*d);
+    else if(d < 1.0)  dz = -zPathLength*(1.0 - sqrt(1.0 - d));
+    else {
+      dx = dy = dz = 0.0;
+    }
+    temp.set(dx,dy,dz);
+    if(isscat) temp.rotateUz(dir);
+    pos += temp;
+    pos.rotateUz(oldDirection);
+  fParticleChange->ProposeMomentumDirection(dir);
+  // lateral displacement
+  if (latDisplasment) {
     G4double r = pos.mag();
 …
 G4double G4WentzelVIModel::ComputeXSectionPerVolume()
+{
   const G4ElementVector* theElementVector =
     currentMaterial->GetElementVector();
+  // prepare recomputation of x-sections
+  const G4ElementVector* theElementVector = currentMaterial->GetElementVector();
   const G4double* theAtomNumDensityVector =
     currentMaterial->GetVecNbOfAtomsPerVolume();
 …
   if(nelm > nelments) {
     nelments = nelm;
+    xsecn.resize(nelments);
+    prob.resize(nelments);
+  }
+    xsecn.resize(nelm);
+    prob.resize(nelm);
+  }
+  G4double cut = (*currentCuts)[currentMaterialIndex];
+  cosTetMaxNuc = wokvi->GetCosThetaNuc();
+  // check consistency
   xtsec = 0.0;
+  if(cosTetMaxNuc > cosThetaMin) { return 0.0; }
+  // loop over elements
   G4double xs = 0.0;
   for (G4int i=0; i<nelm; i++) {
     SetupTarget((*theElementVector)[i]->GetZ(), tkin);
+  for (G4int i=0; i<nelm; ++i) {
+    G4double costm =
+      wokvi->SetupTarget(G4int((*theElementVector)[i]->GetZ()), cut);
     G4double density = theAtomNumDensityVector[i];
-    G4double cosnm = cosTetMaxNuc2;
-    G4double cosem = cosTetMaxElec2;
-    // recompute the angular limit
-    cosTetMaxNuc2  = std::max(cosnm,cosThetaMin);
-    cosTetMaxElec2 = std::max(cosem,cosThetaMin);
-    xtsec += ComputeTransportXSectionPerAtom()*density;
-    // return limit back
-    cosTetMaxElec2 = cosem;
-    cosTetMaxNuc2  = cosnm;
     G4double esec = 0.0;
+    G4double nsec = 0.0;
+    G4double x1 = 1.0 - cosThetaMin + screenZ;
+    G4double f  = kinFactor*density;
+    // scattering off electrons
+    if(cosThetaMin > cosem) {
+      esec = f*(cosThetaMin - cosem)/(x1*(1.0 - cosem + screenZ));
+    }
+    // scattering off nucleaus
+    if(cosThetaMin > cosnm) {
+      // Rutherford part
+      G4double s  = screenZ*formfactA;
+      G4double z1 = 1.0 - cosnm + screenZ;
+      G4double s1 = 1.0 - s;
+      G4double d  = s1/formfactA;
+      // check numerical limit
+      if(d < numlimit*x1) {
+        G4double x2 = x1*x1;
+        G4double z2 = z1*z1;
+        nsec = (1.0/(x1*x2) - 1.0/(z1*z2) - d*1.5*(1.0/(x2*x2) - 1.0/(z2*z2)))/
+          (3.0*formfactA*formfactA);
+      } else {
+        G4double x2 = x1 + d;
+        G4double z2 = z1 + d;
+        nsec = (1.0/x1 - 1.0/z1 + 1.0/x2 - 1.0/z2 - 2.0*log(z1*x2/(z2*x1))/d)/(s1*s1);
+      }
+      nsec *= f*targetZ;
+    }
+    nsec += esec;
+    if(nsec > 0.0) esec /= nsec;
+    xs += nsec;
+    xsecn[i] = xs;
+    if(costm < cosThetaMin) {
+      // recompute the transport x-section
+      xs += density*wokvi->ComputeTransportCrossSectionPerAtom(cosThetaMin);
+      // recompute the total x-section
+      G4double nsec = wokvi->ComputeNuclearCrossSection(cosThetaMin, costm);
+      esec = wokvi->ComputeElectronCrossSection(cosThetaMin, costm);
+      nsec += esec;
+      if(nsec > 0.0) { esec /= nsec; }
+      xtsec += nsec*density;
+    }
+    xsecn[i] = xtsec;
     prob[i]  = esec;
     //G4cout << i << "  xs= " << xs << " cosThetaMin= " << cosThetaMin
     //     << " costm= " << costm << G4endl;
+    //G4cout << i << "  xs= " << xs << " xtsec= " << xtsec << " 1-cosThetaMin= " << 1-cosThetaMin
+    //     << " 1-cosTetMaxNuc2= " <<1-cosTetMaxNuc2<< G4endl;
+  }
   //G4cout << "ComputeXS result:  xsec(1/mm)= " << xs
   //<< " txsec(1/mm)= " << xtsec <<G4endl;
+  //     << " txsec(1/mm)= " << xtsec <<G4endl;
   return xs;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-/*
-G4double G4MuMscModel::ComputeXSectionPerVolume()
+{
-  const G4ElementVector* theElementVector =
-    currentMaterial->GetElementVector();
-  const G4double* theAtomNumDensityVector =
-    currentMaterial->GetVecNbOfAtomsPerVolume();
-  size_t nelm = currentMaterial->GetNumberOfElements();
-  xsece1 = 0.0;
-  xsece2 = 0.0;
-  xsecn2 = 0.0;
-  zcorr  = 0.0;
-  G4double fac = coeff*chargeSquare*invbeta2/mom2;
-  for (size_t i=0; i<nelm; i++) {
-    const G4Element* elm = (*theElementVector)[i];
-    G4double Z = elm->GetZ();
-    SetupTarget(Z, tkin);
-    G4double den = fac*theAtomNumDensityVector[i]*Z;
-    G4double x  = 1.0 - cosThetaMin;
-    G4double x1 = x + screenZ;
-    G4double x2 = 1.0/(x1*x1);
-    G4double x3 = 1.0 + x*formfactA;
-    //G4cout << "x= " << x << " den= " << den << " cosE= " << cosTetMaxElec << G4endl;
-    //G4cout << "cosThtaMin= " << cosThetaMin << G4endl;
-    //G4cout << "cosTetMaxNuc= " << cosTetMaxNuc << " q2Limit= " << q2Limit << G4endl;
-    // scattering off electrons
-    if(cosTetMaxElec < cosThetaMin) {
-      // flat part
-      G4double s = den*x2*x;
-      xsece1 += s;
-      zcorr  += 0.5*x*s;
-      // Rutherford part
-      G4double z1 = 1.0 - cosTetMaxElec + screenZ;
-      G4double z2 = (cosThetaMin - cosTetMaxElec)/x1;
-      if(z2 < 0.2) s = z2*(x - 0.5*z2*(x - screenZ))/x1;
-      else         s = log(1.0 + z2)  - screenZ*z2/z1;
-      xsece2  += den*z2/z1;
-      zcorr   += den*s;
+    }
-    den *= Z;
-    //G4cout << "Z= " << Z<< " cosL= " << cosTetMaxNuc << " cosMin= " << cosThetaMin << G4endl;
-    // scattering off nucleaus
-    if(cosTetMaxNuc < cosThetaMin) {
-      // flat part
-      G4double s = den*x2*x/(x3*x3);
-      xsece1 += s;
-      zcorr  += 0.5*x*s;
-      // Rutherford part
-      s  = screenZ*formfactA;
-      G4double w  = 1.0 + 2.0*s;
-      G4double z1 = 1.0 - cosTetMaxNuc + screenZ;
-      G4double d  = (1.0 - s)/formfactA;
-      G4double x4 = x1 + d;
-      G4double z4 = z1 + d;
-      G4double t1 = 1.0/(x1*z1);
-      G4double t4 = 1.0/(x4*z4);
-      G4double w1 = cosThetaMin - cosTetMaxNuc;
-      G4double w2 = log(z1*x4/(x1*z4));
-      den *= w;
-      xsecn2  += den*(w1*(t1 + t4) - 2.0*w2/d);
-      zcorr   += den*(w*w2 - w1*(screenZ*t1 + t4/formfactA));
+    }
-    xsece[i] = xsece2;
-    xsecn[i] = xsecn2;
-    //    G4cout << i << "  xsece2= " << xsece2 << "  xsecn2= " << xsecn2 << G4endl;
+  }
-  G4double xsec = xsece1 + xsece2 + xsecn2;
-    //G4cout << "xsece1= " << xsece1 << "  xsece2= " << xsece2
-    //<< "  xsecn2= " << xsecn2
-        // << " zsec= " << zcorr*0.5*tPathLength << G4endl;
-  zcorr *= 0.5*tPathLength;
-  return xsec;
+}
-*/
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void G4WentzelVIModel::ComputeMaxElectronScattering(G4double cutEnergy)
+{
-  ecut = cutEnergy;
-  G4double tmax = tkin;
-  cosTetMaxElec = 1.0;
-  if(mass > MeV) {
-    G4double ratio = electron_mass_c2/mass;
-    G4double tau = tkin/mass;
-    tmax = 2.0*electron_mass_c2*tau*(tau + 2.)/
-      (1.0 + 2.0*ratio*(tau + 1.0) + ratio*ratio);
-    cosTetMaxElec = 1.0 - std::min(cutEnergy, tmax)*electron_mass_c2/mom2;
-  } else {
-    if(particle == theElectron) tmax *= 0.5;
-    G4double t = std::min(cutEnergy, tmax);
-    G4double mom21 = t*(t + 2.0*electron_mass_c2);
-    G4double t1 = tkin - t;
-    //G4cout <<"tkin=" <<tkin<<" tmax= "<<tmax<<" t= "
-    //<<t<< " t1= "<<t1<<" cut= "<<ecut<<G4endl;
-    if(t1 > 0.0) {
-      G4double mom22 = t1*(t1 + 2.0*mass);
-      G4double ctm = (mom2 + mom22 - mom21)*0.5/sqrt(mom2*mom22);
-      if(ctm <  1.0) cosTetMaxElec = ctm;
-      if(ctm < -1.0) cosTetMaxElec = -1.0;
+    }
+  }
-  if(cosTetMaxElec < cosTetMaxNuc) cosTetMaxElec = cosTetMaxNuc;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4eBremsstrahlungModel.cc,v 1.44 2009/04/09 18:41:18 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4eBremsstrahlungModel.cc,v 1.46 2010/04/28 18:39:40 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
   if(p) SetParticle(p);
   theGamma = G4Gamma::Gamma();
   minThreshold = 1.0*keV;
+  minThreshold = 0.1*keV;
+}
 …
   if(1 < nElements) {
+    --nElements;
     G4DataVector* dv = partialSumSigma[couple->GetIndex()];
+    G4double rval = G4UniformRand()*((*dv)[nElements-1]);
+    for (G4int i=0; i<nElements; i++) {
+      if (rval <= (*dv)[i]) elm = (*theElementVector)[i];
+    }
+    if(!elm) {
+      G4cout << "G4eBremsstrahlungModel::SelectRandomAtom: Warning -"
+             << " no elements found in "
+             << material->GetName()
+             << G4endl;
+      elm = (*theElementVector)[0];
+    }
+  } else elm = (*theElementVector)[0];
+    G4double rval = G4UniformRand()*((*dv)[nElements]);
+    elm = (*theElementVector)[nElements];
+    for (G4int i=0; i<nElements; ++i) {
+      if (rval <= (*dv)[i]) {
+        elm = (*theElementVector)[i];
+        break;
+      }
+    }
+  } else { elm = (*theElementVector)[0]; }
   SetCurrentElement(elm);

trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungRelModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4eBremsstrahlungRelModel.cc,v 1.14 2009/04/09 18:41:18 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4eBremsstrahlungRelModel.cc,v 1.15 2010/04/06 17:02:23 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
   theGamma = G4Gamma::Gamma();
   minThreshold = 1.0*keV;
+  minThreshold = 0.1*keV;
   SetLowEnergyLimit(GeV);

trunk/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4eCoulombScatteringModel.cc,v 1.78 2009/10/28 10:14:13 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4eCoulombScatteringModel.cc,v 1.89 2010/05/27 14:22:05 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // 09.06.08 V.Ivanchenko add SelectIsotope and sampling of the recoil ion
 // 16.06.09 C.Consolandi fixed computation of effective mass
+// 27.05.10 V.Ivanchenko added G4WentzelOKandVIxSection class to
+//              compute cross sections and sample scattering angle
 //
 //
 …
 #include "G4DataVector.hh"
 #include "G4ElementTable.hh"
-#include "G4PhysicsLogVector.hh"
 #include "G4ParticleChangeForGamma.hh"
-#include "G4Electron.hh"
-#include "G4Positron.hh"
 #include "G4Proton.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProductionCutsTable.hh"
 #include "G4NucleiProperties.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eCoulombScatteringModel::ScreenRSquare[] = {0.0};
+G4double G4eCoulombScatteringModel::FormFactor[]    = {0.0};
+#include "G4Pow.hh"
+#include "G4LossTableManager.hh"
+#include "G4NistManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 using namespace std;
 …
     cosThetaMin(1.0),
     cosThetaMax(-1.0),
-    q2Limit(TeV*TeV),
-    alpha2(fine_structure_const*fine_structure_const),
-    faclim(100.0),
     isInitialised(false)
+{
   fNistManager = G4NistManager::Instance();
   theParticleTable = G4ParticleTable::GetParticleTable();
-  theElectron = G4Electron::Electron();
-  thePositron = G4Positron::Positron();
   theProton   = G4Proton::Proton();
   currentMaterial = 0;
   currentElement  = 0;
+  lowEnergyLimit  = 0.1*keV;
+  G4double p0 = electron_mass_c2*classic_electr_radius;
+  coeff  = twopi*p0*p0;
+  tkin = targetZ = mom2 = DBL_MIN;
+  elecXSection = nucXSection = 0.0;
+  lowEnergyLimit  = 1*eV;
   recoilThreshold = 0.*keV;
-  ecut = DBL_MAX;
   particle = 0;
   currentCouple = 0;
+  // Thomas-Fermi screening radii
+  // Formfactors from A.V. Butkevich et al., NIM A 488 (2002) 282
+  if(0.0 == ScreenRSquare[0]) {
+    G4double a0 = electron_mass_c2/0.88534;
+    G4double constn = 6.937e-6/(MeV*MeV);
+    ScreenRSquare[0] = alpha2*a0*a0;
+    for(G4int j=1; j<100; j++) {
+      G4double x = a0*fNistManager->GetZ13(j);
+      ScreenRSquare[j] = alpha2*x*x;
+      x = fNistManager->GetA27(j);
+      FormFactor[j] = constn*x*x;
+    }
+  }
+  wokvi = new G4WentzelOKandVIxSection();
+}
 …
 G4eCoulombScatteringModel::~G4eCoulombScatteringModel()
+{}
+{
+  delete wokvi;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   SetupParticle(p);
   currentCouple = 0;
-  elecXSection = nucXSection = 0.0;
-  tkin = targetZ = mom2 = DBL_MIN;
-  ecut = etag = DBL_MAX;
   cosThetaMin = cos(PolarAngleLimit());
+  wokvi->Initialise(p, cosThetaMin);
+  /*
+  G4cout << "G4eCoulombScatteringModel: factorA2(GeV^2) = " << factorA2/(GeV*GeV)
+         << "  1-cos(ThetaLimit)= " << 1 - cosThetaMin
+         << "  cos(thetaMax)= " <<  cosThetaMax
+         << G4endl;
+  */
   pCuts = G4ProductionCutsTable::GetProductionCutsTable()->GetEnergyCutsVector(3);
   //G4cout << "!!! G4eCoulombScatteringModel::Initialise for "
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void G4eCoulombScatteringModel::ComputeMaxElectronScattering(G4double cutEnergy)
+{
-  ecut = cutEnergy;
-  G4double tmax = tkin;
-  cosTetMaxElec = 1.0;
-  if(mass > MeV) {
-    G4double ratio = electron_mass_c2/mass;
-    G4double tau = tkin/mass;
-    tmax = 2.0*electron_mass_c2*tau*(tau + 2.)/
-      (1.0 + 2.0*ratio*(tau + 1.0) + ratio*ratio);
-    cosTetMaxElec = 1.0 - std::min(cutEnergy, tmax)*electron_mass_c2/mom2;
-  } else {
-    if(particle == theElectron) tmax *= 0.5;
-    G4double t = std::min(cutEnergy, tmax);
-    G4double mom21 = t*(t + 2.0*electron_mass_c2);
-    G4double t1 = tkin - t;
-    //G4cout << "tkin= " << tkin << " t= " << t << " t1= " << t1 << G4endl;
-    if(t1 > 0.0) {
-      G4double mom22 = t1*(t1 + 2.0*mass);
-      G4double ctm = (mom2 + mom22 - mom21)*0.5/sqrt(mom2*mom22);
-      //G4cout << "ctm= " << ctm << G4endl;
-      if(ctm <  1.0) cosTetMaxElec = ctm;
-      if(ctm < -1.0) cosTetMaxElec = -1.0;
+    }
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4eCoulombScatteringModel::ComputeCrossSectionPerAtom(
                 const G4ParticleDefinition* p,
 …
   //  << p->GetParticleName()<<" Z= "<<Z<<" e(MeV)= "<< kinEnergy/MeV << G4endl;
   G4double xsec = 0.0;
+  SetupParticle(p);
+  if(kinEnergy < lowEnergyLimit) return xsec;
+  SetupKinematic(kinEnergy, cutEnergy);
+  if(cosTetMaxNuc < cosTetMinNuc) {
+    SetupTarget(Z, kinEnergy);
+    xsec = CrossSectionPerAtom();
+  if(p != particle) { SetupParticle(p); }
+  // cross section is set to zero to avoid problems in sample secondary
+  if(kinEnergy < lowEnergyLimit) { return xsec; }
+  DefineMaterial(CurrentCouple());
+  cosTetMinNuc = wokvi->SetupKinematic(kinEnergy, currentMaterial);
+  if(cosThetaMax < cosTetMinNuc) {
+    G4int iz = G4int(Z);
+    cosTetMinNuc = wokvi->SetupTarget(iz, cutEnergy);
+    cosTetMaxNuc = cosThetaMax;
+    if(iz == 1 && cosTetMaxNuc < 0.0 && particle == theProton) {
+      cosTetMaxNuc = 0.0;
+    }
+    xsec =  wokvi->ComputeNuclearCrossSection(cosTetMinNuc, cosTetMaxNuc);
+    elecRatio = wokvi->ComputeElectronCrossSection(cosTetMinNuc, cosThetaMax);
+    xsec += elecRatio;
+    if(xsec > 0.0) { elecRatio /= xsec; }
+  }
   /*
+  G4cout << "e(MeV)= " << ekin/MeV << "cosTetMinNuc= " << cosTetMinNuc
+         << " cosTetMaxNuc= " << cosTetMaxNuc
+         << " cosTetMaxElec= " << cosTetMaxElec
+  G4cout << "e(MeV)= " << kinEnergy/MeV << " xsec(b)= " << xsec/barn
+         << " 1-cosTetMinNuc= " << 1-cosTetMinNuc
+         << " 1-cosTetMaxNuc2= " << 1-cosTetMaxNuc2
+         << " 1-cosTetMaxElec= " << 1-cosTetMaxElec
          << " screenZ= " << screenZ
          << " formfactA= " << formfactA << G4endl;
   */
   return xsec;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-G4double G4eCoulombScatteringModel::CrossSectionPerAtom()
+{
-  // This method needs initialisation before be called
-  //G4double fac = coeff*targetZ*chargeSquare*invbeta2/mom2;
-  G4double meff = targetMass/(mass+targetMass);
-  G4double fac  = coeff*targetZ*chargeSquare*invbeta2/(mom2*meff*meff);
-  elecXSection = 0.0;
-  nucXSection  = 0.0;
-  G4double x  = 1.0 - cosTetMinNuc;
-  G4double x1 = x + screenZ;
-  if(cosTetMaxElec2 < cosTetMinNuc) {
-    elecXSection = fac*(cosTetMinNuc - cosTetMaxElec2)/
-      (x1*(1.0 - cosTetMaxElec2 + screenZ));
-    nucXSection  = elecXSection;
+  }
-  //G4cout << "XS tkin(MeV)= " << tkin<<" xs= " <<nucXSection
-  //     << " costmax= " << cosTetMaxNuc2
-  //     << " costmin= " << cosTetMinNuc << "  Z= " << targetZ <<G4endl;
-  if(cosTetMaxNuc2 < cosTetMinNuc) {
-    G4double s  = screenZ*formfactA;
-    G4double z1 = 1.0 - cosTetMaxNuc2 + screenZ;
-    G4double s1 = 1.0 - s;
-    G4double d  = s1/formfactA;
-    //G4cout <<"x1= "<<x1<<" z1= " <<z1<<" s= "<<s << " d= " <<d <<G4endl;
-    if(d < 0.2*x1) {
-      G4double x2 = x1*x1;
-      G4double z2 = z1*z1;
-      x = (1.0/(x1*x2) - 1.0/(z1*z2) - d*1.5*(1.0/(x2*x2) - 1.0/(z2*z2)))/
-        (3.0*formfactA*formfactA);
-    } else {
-      G4double x2 = x1 + d;
-      G4double z2 = z1 + d;
-      x = (1.0/x1 - 1.0/z1 + 1.0/x2 - 1.0/z2 - 2.0*log(z1*x2/(z2*x1))/d)/(s1*s1);
+    }
-    nucXSection += fac*targetZ*x;
+  }
-  //G4cout<<" cross(bn)= "<<nucXSection/barn<<" xsElec(bn)= "<<elecXSection/barn
-  //    << " Asc= " << screenZ << G4endl;
-  return nucXSection;
+}
 …
+{
   G4double kinEnergy = dp->GetKineticEnergy();
+  if(kinEnergy < lowEnergyLimit) return;
+  DefineMaterial(couple);
+  if(kinEnergy < lowEnergyLimit) { return; }
   SetupParticle(dp->GetDefinition());
-  SetupKinematic(kinEnergy, cutEnergy);
   //G4cout << "G4eCoulombScatteringModel::SampleSecondaries e(MeV)= "
   //     << kinEnergy << "  " << particle->GetParticleName()
 …
                                     kinEnergy,cutEnergy,kinEnergy);
+  SetupTarget(currentElement->GetZ(),kinEnergy);
+  G4double Z = currentElement->GetZ();
+  if(ComputeCrossSectionPerAtom(particle,kinEnergy, Z,
+                                kinEnergy, cutEnergy, kinEnergy) == 0.0)
+    { return; }
+  G4int iz = G4int(Z);
   G4int ia = SelectIsotopeNumber(currentElement);
+  targetMass = G4NucleiProperties::GetNuclearMass(ia, iz);
+  G4double cost = SampleCosineTheta();
+  G4double z1   = 1.0 - cost;
+  if(z1 < 0.0) return;
+  G4double sint = sqrt(z1*(1.0 + cost));
+  //G4cout<<"## Sampled sint= " << sint << "  Z= " << targetZ << " A= " << ia
+  //    << "  screenZ= " << screenZ << " cn= " << formfactA << G4endl;
+  G4double phi  = twopi * G4UniformRand();
+  G4double targetMass = G4NucleiProperties::GetNuclearMass(ia, iz);
+  G4ThreeVector newDirection =
+    wokvi->SampleSingleScattering(cosTetMinNuc, cosThetaMax, elecRatio);
+  G4double cost = newDirection.z();
   G4ThreeVector direction = dp->GetMomentumDirection();
-  G4ThreeVector newDirection(cos(phi)*sint,sin(phi)*sint,cost);
   newDirection.rotateUz(direction);
 …
   // recoil sampling assuming a small recoil
   // and first order correction to primary 4-momentum
   G4double q2   = 2*z1*mom2;
   G4double trec = q2/(sqrt(targetMass*targetMass + q2) + targetMass);
+  G4double mom2 = wokvi->GetMomentumSquare();
+  G4double trec = mom2*(1.0 - cost)/(targetMass + (mass + kinEnergy)*(1.0 + cost));
   G4double finalT = kinEnergy - trec;
   //G4cout<<"G4eCoulombScatteringModel: finalT= "<<finalT<<" Trec= "<<trec<<G4endl;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4eCoulombScatteringModel::SampleCosineTheta()
+{
+  G4double costm = cosTetMaxNuc2;
+  G4double formf = formfactA;
+  G4double prob  = 0.0;
+  G4double xs = CrossSectionPerAtom();
+  if(xs > 0.0) prob = elecXSection/xs;
+  // scattering off e or A?
+  if(G4UniformRand() < prob) {
+    costm = cosTetMaxElec2;
+    formf = 0.0;
+  }
+  /*
+  G4cout << "SampleCost: e(MeV)= " << tkin
+         << " 1-ctmaxN= " << 1. - cosTetMinNuc
+         << " 1-ctmax= " << 1. - costm
+         << " Z= " << targetZ
+         << G4endl;
+  */
+  if(costm >= cosTetMinNuc) return 2.0;
+  G4double x1 = 1. - cosTetMinNuc + screenZ;
+  G4double x2 = 1. - costm + screenZ;
+  G4double x3 = cosTetMinNuc - costm;
+  G4double grej, z1;
+  do {
+    z1 = x1*x2/(x1 + G4UniformRand()*x3) - screenZ;
+    grej = 1.0/(1.0 + formf*z1);
+  } while ( G4UniformRand() > grej*grej );
+  if(mass > MeV) {
+    if(G4UniformRand() > (1. - z1*0.5)/(1.0 + z1*sqrt(mom2)/targetMass)) {
+      return 2.0;
+    }
+  }
+  //G4cout << "z1= " << z1 << " cross= " << nucXSection/barn
+  //     << " crossE= " << elecXSection/barn << G4endl;
+  return 1.0 - z1;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4eMultipleScattering.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4eMultipleScattering.cc,v 1.10 2009/11/01 13:05:01 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4eMultipleScattering.cc,v 1.12 2010/06/04 09:11:02 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -----------------------------------------------------------------------------
 …
 #include "G4eMultipleScattering.hh"
 #include "G4UrbanMscModel92.hh"
+#include "G4UrbanMscModel93.hh"
 #include "G4MscStepLimitType.hh"
 #include "G4Electron.hh"
 …
 void G4eMultipleScattering::InitialiseProcess(const G4ParticleDefinition*)
+{
   if(isInitialized) return;
+  if(isInitialized) { return; }
   // initialisation of parameters - defaults for particles other
   // than ions can be overwritten by users
   G4VMscModel* mscUrban = new G4UrbanMscModel92();
+  G4VMscModel* mscUrban = new G4UrbanMscModel93();
   AddEmModel(1,mscUrban);
   isInitialized = true;
-  /*
-  G4cout << "G4eMultipleScattering::InitialiseProcess for "
-         << p->GetParticleName()
-         << " skin= " << Skin()
-         << " SA= " << steppingAlgorithm
-         << G4endl;
-  */
+}
 …
+{
   G4cout << "      RangeFactor= " << RangeFactor()
+         << ", step limit type: " << StepLimitType()
+         << ", lateralDisplacement: " << LateralDisplasmentFlag()
+         << ", skin= " << Skin()
+         << ", geomFactor= " << GeomFactor()
+         << G4endl;
+         << ", stepLimitType: " << StepLimitType()
+         << ", latDisplacement: " << LateralDisplasmentFlag();
+  if(StepLimitType() == fUseDistanceToBoundary) {
+    G4cout  << ", skin= " << Skin() << ", geomFactor= " << GeomFactor();
+  }
+  G4cout << G4endl;
+}

trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4hIonisation.cc,v 1.82 2009/02/20 12:06:37 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4hIonisation.cc,v 1.85 2010/06/04 09:22:14 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
 …
 // 14-01-07 use SetEmModel() and SetFluctModel() from G4VEnergyLossProcess (mma)
 // 12-09-08 Removed CorrectionsAlongStep (VI)
+// 27-05-10 Added G4ICRU73QOModel for anti-protons (VI)
 //
 // -------------------------------------------------------------------
 …
 #include "G4KaonPlus.hh"
 #include "G4KaonMinus.hh"
+#include "G4ICRU73QOModel.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 G4hIonisation::G4hIonisation(const G4String& name)
   : G4VEnergyLossProcess(name),
+    isInitialised(false),
+    nuclearStopping(true)
+{
+  //  SetStepFunction(0.2, 1.0*mm);
+    isInitialised(false)
+{
+  //SetStepFunction(0.2, 1.0*mm);
   //SetIntegral(true);
   //SetVerboseLevel(1);
 …
     const G4ParticleDefinition* theBaseParticle = 0;
     G4String pname = part->GetParticleName();
+    G4double q = part->GetPDGCharge();
     // standard base particles
 …
     else if(bpart == 0) {
+      if(part->GetPDGSpin() == 0.0)
+        if(part->GetPDGCharge() > 0.0 ) {
+          theBaseParticle = G4KaonPlus::KaonPlus();
+        } else {
+          theBaseParticle = G4KaonMinus::KaonMinus();
+        }
+      else if(part->GetPDGCharge() > 0.0) {
+        theBaseParticle = G4Proton::Proton();
+      if(part->GetPDGSpin() == 0.0) {
+        if(q > 0.0) { theBaseParticle = G4KaonPlus::KaonPlus(); }
+        else { theBaseParticle = G4KaonMinus::KaonMinus(); }
       } else {
+        theBaseParticle = G4AntiProton::AntiProton();
+        if(q > 0.0) { theBaseParticle = G4Proton::Proton(); }
+        else { theBaseParticle = G4AntiProton::AntiProton(); }
+      }
       // base particle defined by interface
     } else {
 …
     mass  = part->GetPDGMass();
     ratio = electron_mass_c2/mass;
+    if(mass < 900.*MeV) nuclearStopping = false;
+    if (!EmModel(1)) SetEmModel(new G4BraggModel(),1);
+    eth   = 2.0*MeV*mass/proton_mass_c2;
+    if (!EmModel(1)) {
+      if(q > 0.0) { SetEmModel(new G4BraggModel(),1); }
+      else { SetEmModel(new G4ICRU73QOModel(),1); }
+    }
     EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
     // model limit defined for protons
     eth = (EmModel(1)->HighEnergyLimit())*mass/proton_mass_c2;
+    //eth = (EmModel(1)->HighEnergyLimit())*mass/proton_mass_c2;
     EmModel(1)->SetHighEnergyLimit(eth);
     AddEmModel(1, EmModel(1), new G4IonFluctuations());
     if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
     if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);
+    if (!FluctModel()) { SetFluctModel(new G4UniversalFluctuation()); }
+    if (!EmModel(2)) { SetEmModel(new G4BetheBlochModel(),2); }
     EmModel(2)->SetLowEnergyLimit(eth);
     EmModel(2)->SetHighEnergyLimit(MaxKinEnergy());
 …
     isInitialised = true;
+  }
-  EmModel(1)->ActivateNuclearStopping(nuclearStopping);
-  EmModel(2)->ActivateNuclearStopping(nuclearStopping);
+}
 …
 void G4hIonisation::PrintInfo()
+{
+  if(EmModel(1) && EmModel(2)) {
+    G4cout << "      NuclearStopping= " << nuclearStopping
+           << G4endl;
+  }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4hIonisation::ActivateNuclearStopping(G4bool)
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc

-                      r1228
+                      r1315
 // ********************************************************************
 //
 // $Id: G4hMultipleScattering.cc,v 1.16 2009/11/01 13:05:01 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4hMultipleScattering.cc,v 1.18 2010/04/16 09:01:24 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -----------------------------------------------------------------------------
 …
 #include "G4hMultipleScattering.hh"
-#include "G4UrbanMscModel.hh"
 #include "G4UrbanMscModel90.hh"
 #include "G4MscStepLimitType.hh"
 …
   G4cout << "      RangeFactor= " << RangeFactor()
          << ", stepLimitType: " << StepLimitType()
+         << ", latDisplacement: " << LateralDisplasmentFlag()
+         << ", skin= " << Skin()
+         << ", geomFactor= " << GeomFactor()
+         << G4endl;
+         << ", latDisplacement: " << LateralDisplasmentFlag();
+  if(StepLimitType() == fUseDistanceToBoundary) {
+    G4cout  << ", skin= " << Skin() << ", geomFactor= " << GeomFactor();
+  }
+  G4cout << G4endl;
+}

trunk/source/processes/electromagnetic/standard/test/BremLPMTest.cc

r1199	r1315
25	25	//
26	26	// $Id: BremLPMTest.cc,v 1.2 2008/08/22 08:16:17 schaelic Exp $
27		// GEANT4 tag $Name: geant4-09-03-cand-01 $
	27	// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
28	28	//
29	29	// ------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/test/CrossSectionStd.cc

r1199	r1315
26	26	//
27	27	// $Id: CrossSectionStd.cc,v 1.5 2006/06/29 19:54:07 gunter Exp $
28		// GEANT4 tag $Name: geant4-09-03-cand-01 $
	28	// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
29	29	//
30	30	// ------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/test/CrossSectionV52.cc

r1199	r1315
26	26	//
27	27	// $Id: CrossSectionV52.cc,v 1.4 2006/06/29 19:54:09 gunter Exp $
28		// GEANT4 tag $Name: geant4-09-03-cand-01 $
	28	// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
29	29	//
30	30	// ------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/test/G4InitXscPAItest.cc

r1199	r1315
26	26	//
27	27	// $Id: G4InitXscPAItest.cc,v 1.6 2006/06/29 19:54:11 gunter Exp $
28		// GEANT4 tag $Name: geant4-09-03-cand-01 $
	28	// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/standard/test/G4PAIdNdxTest.cc

r1199	r1315
26	26	//
27	27	// $Id: G4PAIdNdxTest.cc,v 1.8 2008/04/14 14:53:39 grichine Exp $
28		// GEANT4 tag $Name: geant4-09-03-cand-01 $
	28	// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/standard/test/G4PAIxSectionTest.cc

-                      r1199
+                      r1315
 //
 //
 // $Id: G4PAIxSectionTest.cc,v 1.15 2006/06/29 19:54:15 gunter Exp $
 // GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4PAIxSectionTest.cc,v 1.16 2009/12/30 12:57:41 grichine Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
 …
  outFile <<k<<"\t"<< "  Material : " <<(*theMaterialTable)[k]->GetName() << G4endl ;
+  }
   G4String testName ;
+  G4String testName = "Argon" ;
   G4cout<<"Enter material name for test : "<<std::flush ;
   //  G4cin>>testName ;
 …
   for(k=0;k<numOfMaterials;k++)
+  for( k = 0; k < numOfMaterials; k++ )
+  {
     //    if((*theMaterialTable)[k]->GetName() != testName) continue ;
+    if((*theMaterialTable)[k]->GetName() != testName) continue ;
      outFile << "Material : " <<(*theMaterialTable)[k]->GetName() << G4endl ;
      G4cout << "Material : " <<(*theMaterialTable)[k]->GetName() << G4endl ;
 …
      //   G4PAIxSection testPAIproton(k,maxEnergyTransfer) ;
      kineticEnergy = 10.0*keV ;  // 110*MeV ;
+     kineticEnergy = 100.*MeV;  // 10.0*keV ;  // 110*MeV ;
      //     for(j=1;j<testPAIproton.GetNumberOfGammas();j++)

trunk/source/processes/electromagnetic/standard/test/PAIenergyLossTest.cc

r1199	r1315
26	26	//
27	27	// $Id: PAIenergyLossTest.cc,v 1.8 2006/06/29 19:54:17 gunter Exp $
28		// GEANT4 tag $Name: geant4-09-03-cand-01 $
	28	// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/standard/test/readBremLPM.py

r1199	r1315
1	1	# $Id: readBremLPM.py,v 1.2 2008/08/22 08:16:17 schaelic Exp $
2		# GEANT4 tag $Name: geant4-09-03-cand-01 $
	2	# GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
3	3	#
4	4	# works together with BremLPMTest.cc

trunk/source/processes/electromagnetic/standard/test/test90Ne10CO2pai.cc

-                      r1199
+                      r1315
 //
 //
 // $Id: test90Ne10CO2pai.cc,v 1.6 2008/12/18 13:01:40 gunter Exp $
 // GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: test90Ne10CO2pai.cc,v 1.8 2009/12/30 12:57:41 grichine Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
 …
 // 11.04.08, V. Grichine test of PAI predictions for 90% Ne + 10% CO2
 //                       ALICE TPC gas mixture
+// 8.12.09   V. Grichine update for T2K gas mixture
 #include "G4ios.hh"
 …
 int main()
+{
+   std::ofstream outFile("90Ne10CO2pai.dat", std::ios::out );
+  // std::ofstream outFile("90Ne10CO2pai.dat", std::ios::out );
+   std::ofstream outFile("e5GeVt2kPhilippe.dat", std::ios::out );
    outFile.setf( std::ios::scientific, std::ios::floatfield );
 …
+  a = 1.01*g/mole;
+  G4Isotope* ih1 = new G4Isotope("Hydrogen",iz=1,n=1,a);
+  a = 2.01*g/mole;
+  G4Isotope* ih2 = new G4Isotope("Deuterium",iz=1,n=2,a);
+  G4Element* elH = new G4Element(name="Hydrogen",symbol="H",2);
+  elH->AddIsotope(ih1,.999);
+  elH->AddIsotope(ih2,.001);
   a = 12.01*g/mole;
   G4Element* elC = new G4Element(name="Carbon",symbol="C", ez=6., a);
 …
   G4Element* elO = new G4Element(name="Oxygen",symbol="O", ez=8., a);
+  a = 19.00*g/mole;
+  G4Element* elF  = new G4Element(name="Fluorine", symbol="F", z=9., a);
+  a = 39.948*g/mole;
+  G4Element* elAr = new G4Element(name="Argon", symbol="Ar", z=18., a);
   // Neon as detector gas, STP
 …
   density *= 0.966/1.01325;
   G4cout<<"density of Ne857CO295N2T292 = "<<density*cm3/mg<<"  mg/cm3"<<G4endl;
+  // G4cout<<"density of Ne857CO295N2T292 = "<<density*cm3/mg<<"  mg/cm3"<<G4endl;
   G4Material* Ne857CO295N2T292 = new G4Material(name="Ne857CO295N2T292"  , density,
 …
+  // Ar as detector gas,STP
+  density = 1.7836*mg/cm3 ;       // STP
+  G4Material* Argon = new G4Material(name="Argon"  , density, ncomponents=1);
+  Argon->AddElement(elAr, 1);
+  /*
+  // iso-Butane (methylpropane), STP
+  density = 2.67*mg/cm3 ;
+  G4Material* isobutane = new G4Material(name="isoC4H10",density,nel=2) ;
+  isobutane->AddElement(elC,4) ;
+  isobutane->AddElement(elH,10) ;
+  // CF4 from ATLAS TRT estimation
+  G4double TRT_CF4_density = 3.9*mg/cm3;
+  G4Material* TRT_CF4 = new G4Material(name="TRT_CF4", TRT_CF4_density, nel=2,
+                                           kStateGas,293.15*kelvin,1.*atmosphere);
+  */
+  // Philippe Gros T2K mixture version
+  // Argon
+  /*
+  density     = 1.66*mg/cm3;
+  pressure    = 1*atmosphere;
+  temperature = 288.15*kelvin;
+  G4Material* Argon = new G4Material(name="Ar", // z=18., a=39.948*g/mole,
+                                     density, ncomponents=1); // kStateGas,temperature,pressure);
+  Argon->AddElement(elAr, 1);
+  */
+  // IsoButane
+  density     = 2.51*mg/cm3;
+  G4Material* Isobu = new G4Material(name="isoC4H10", z=34.,a=58.123*g/mole,
+                                       density, kStateGas,temperature,pressure);
+  // Tetrafluoromethane
+  density = 3.72*mg/cm3;
+  G4Material* FlMet = new
+  G4Material(name="CF4",z=42.,a=88.01*g/mole,density,kStateGas,temperature,pressure);
+  // Argon + 3% tetrafluoromethane  + 2% iso-butane
+  density = 1.748*mg/cm3;
+  G4Material* t2kGasMixture = new G4Material(name="t2kGasMixture", density, ncomponents=3);
+  t2kGasMixture->AddMaterial(Argon, fractionmass = 90.9*perCent);
+  t2kGasMixture->AddMaterial(FlMet, fractionmass = 6.3*perCent);
+  t2kGasMixture->AddMaterial(Isobu, fractionmass = 2.8*perCent);
   G4int i, j, jMax, k, numOfMaterials, iSan, nbOfElements, sanIndex, row;
   G4double maxEnergyTransfer, kineticEnergy;
 …
   // G4String testName = "N2";
+  G4String testName = "Ne10CO2";
+  // G4String testName = "Ne10CO2";
+  G4String testName = "t2kGasMixture";
+  // G4String testName = "Ar";
+  //  G4String testName = "Argon";
   // G4String testName = "Ne10CO2T293";
   // G4String testName = "Ne857CO295N2T292";
 …
+     kineticEnergy = 10.0*keV; // 100.*GeV;    // 10.0*keV;  // 110*MeV; // for proton
+     // kineticEnergy = 10.0*keV; // 100.*GeV;    // 10.0*keV;  // 110*MeV; // for proton
+     // kineticEnergy = 5*GeV; // for electrons
+     kineticEnergy = 5*GeV*proton_mass_c2/electron_mass_c2;
+     // kineticEnergy = 5*GeV;
      //     for(j=1;j<testPAIproton.GetNumberOfGammas();j++)
+     jMax = 70; // 70;
+     outFile<<jMax<<G4endl;
+     // jMax = 70; // 70;
+     jMax = 1; // 70;
+     // outFile<<jMax<<G4endl;
      for( j = 0; j < jMax; j++ )
+     {
        tau      = kineticEnergy/proton_mass_c2;
+       // tau      = kineticEnergy/electron_mass_c2;
        gamma    = tau +1.0;
        bg2      = tau*(tau + 2.0);
        bg = std::sqrt(bg2);
        beta2    = bg2/(gamma*gamma);
        // G4cout<<"bg = "<<bg<<";  b2 = "<<beta2<<G4endl<<G4endl;
+       G4cout<<"bg = "<<bg<<";  b2 = "<<beta2<<G4endl<<G4endl;
        rateMass = electron_mass_c2/proton_mass_c2;
        Tmax     = 2.0*electron_mass_c2*bg2
                    /(1.0+2.0*gamma*rateMass+rateMass*rateMass);
+       Tmax = 2.0*electron_mass_c2*bg2/(1.0+2.0*gamma*rateMass+rateMass*rateMass);
+       // Tmax = 0.5*kineticEnergy;
        Tkin = maxEnergyTransfer;
 …
+       }
        G4PAIxSection testPAIproton(k,Tkin,bg2);
+       /*
        G4cout
          //      << kineticEnergy/keV<<"\t\t"
 …
        //             <<testPAIproton.GetPAItable(1,j)*cm<<"\t\t"<<G4endl;
        /*
+       */
        outFile<<testPAIproton.GetSplineSize()-1<<G4endl;
 …
+       {
        outFile
+               << testPAIproton.GetSplineEnergy(i)/keV       << "\t"
+         //  << testPAIproton.GetIntegralCerenkov(i)*cm    << "\t"
+         //     << testPAIproton.GetIntegralMM(i)*cm    << "\t"
+         //     << testPAIproton.GetIntegralPlasmon(i)*cm     << "\t"
+         //      << testPAIproton.GetIntegralResonance(i)*cm   << "\t"
+               << testPAIproton.GetIntegralPAIxSection(i)*cm << "\t"
+               << G4endl;
+       G4cout
                << testPAIproton.GetSplineEnergy(i)/keV       << "\t"
                << testPAIproton.GetIntegralCerenkov(i)*cm    << "\t"
 …
                << testPAIproton.GetIntegralPAIxSection(i)*cm << "\t"
                << G4endl;
+       }
        */

Context Navigation

Legend:

Download in other formats: