Ignore:
Timestamp:
Dec 22, 2010, 3:52:27 PM (15 years ago)
Author:
garnier
Message:

geant4 tag 9.4

Location:
trunk/source/processes/hadronic/models/de_excitation/util/include
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4AlphaCoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4AlphaCoulombBarrier.hh,v 1.5 2010/11/15 12:44:06 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42   G4AlphaCoulombBarrier() : G4CoulombBarrier(4,2) {};
    43   ~G4AlphaCoulombBarrier() {};
     42
     43  G4AlphaCoulombBarrier();
     44  virtual ~G4AlphaCoulombBarrier();
    4445
    4546private:
    … …  
    5051  G4bool operator!=(const G4AlphaCoulombBarrier & right) const;
    5152 
    52 private:
    53 
    54   virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
    55 
     53  virtual G4double BarrierPenetrationFactor(G4double aZ) const;
    5654
    5755};

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4ConstantLevelDensityParameter.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4ConstantLevelDensityParameter.hh,v 1.6 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations (photon evaporation)
    … …  
    4040{
    4141public:
    42   G4ConstantLevelDensityParameter() :  EvapLevelDensityParameter(0.125*(1./MeV)) {};
     42
     43  G4ConstantLevelDensityParameter();
    4344  virtual ~G4ConstantLevelDensityParameter();
    4445
    … …  
    5657private:
    5758
    58   const G4double EvapLevelDensityParameter;
     59  G4double EvapLevelDensityParameter;
    5960
    6061};

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CookPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CookPairingCorrections.hh,v 1.6 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5252  ~G4CookPairingCorrections();
    5353
    54   G4double GetParingCorrection(const G4int A, const G4int Z) const {
     54  G4double GetParingCorrection(G4int A, G4int Z) const {
    5555    return GetPairingZ(Z) + GetPairingN(A-Z);
    5656  }
    5757
    5858
    59   G4double GetPairingZ(const G4int Z) const {
     59  G4double GetPairingZ(G4int Z) const {
    6060    if ( this->IsInTableThisZ(Z) ) return PairingZTable[Z-ZTableMin]*MeV;
    6161    else {

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CookShellCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CookShellCorrections.hh,v 1.6 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5454  ~G4CookShellCorrections();
    5555
    56   G4double GetShellCorrection(const G4int A, const G4int Z) const
     56  G4double GetShellCorrection(G4int A, G4int Z) const
    5757  {
    5858    return GetShellZ(Z) + GetShellN(A-Z);

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CoulombBarrier.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CoulombBarrier.hh,v 1.8 2010/11/15 13:23:27 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Dec 1999)
     32//
     33// 15-11-2010 V.Ivanchenko cleanup
    3234
    3335#ifndef G4CoulombBarrier_h
    … …  
    4143class G4CoulombBarrier : public G4VCoulombBarrier
    4244{
     45
    4346public:
     47
    4448  G4CoulombBarrier();
    45   G4CoulombBarrier(const G4int anA,const G4int aZ);
     49  G4CoulombBarrier(G4int anA, G4int aZ);
    4650  virtual ~G4CoulombBarrier();
     51
     52  G4double GetCoulombBarrier(G4int ARes, G4int ZRes, G4double U) const;
    4753
    4854private:
    … …  
    5359  G4bool operator!=(const G4CoulombBarrier & right) const;
    5460 
    55 public:
    56   G4double GetCoulombBarrier(const G4int ARes, const G4int ZRes,
    57                              const G4double U) const;
     61  virtual G4double BarrierPenetrationFactor(G4double ) const;
    5862
    59 
    60 private:
    61 
    62   virtual G4double BarrierPenetrationFactor(const G4double ) const {return 1.0;}
    63 
    64   virtual G4double CalcCompoundRadius(const G4double ZRes) const
     63  inline G4double CalcCompoundRadius(const G4double ZRes) const
    6564  {
    6665    return 2.173*fermi*(1.0+0.006103*static_cast<G4double>(GetZ())*ZRes)/

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4DeuteronCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4DeuteronCoulombBarrier.hh,v 1.6 2010/11/15 12:44:06 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2928//
    3029// Hadronic Process: Nuclear De-excitations
    … …  
    4039{
    4140public:
    42         G4DeuteronCoulombBarrier() : G4CoulombBarrier(2,1) {}
    43         ~G4DeuteronCoulombBarrier() {}
     41
     42  G4DeuteronCoulombBarrier();
     43  virtual ~G4DeuteronCoulombBarrier();
    4444
    4545private:
    46         G4DeuteronCoulombBarrier(const G4DeuteronCoulombBarrier & right);
    4746
    48         const G4DeuteronCoulombBarrier & operator=(const G4DeuteronCoulombBarrier & right);
    49         G4bool operator==(const G4DeuteronCoulombBarrier & right) const;
    50         G4bool operator!=(const G4DeuteronCoulombBarrier & right) const;
     47  G4DeuteronCoulombBarrier(const G4DeuteronCoulombBarrier & right);
     48
     49  const G4DeuteronCoulombBarrier & operator=(const G4DeuteronCoulombBarrier & right);
     50  G4bool operator==(const G4DeuteronCoulombBarrier & right) const;
     51  G4bool operator!=(const G4DeuteronCoulombBarrier & right) const;
    5152 
    52 private:
    53 
    54         G4double BarrierPenetrationFactor(const G4double aZ) const;
     53  virtual G4double BarrierPenetrationFactor(G4double aZ) const;
    5554
    5655};

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4EvaporationLevelDensityParameter.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4EvaporationLevelDensityParameter.hh,v 1.6 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5858 
    5959public:
    60   G4double LevelDensityParameter(const G4int A,const G4int Z,const G4double U) const;
     60
     61  G4double LevelDensityParameter(G4int A, G4int Z, G4double U) const;
    6162
    6263private:
    6364
    64   G4double ShellCorrection(const G4int Z, const G4int N) const
     65  inline G4double ShellCorrection(G4int Z, G4int N) const
    6566  {
    6667    G4CameronTruranHilfShellCorrections* SPtr = G4CameronTruranHilfShellCorrections::GetInstance();

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4He3CoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4He3CoulombBarrier.hh,v 1.6 2010/11/15 12:44:06 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42         G4He3CoulombBarrier() : G4CoulombBarrier(3,2) {}
    43         ~G4He3CoulombBarrier() {}
     42
     43  G4He3CoulombBarrier();
     44  virtual ~G4He3CoulombBarrier();
    4445
    4546private:
    46         G4He3CoulombBarrier(const G4He3CoulombBarrier & right);
    4747
    48         const G4He3CoulombBarrier & operator=(const G4He3CoulombBarrier & right);
    49         G4bool operator==(const G4He3CoulombBarrier & right) const;
    50         G4bool operator!=(const G4He3CoulombBarrier & right) const;
     48  G4He3CoulombBarrier(const G4He3CoulombBarrier & right);
     49
     50  const G4He3CoulombBarrier & operator=(const G4He3CoulombBarrier & right);
     51  G4bool operator==(const G4He3CoulombBarrier & right) const;
     52  G4bool operator!=(const G4He3CoulombBarrier & right) const;
    5153 
    52 private:
    53 
    54         G4double BarrierPenetrationFactor(const G4double aZ) const;
     54  virtual G4double BarrierPenetrationFactor(G4double aZ) const;
    5555
    5656};

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4NeutronCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4NeutronCoulombBarrier.hh,v 1.6 2010/11/15 12:44:06 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2928//
    3029// Hadronic Process: Nuclear De-excitations
    … …  
    4039{
    4140public:
    42         G4NeutronCoulombBarrier() : G4CoulombBarrier(1,0) {}
    43         ~G4NeutronCoulombBarrier() {}
     41
     42  G4NeutronCoulombBarrier();
     43  virtual ~G4NeutronCoulombBarrier();
    4444
    4545private:
    46         G4NeutronCoulombBarrier(const G4NeutronCoulombBarrier & right);
     46  G4NeutronCoulombBarrier(const G4NeutronCoulombBarrier & right);
    4747
    48         const G4NeutronCoulombBarrier & operator=(const G4NeutronCoulombBarrier & right);
    49         G4bool operator==(const G4NeutronCoulombBarrier & right) const;
    50         G4bool operator!=(const G4NeutronCoulombBarrier & right) const;
     48  const G4NeutronCoulombBarrier & operator=(const G4NeutronCoulombBarrier & right);
     49  G4bool operator==(const G4NeutronCoulombBarrier & right) const;
     50  G4bool operator!=(const G4NeutronCoulombBarrier & right) const;
    5151 
    52 private:
    53 
    54         G4double BarrierPenetrationFactor(const G4double ) const
    55         { return 1.0;}
    56 
    5752};
    5853

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4PairingCorrection.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4PairingCorrection.hh,v 1.8 2010/11/15 12:39:27 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    3838#include "G4CameronGilbertPairingCorrections.hh"
    3939//#include "G4CameronTruranHilfPairingCorrections.hh"
    40 
    4140
    4241class G4PairingCorrection
    … …  
    5554  ~G4PairingCorrection();
    5655
    57   G4double GetPairingCorrection(const G4int A, const G4int Z) const
    58   {
    59     G4double PCorrection = 0.0;
    60     const G4int N = A - Z;
    61     if (theCookPairingCorrections->IsInTableThisN(N) &&
    62         theCookPairingCorrections->IsInTableThisZ(Z))
    63       PCorrection = theCookPairingCorrections->GetParingCorrection(A,Z);
    64     else if (theCameronGilbertPairingCorrections->IsInTableThisN(N) &&
    65              theCameronGilbertPairingCorrections->IsInTableThisZ(Z))
    66       PCorrection = theCameronGilbertPairingCorrections->GetPairingCorrection(A,Z);
    67     else {
    68       const G4double PairingConstant = 12.0*MeV;
    69       G4double Pair = (1.0 - static_cast<G4double>(Z) + 2.0*(Z/2)) + (1.0 - static_cast<G4double>(N) + 2.0*(N/2));
    70       PCorrection = Pair*PairingConstant/std::sqrt(static_cast<G4double>(A));
    71     }
    72     return std::max(PCorrection,0.0);
    73   }
     56  G4double GetPairingCorrection(G4int A, G4int Z) const;
    7457
    75 
    76   G4double GetFissionPairingCorrection(const G4int A, const G4int Z) const
    77   {
    78     const G4double PairingConstant = 14.0*MeV;
    79     const G4int N = A - Z;
    80     G4double Pair = (1.0 - static_cast<G4double>(Z) + 2.0*(Z/2)) + (1.0 - static_cast<G4double>(N) + 2.0*(N/2));
    81     G4double PCorrection = Pair*PairingConstant/std::sqrt(static_cast<G4double>(A));
    82     return PCorrection;
    83   }
     58  G4double GetFissionPairingCorrection(G4int A, G4int Z) const;
    8459
    8560private:
    … …  
    8762 
    8863  G4CookPairingCorrections* theCookPairingCorrections;
    89 //  G4CameronTruranHilfPairingCorrections* theCameronTruranHilfPairingCorrections;
     64  //  G4CameronTruranHilfPairingCorrections* theCameronTruranHilfPairingCorrections;
    9065  G4CameronGilbertPairingCorrections* theCameronGilbertPairingCorrections;
    9166

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4ProtonCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4ProtonCoulombBarrier.hh,v 1.6 2010/11/15 12:44:06 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42         G4ProtonCoulombBarrier() : G4CoulombBarrier(1,1) {}
    43         ~G4ProtonCoulombBarrier() {}
     42
     43  G4ProtonCoulombBarrier();
     44  virtual ~G4ProtonCoulombBarrier();
    4445
    4546private:
    46         G4ProtonCoulombBarrier(const G4ProtonCoulombBarrier & right);
     47  G4ProtonCoulombBarrier(const G4ProtonCoulombBarrier & right);
    4748
    48         const G4ProtonCoulombBarrier & operator=(const G4ProtonCoulombBarrier & right);
    49         G4bool operator==(const G4ProtonCoulombBarrier & right) const;
    50         G4bool operator!=(const G4ProtonCoulombBarrier & right) const;
     49  const G4ProtonCoulombBarrier & operator=(const G4ProtonCoulombBarrier & right);
     50  G4bool operator==(const G4ProtonCoulombBarrier & right) const;
     51  G4bool operator!=(const G4ProtonCoulombBarrier & right) const;
    5152 
    5253private:
    5354
    54         G4double BarrierPenetrationFactor(const G4double aZ) const;
     55  virtual G4double BarrierPenetrationFactor(G4double aZ) const;
    5556
    5657};

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4TritonCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4TritonCoulombBarrier.hh,v 1.6 2010/11/15 12:44:06 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42     G4TritonCoulombBarrier() : G4CoulombBarrier(3,1) {}
    43     ~G4TritonCoulombBarrier() {}
     42
     43  G4TritonCoulombBarrier();
     44  virtual ~G4TritonCoulombBarrier();
    4445
    4546private:
    … …  
    5051    G4bool operator!=(const G4TritonCoulombBarrier & right) const;
    5152 
    52 private:
    53 
    54     G4double BarrierPenetrationFactor(const G4double aZ) const;
     53    virtual G4double BarrierPenetrationFactor(G4double aZ) const;
    5554
    5655};

  • trunk/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4VEmissionProbability.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4VEmissionProbability.hh,v 1.7 2010/11/15 20:30:26 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4343#include "globals.hh"
    4444#include "G4Fragment.hh"
     45#include "G4PairingCorrection.hh"
     46#include "G4EvaporationLevelDensityParameter.hh"
     47#include "G4Pow.hh"
    4548
    4649class G4VEmissionProbability
    … …  
    6467  // for superimposed Coulomb Barrier for inverse cross sections       
    6568  inline void UseSICB(G4bool use) { useSICB = use; }   
     69
    6670protected:
    67    G4int OPTxs;
    68    G4bool useSICB;
     71  G4int OPTxs;
     72  G4bool useSICB;
     73
     74  G4Pow*   fG4pow;
     75  G4PairingCorrection* fPairCorr;
     76  G4EvaporationLevelDensityParameter * theEvapLDPptr;
    6977
    7078};
Note: See TracChangeset for help on using the changeset viewer.