Ignore:
Timestamp:
Nov 5, 2010, 3:45:55 PM (14 years ago)
Author:
garnier
Message:

update ti head

Location:
trunk/source/processes/electromagnetic/lowenergy/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/electromagnetic/lowenergy/include/G4DNAScreenedRutherfordElasticModel.hh

    r1337 r1340  
    2424// ********************************************************************
    2525//
    26 // $Id: G4DNAScreenedRutherfordElasticModel.hh,v 1.2 2010/01/07 18:10:19 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4DNAScreenedRutherfordElasticModel.hh,v 1.3 2010/09/08 13:39:11 sincerti Exp $
     27// GEANT4 tag $Name: emlowen-V09-03-54 $
    2828//
    2929
    … …  
    6767  G4double killBelowEnergy; 
    6868  G4double lowEnergyLimit; 
    69   G4double lowEnergyLimitOfModel; 
    70   G4double intermediateEnergyLimit;
     69  G4double intermediateEnergyLimit;
    7170  G4double highEnergyLimit;
    7271  G4bool isInitialised;

  • trunk/source/processes/electromagnetic/lowenergy/include/G4Generator2BN.hh

    r819 r1340  
    2424// ********************************************************************
    2525//
     26// $Id: G4Generator2BN.hh,v 1.4 2010/10/14 14:00:29 vnivanch Exp $
     27// GEANT4 tag $Name: emlowen-V09-03-54 $
    2628//
    2729// -------------------------------------------------------------------
    … …  
    6365public:
    6466
    65   G4Generator2BN(const G4String& name);
     67  G4Generator2BN(const G4String& name = "");
    6668
    67   ~G4Generator2BN();
     69  virtual ~G4Generator2BN();
    6870
    6971  G4double PolarAngle(const G4double initial_energy,

  • trunk/source/processes/electromagnetic/lowenergy/include/G4Generator2BS.hh

    r819 r1340  
    2424// ********************************************************************
    2525//
     26// $Id: G4Generator2BS.hh,v 1.5 2010/10/14 14:00:29 vnivanch Exp $
     27// GEANT4 tag $Name: emlowen-V09-03-54 $
    2628//
    2729// -------------------------------------------------------------------
    … …  
    3941//
    4042// Modifications:
    41 // 02 Jun 2003                           First implementation acording with new design
     43// 02 Jun 2003  First implementation acording with new design
     44// 12 Oct 2010  V.Ivanchenko moved RejectionFunction inline
    4245//               
    4346//
    4447// Class Description:
    4548//
    46 // Concrete class for Bremsstrahlung Angular Distribution Generation - 2BS Distribution
    47 // Further documentation available from http://www.ge.infn.it/geant4/lowE
     49// Concrete class for Bremsstrahlung Angular Distribution Generation
     50// 2BS Distribution
     51//
    4852
    4953// -------------------------------------------------------------------
    … …  
    5761#include "G4VBremAngularDistribution.hh"
    5862
     63class G4Pow;
     64
    5965class G4Generator2BS : public G4VBremAngularDistribution
    6066{
    … …  
    6268public:
    6369
    64   G4Generator2BS(const G4String& name);
     70  G4Generator2BS(const G4String& name="");
    6571
    66   ~G4Generator2BS();
     72  virtual ~G4Generator2BS();
    6773
    6874  G4double PolarAngle(const G4double initial_energy,
    … …  
    7480protected:
    7581
    76   G4double RejectionFunction(G4double value) const;
     82  inline G4double RejectionFunction(G4double value) const;
    7783
    7884private:
     85
    7986  G4double z;
    8087  G4double rejection_argument1, rejection_argument2, rejection_argument3;
    8188  G4double EnergyRatio;
    8289
     90  G4Pow* g4pow;
     91
    8392  // hide assignment operator
    84      G4Generator2BS & operator=(const  G4Generator2BS &right);
    85      G4Generator2BS(const  G4Generator2BS&);
     93  G4Generator2BS & operator=(const  G4Generator2BS &right);
     94  G4Generator2BS(const  G4Generator2BS&);
    8695
    8796};
    8897
     98inline G4double G4Generator2BS::RejectionFunction(G4double value) const
     99{
     100  G4double argument = (1+value)*(1+value);
     101  return (4+std::log(rejection_argument3+(z/argument)))*
     102    ((4*EnergyRatio*value/argument)-rejection_argument1)+rejection_argument2;
     103}
     104
    89105#endif
    90106

  • trunk/source/processes/electromagnetic/lowenergy/include/G4IonParametrisedLossModel.hh

    r1228 r1340  
    2424// ********************************************************************
    2525//
    26 //
     26// $Id: G4IonParametrisedLossModel.hh,v 1.8 2010/11/04 12:21:47 vnivanch Exp $
     27// GEANT4 tag $Name: emlowen-V09-03-54 $
    2728//
    2829// ===========================================================================
    … …  
    136137
    137138   // Function, which computes the mean energy transfer rate to delta rays
    138    G4double DeltaRayMeanEnergyTransferRate(
     139   inline G4double DeltaRayMeanEnergyTransferRate(
    139140                                 const G4Material*, // Target Material
    140141                                 const G4ParticleDefinition*, // Projectile
    … …  
    183184   // Function checking the applicability of physics tables to ion-material
    184185   // combinations (Note: the energy range of tables is not checked)
    185    LossTableList::iterator IsApplicable(
     186   inline LossTableList::iterator IsApplicable(
    186187                      const G4ParticleDefinition*,  // Projectile (ion)
    187188                      const G4Material*);           // Target material
    … …  
    208209   
    209210   // Function for setting energy loss limit for stopping power integration
    210    void SetEnergyLossLimit(G4double ionEnergyLossLimit);
     211   inline void SetEnergyLossLimit(G4double ionEnergyLossLimit);
    211212
    212213 protected:
     214
     215   virtual
    213216   G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
    214217                               G4double);   // Kinetic energy of projectile
    … …  
    231234
    232235   // Function, which updates parameters concering particle properties
    233    void UpdateCache(
     236   inline void UpdateCache(
    234237                  const G4ParticleDefinition*);  // Projectile (ion)
    235238 
    … …  
    287290
    288291   // Pointer to particle change object, which is used to set e.g. the
    289    // energy loss due to nuclear stopping
     292   // energy loss and secondary delta-electron
     293   // used indicating if model is initialized 
    290294   G4ParticleChangeForLoss* particleChangeLoss;
    291 
    292    // Flag indicating if model is initialized (i.e. if
    293    // G4ParticleChangeForLoss was created)
    294    G4bool modelIsInitialised;
    295295
    296296   // ######################################################################

  • trunk/source/processes/electromagnetic/lowenergy/include/G4IonParametrisedLossModel.icc

    r1196 r1340  
    2424// ********************************************************************
    2525//
    26 //
     26// $Id: G4IonParametrisedLossModel.icc,v 1.7 2010/11/04 12:21:47 vnivanch Exp $
     27// GEANT4 tag $Name: emlowen-V09-03-54 $
    2728//
    2829// ===========================================================================
    … …  
    4344//                               Minor bug fix in ComputeDEDXPerVolume (AL)
    4445//                20. 11. 2009 - Added set-method for energy loss limit (AL)
     46//                04. 11. 2010 - Moved virtual methods to the source (VI)
    4547//
    4648// Class description:
    … …  
    5456//
    5557// ===========================================================================
    56 
    5758
    5859inline G4double G4IonParametrisedLossModel::DeltaRayMeanEnergyTransferRate(
    … …  
    116117}
    117118
    118 
    119 inline
    120 G4double G4IonParametrisedLossModel::MaxSecondaryEnergy(
    121                              const G4ParticleDefinition* particle,
    122                              G4double kineticEnergy) {
    123 
    124   // ############## Maximum energy of secondaries ##########################
    125   // Function computes maximum energy of secondary electrons which are
    126   // released by an ion
    127   //
    128   // See Geant4 physics reference manual (version 9.1), section 9.1.1
    129   //
    130   // Ref.: W.M. Yao et al, Jour. of Phys. G 33 (2006) 1.
    131   //       C.Caso et al. (Part. Data Group), Europ. Phys. Jour. C 3 1 (1998).
    132   //       B. Rossi, High energy particles, New York, NY: Prentice-Hall (1952).
    133   //
    134   // (Implementation adapted from G4BraggIonModel)
    135 
    136   if(particle != cacheParticle) UpdateCache(particle);
    137 
    138   G4double tau  = kineticEnergy/cacheMass;
    139   G4double tmax = 2.0 * electron_mass_c2 * tau * (tau + 2.) /
    140                   (1. + 2.0 * (tau + 1.) * cacheElecMassRatio +
    141                   cacheElecMassRatio * cacheElecMassRatio);
    142 
    143   return tmax;
    144 }
    145 
    146 
    147119inline
    148120void G4IonParametrisedLossModel::UpdateCache(
    … …  
    155127  cacheChargeSquare = q * q;
    156128}
    157 
    158 
    159 inline
    160 G4double G4IonParametrisedLossModel::GetChargeSquareRatio(
    161                              const G4ParticleDefinition* particle,
    162                              const G4Material* material,
    163                              G4double kineticEnergy) {    // Kinetic energy
    164 
    165   G4double chargeSquareRatio = corrections ->
    166                                      EffectiveChargeSquareRatio(particle,
    167                                                                 material,
    168                                                                 kineticEnergy);
    169   corrFactor = chargeSquareRatio *
    170                        corrections -> EffectiveChargeCorrection(particle,
    171                                                                 material,
    172                                                                 kineticEnergy);
    173   return corrFactor;
    174 }
    175 
    176 
    177 inline
    178 G4double G4IonParametrisedLossModel::GetParticleCharge(
    179                              const G4ParticleDefinition* particle,
    180                              const G4Material* material,
    181                              G4double kineticEnergy) {   // Kinetic energy
    182 
    183   return corrections -> GetParticleCharge(particle, material, kineticEnergy);
    184 }
    185 
    186129
    187130inline
Note: See TracChangeset for help on using the changeset viewer.