Ignore:
Timestamp:
Nov 25, 2009, 5:13:58 PM (15 years ago)
Author:
garnier
Message:

update CVS release candidate geant4.9.3.01

Location:
trunk/source/processes/electromagnetic/standard/include
Files:
48 edited

Legend:

Unmodified
Added
Removed

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

    r1007 r1196  
    2525//
    2626// $Id: G4ASTARStopping.hh,v 1.6 2008/11/13 12:04:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828
    2929#ifndef G4ASTARStopping_h

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

    r1055 r1196  
    2525//
    2626// $Id: G4BetheBlochModel.hh,v 1.20 2009/04/23 17:44:43 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh

    r1007 r1196  
    2525//
    2626// $Id: G4BetheHeitlerModel.hh,v 1.6 2007/05/22 17:34:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh

    r1055 r1196  
    2525//
    2626// $Id: G4BohrFluctuations.hh,v 1.4 2009/02/19 19:17:50 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4BraggIonModel.hh,v 1.12 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

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

    r1055 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4BraggModel.hh,v 1.13 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     26// $Id: G4BraggModel.hh,v 1.14 2009/11/10 19:25:47 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
    … …  
    121121                                     const G4Material* mat,
    122122                                     G4double kineticEnergy);
    123 
     123  /*
    124124  // add correction to energy loss and compute non-ionizing energy loss
    125125  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
    … …  
    128128                                    G4double& niel,
    129129                                    G4double length);
     130  */
    130131
    131132protected:

  • trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh

    r1055 r1196  
    2626//
    2727// $Id: G4ComptonScattering.hh,v 1.21 2009/02/20 12:06:37 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//------------------ G4ComptonScattering physics process -----------------------

  • trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh

    r1007 r1196  
    2626//
    2727// $Id: G4ComptonScattering52.hh,v 1.4 2007/05/16 14:00:56 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//------------------ G4ComptonScattering52 physics process -----------------------

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

    r1055 r1196  
    2525//
    2626// $Id: G4CoulombScattering.hh,v 1.13 2009/05/07 18:41:45 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

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

    r1007 r1196  
    2525//
    2626// $Id: G4CoulombScatteringModel.hh,v 1.15 2008/07/31 13:11:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4GammaConversion.hh

    r1055 r1196  
    2626//
    2727// $Id: G4GammaConversion.hh,v 1.23 2009/02/20 12:06:37 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

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

    r1058 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4GoudsmitSaundersonMscModel.hh,v 1.1 2009/03/05 18:48:30 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     26// $Id: G4GoudsmitSaundersonMscModel.hh,v 1.2 2009/06/04 13:45:49 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

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

    r1058 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4GoudsmitSaundersonTable.hh,v 1.1 2009/03/05 18:48:30 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     26// $Id: G4GoudsmitSaundersonTable.hh,v 1.3 2009/06/18 18:43:09 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
    … …  
    6565  void LoadPDFandCPDFdata();
    6666
    67   static G4double PDF[76*11*320];
    68   static G4double CPDF[76*11*320];
     67  static G4double* PDF;
     68  static G4double* CPDF;
    6969
    7070};
     71
    7172//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    7273#endif

  • trunk/source/processes/electromagnetic/standard/include/G4HeatedKleinNishinaCompton.hh

    r1058 r1196  
    2525//
    2626// $Id: G4HeatedKleinNishinaCompton.hh,v 1.2 2009/04/11 13:05:03 grichine Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh

    r1007 r1196  
    2626//
    2727// $Id: G4InitXscPAI.hh,v 1.8 2006/06/29 19:50:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh

    r1055 r1196  
    2525//
    2626// $Id: G4IonFluctuations.hh,v 1.9 2009/02/19 19:17:50 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh

    r1007 r1196  
    2525//
    2626// $Id: G4KleinNishinaCompton.hh,v 1.9 2007/05/22 17:34:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4MollerBhabhaModel.hh,v 1.20 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4MscModel71.hh

    r1007 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MscModel71.hh,v 1.5 2007/05/22 17:34:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     26// $Id: G4MscModel71.hh,v 1.6 2009/11/01 13:04:12 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
    … …  
    8181
    8282  G4MscModel71(G4double&, G4double&, G4double&, G4double&, G4bool&,
    83              const G4String& nam = "MscUni");
     83               const G4String& nam = "UrbanMsc71");
    8484
    8585  virtual ~G4MscModel71();

  • trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh

    r1007 r1196  
    2525//
    2626// $Id: G4MultipleScattering.hh,v 1.36 2008/03/10 10:39:21 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -----------------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh

    r1007 r1196  
    2525//
    2626// $Id: G4MultipleScattering71.hh,v 1.6 2008/07/16 11:27:41 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//
    … …  
    5959//
    6060// $Id: G4MultipleScattering71.hh,v 1.6 2008/07/16 11:27:41 vnivanch Exp $
    61 // GEANT4 tag $Name: geant4-09-02 $
     61// GEANT4 tag $Name: geant4-09-03-cand-01 $
    6262
    6363// class description

  • trunk/source/processes/electromagnetic/standard/include/G4PAIModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4PAIModel.hh,v 1.22 2009/02/19 19:17:50 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4PAIPhotonModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4PAIPhotonModel.hh,v 1.12 2009/02/19 19:17:50 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4PAIxSection.hh

    r1007 r1196  
    2626//
    2727// $Id: G4PAIxSection.hh,v 1.15 2008/05/30 16:04:40 grichine Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/source/processes/electromagnetic/standard/include/G4PAIySection.hh

    r1007 r1196  
    2626//
    2727// $Id: G4PAIySection.hh,v 1.1 2007/10/01 17:45:14 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4PEEffectModel.hh,v 1.7 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

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

    r1007 r1196  
    2525//
    2626// $Id: G4PSTARStopping.hh,v 1.5 2008/11/13 12:04:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828
    2929#ifndef G4PSTARStopping_h

  • trunk/source/processes/electromagnetic/standard/include/G4PairProductionRelModel.hh

    r1058 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PairProductionRelModel.hh,v 1.2 2009/05/15 12:58:38 schaelic Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     26// $Id: G4PairProductionRelModel.hh,v 1.3 2009/06/04 13:45:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
    … …  
    285285  // k > 50 MeV
    286286  G4double FZ = 8.*(lnZ/3. + fCoulomb);
    287   return exp( (42.24-FZ)/8.368 ) + 0.952;
     287  return std::exp( (42.24-FZ)/8.368 ) + 0.952;
    288288}
    289289

  • trunk/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh

    r1055 r1196  
    2626//
    2727// $Id: G4PhotoElectricEffect.hh,v 1.25 2009/02/20 12:06:37 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh

    r1007 r1196  
    2626//
    2727// $Id: G4PolarizedComptonScattering.hh,v 1.9 2006/06/29 19:51:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// --------- G4PolarizedComptonScattering physics process ----------------------

  • trunk/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh

    r1055 r1196  
    2525//
    2626// $Id: G4UniversalFluctuation.hh,v 1.10 2009/03/19 14:15:17 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4UrbanMscModel.hh,v 1.35 2009/04/29 13:30:22 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel2.hh

    r1055 r1196  
    2525//
    2626// $Id: G4UrbanMscModel2.hh,v 1.17 2009/05/15 09:26:42 urban Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel90.hh

    r1055 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4UrbanMscModel90.hh,v 1.5 2009/04/10 16:34:56 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     26// $Id: G4UrbanMscModel90.hh,v 1.6 2009/11/01 13:04:12 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
    … …  
    7070public:
    7171
    72   G4UrbanMscModel90(const G4String& nam = "UrbanMscUni90");
     72  G4UrbanMscModel90(const G4String& nam = "UrbanMsc90");
    7373
    7474  virtual ~G4UrbanMscModel90();

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

    r1007 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4WaterStopping.hh,v 1.6 2008/09/09 09:30:58 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     26// $Id: G4WaterStopping.hh,v 1.7 2009/06/19 10:39:48 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828
    2929#ifndef G4WaterStopping_h
    … …  
    7777
    7878  G4bool   spline;
    79   G4int    Z[16];
    80   G4double A[16];
     79  G4int    Z[17];
     80  G4double A[17];
    8181  std::vector<G4LPhysicsFreeVector*>  dedx;
    8282};

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

    r1055 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4WentzelVIModel.hh,v 1.17 2009/05/10 16:09:29 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     26// $Id: G4WentzelVIModel.hh,v 1.21 2009/10/10 15:16:57 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
    … …  
    274274    if(iz > 99) iz = 99;
    275275    targetMass = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
    276     G4double m12  = mass*mass;
    277     G4double x    = 1.0 + mass/targetMass;
    278     kinFactor  = coeff*targetZ*chargeSquare*(1.0 +  m12/mom2)/mom2;
    279276    screenZ = ScreenRSquare[iz]/mom2;
    280     if(iz > 1) {
    281       screenZ *=(1.13 + 3.76*Z*Z*alpha2);
    282       kinFactor /= (x*x);
    283     }
    284     //if(iz > 1) screenZ *=(1.13 + std::min(0.5,3.76*Z*Z*invbeta2*alpha2));
     277    G4double meff = targetMass/(mass+targetMass);
     278    kinFactor = coeff*targetZ*chargeSquare*invbeta2/(mom2*meff*meff);
     279    screenZ *=(1.13 + std::min(1.0,3.76*Z*Z*invbeta2*alpha2));
     280    if(mass > MeV) { screenZ *= 2.0; }
    285281    formfactA = FormFactor[iz]*mom2;
    286282    cosTetMaxNuc2 = cosTetMaxNuc;

  • trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh

    r1055 r1196  
    2525//
    2626// $Id: G4eBremsstrahlung.hh,v 1.37 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4eBremsstrahlungModel.hh,v 1.26 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungRelModel.hh

    r1055 r1196  
    2525//
    2626// $Id: G4eBremsstrahlungRelModel.hh,v 1.11 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

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

    r1055 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4eCoulombScatteringModel.hh,v 1.43 2009/05/10 16:09:29 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     26// $Id: G4eCoulombScatteringModel.hh,v 1.49 2009/10/10 15:16:57 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
    … …  
    4646// 09.10.07 V.Ivanchenko reorganized methods, add cut dependence in scattering off e-
    4747// 09.06.08 V.Ivanchenko add SelectIsotope and sampling of the recoil ion
     48// 17.06.09 C.Consoalndi modified SetupTarget method - remove kinFactor
     49//                                     
    4850//
    4951// Class Description:
    … …  
    6769#include "globals.hh"
    6870#include "G4NistManager.hh"
     71#include <vector>
    6972
    7073class G4ParticleChangeForGamma;
    … …  
    129132  G4ParticleChangeForGamma* fParticleChange;
    130133  G4NistManager*            fNistManager;
    131   const G4DataVector*       currentCuts;
     134
     135  const std::vector<G4double>* pCuts;
    132136
    133137  const G4MaterialCutsCouple* currentCouple;
    … …  
    159163  G4double                  mom2;
    160164  G4double                  invbeta2;
    161   G4double                  kinFactor;
    162165  G4double                  etag;
    163166  G4double                  lowEnergyLimit;
    … …  
    237240    iz= G4int(Z);
    238241    if(iz > 99) iz = 99;
    239     targetMass   = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
    240     G4double m12 = mass*mass;
    241     G4double x   = 1.0 + mass/targetMass;
    242     kinFactor    = (1.0 +  m12/mom2)/mom2;
    243 
     242    targetMass = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
    244243    screenZ = ScreenRSquare[iz]/mom2;
    245     if(iz > 1) {
    246       screenZ *=(1.13 + 3.76*Z*Z*alpha2);
    247       kinFactor /= (x*x);
    248     }
    249     // if(iz > 1) screenZ *=(1.13 + std::min(0.5,3.76*Z*Z*invbeta2*alpha2));
     244    screenZ *=(1.13 + std::min(1.0,3.76*Z*Z*invbeta2*alpha2));
     245    if(mass > MeV) { screenZ *= 2.0; }
    250246    formfactA = FormFactor[iz]*mom2;
    251247    cosTetMaxNuc2 = cosTetMaxNuc;

  • trunk/source/processes/electromagnetic/standard/include/G4eIonisation.hh

    r1055 r1196  
    2525//
    2626// $Id: G4eIonisation.hh,v 1.36 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4eMultipleScattering.hh

    r1007 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4eMultipleScattering.hh,v 1.2 2008/03/11 12:03:43 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     26// $Id: G4eMultipleScattering.hh,v 1.3 2009/11/01 13:04:12 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -----------------------------------------------------------------------------
    … …  
    5959//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    6060
    61 class G4VMscModel;
    62 
    6361class G4eMultipleScattering : public G4VMultipleScattering
    6462
    … …  
    9290private:        // data members
    9391
    94   G4VMscModel* mscUrban;
    95 
    9692  G4double lambdalimit;
    9793  G4double dtrl;

  • trunk/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh

    r1007 r1196  
    2525//
    2626// $Id: G4eeToTwoGammaModel.hh,v 1.14 2007/05/23 08:47:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh

    r1055 r1196  
    2525//
    2626// $Id: G4eplusAnnihilation.hh,v 1.24 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

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

    r1055 r1196  
    2525//
    2626// $Id: G4hIonisation.hh,v 1.42 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh

    r1007 r1196  
    2424// ********************************************************************
    2525//
    26 // $Id: G4hMultipleScattering.hh,v 1.6 2008/05/09 08:23:44 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     26// $Id: G4hMultipleScattering.hh,v 1.8 2009/11/01 13:04:12 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -----------------------------------------------------------------------------
    … …  
    3939// Modifications:
    4040// 20.03.07 Remove local parameter skin (V.Ivanchenko)
     41// 04.07.09 Remove other local parameters (V.Ivanchenko)
    4142//
    4243//
    … …  
    6061//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    6162
    62 class G4VMscModel;
    63 
    6463class G4hMultipleScattering : public G4VMultipleScattering
    6564
    … …  
    7776  void PrintInfo();
    7877
    79   // geom. step length distribution should be sampled or not
    80   void Setsamplez(G4bool value) { samplez = value;};
    81 
    82   // to reduce the energy/step dependence
    83   void Setdtrl(G4double value) { dtrl = value;};
    84 
    85   // 'soften' step limitation above lambdalimit
    86   void SetLambdalimit(G4double value) { lambdalimit = value;};
    87 
    88   // The function overloads the corresponding function of the base
    89   // class.It limits the step near to boundaries only
    90   // and invokes the method GetMscContinuousStepLimit at every step.
    91   G4double AlongStepGetPhysicalInteractionLength(
    92                                             const G4Track&,
    93                                             G4double  previousStepSize,
    94                                             G4double  currentMinimalStep,
    95                                             G4double& currentSafety,
    96                                             G4GPILSelection* selection);
    97 
    9878protected:
    9979
    … …  
    10383private:        // data members
    10484
    105   G4VMscModel* mscUrban;
    106 
    107   G4double lambdalimit;
    108   G4double dtrl;
    109 
    110   G4bool   samplez;
    11185  G4bool   isInitialized;
    112   G4bool   isIon;
    11386
    11487};

  • trunk/source/processes/electromagnetic/standard/include/G4ionGasIonisation.hh

    r1007 r1196  
    2525//
    2626// $Id: G4ionGasIonisation.hh,v 1.4 2008/09/12 16:26:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/standard/include/G4ionIonisation.hh

    r1055 r1196  
    2525//
    2626// $Id: G4ionIonisation.hh,v 1.57 2009/02/20 12:06:37 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// -------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.