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

geant4 tag 9.4

Location:
trunk/source/processes/hadronic/models/de_excitation/util
Files:
32 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};

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4AlphaCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4AlphaCoulombBarrier.cc,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
    … …  
    3535#include "G4HadronicException.hh"
    3636
    37 G4AlphaCoulombBarrier::G4AlphaCoulombBarrier(const G4AlphaCoulombBarrier & ) : G4CoulombBarrier()
    38 {
    39     throw G4HadronicException(__FILE__, __LINE__, "G4AlphaCoulombBarrier::copy_constructor meant to not be accessable.");
    40 }
     37G4AlphaCoulombBarrier::G4AlphaCoulombBarrier() : G4CoulombBarrier(4,2) {}
     38G4AlphaCoulombBarrier::~G4AlphaCoulombBarrier() {}
    4139
    4240
    43 const G4AlphaCoulombBarrier & G4AlphaCoulombBarrier::operator=(const G4AlphaCoulombBarrier & )
    44 {
    45     throw G4HadronicException(__FILE__, __LINE__, "G4AlphaCoulombBarrier::operator= meant to not be accessable.");
    46     return *this;
    47 }
    48 
    49 G4bool G4AlphaCoulombBarrier::operator==(const G4AlphaCoulombBarrier & ) const
    50 {
    51     return false;
    52 }
    53 
    54 G4bool G4AlphaCoulombBarrier::operator!=(const G4AlphaCoulombBarrier & ) const
    55 {
    56     return true;
    57 }
    58 
    59 
    60 G4double G4AlphaCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
     41G4double G4AlphaCoulombBarrier::BarrierPenetrationFactor(G4double aZ) const
    6142{
    6243    // Data comes from

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CameronGilbertPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CameronGilbertPairingCorrections.cc,v 1.7 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7979G4CameronGilbertPairingCorrections* G4CameronGilbertPairingCorrections::GetInstance()
    8080{
    81   static G4CameronGilbertPairingCorrections theCorrections;
    82   if (!theInstance)  { theInstance = &theCorrections; }
     81  if (!theInstance)  {
     82    static G4CameronGilbertPairingCorrections theCorrections;
     83    theInstance = &theCorrections;
     84  }
    8385  return theInstance;
    8486}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CameronGilbertShellCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CameronGilbertShellCorrections.cc,v 1.7 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7979G4CameronGilbertShellCorrections* G4CameronGilbertShellCorrections::GetInstance()
    8080{
    81   static G4CameronGilbertShellCorrections theCorrections;
    82   if (!theInstance)  { theInstance = &theCorrections; }
     81  if (!theInstance)  {
     82    static G4CameronGilbertShellCorrections theCorrections;
     83    theInstance = &theCorrections;
     84  }
    8385  return theInstance;
    8486}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CameronShellPlusPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CameronShellPlusPairingCorrections.cc,v 1.7 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    9797G4CameronShellPlusPairingCorrections* G4CameronShellPlusPairingCorrections::GetInstance()
    9898{
    99   static G4CameronShellPlusPairingCorrections theCorrections;
    100   if (!theInstance)  { theInstance = &theCorrections; }
     99  if (!theInstance)  {
     100    static G4CameronShellPlusPairingCorrections theCorrections;
     101    theInstance = &theCorrections;
     102  }
    101103  return theInstance;
    102104}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.7 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    8484G4CameronTruranHilfPairingCorrections* G4CameronTruranHilfPairingCorrections::GetInstance()
    8585{
    86   static G4CameronTruranHilfPairingCorrections theCorrections;
    87   if (!theInstance)  { theInstance = &theCorrections; }
     86  if (!theInstance)  {
     87    static G4CameronTruranHilfPairingCorrections theCorrections;
     88    theInstance = &theCorrections;
     89  }
    8890  return theInstance;
    8991}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CameronTruranHilfShellCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CameronTruranHilfShellCorrections.cc,v 1.7 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    8686G4CameronTruranHilfShellCorrections* G4CameronTruranHilfShellCorrections::GetInstance()
    8787{
    88   static G4CameronTruranHilfShellCorrections theCorrections;
    89   if (!theInstance)  { theInstance = &theCorrections; }
     88  if (!theInstance)  {
     89    static G4CameronTruranHilfShellCorrections theCorrections;
     90    theInstance = &theCorrections;
     91  }
    9092  return theInstance;
    9193}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4ConstantLevelDensityParameter.cc

    r1055 r1347  
    3535#include "G4HadronicException.hh"
    3636
    37 G4ConstantLevelDensityParameter::
    38 G4ConstantLevelDensityParameter(const G4ConstantLevelDensityParameter& ) :
    39  G4VLevelDensityParameter(),  EvapLevelDensityParameter(0.125*(1./MeV))
    40 {
    41   throw G4HadronicException(__FILE__, __LINE__, "G4ConstantLevelDensityParameter::copy_constructor meant to not be accessable");
    42 }
     37G4ConstantLevelDensityParameter::G4ConstantLevelDensityParameter()
     38  :  EvapLevelDensityParameter(0.125/MeV)
     39{}
    4340
    4441G4ConstantLevelDensityParameter::~G4ConstantLevelDensityParameter()
    45 {
    46 }
     42{}
    4743
    48 const G4ConstantLevelDensityParameter & G4ConstantLevelDensityParameter::
    49 operator=(const G4ConstantLevelDensityParameter &)
    50 {
    51   throw G4HadronicException(__FILE__, __LINE__, "G4ConstantLevelDensityParameter::operator= meant to not be accessable");
    52   return *this;
    53 }
    54 
    55 
    56 G4bool G4ConstantLevelDensityParameter::operator==(const G4ConstantLevelDensityParameter &) const
    57 {
    58   return false;
    59 }
    60 
    61 G4bool G4ConstantLevelDensityParameter::operator!=(const G4ConstantLevelDensityParameter &) const
    62 {
    63   return true;
    64 }
    65 
    66 
    67 
    68 
    69 

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CookPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CookPairingCorrections.cc,v 1.7 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7878G4CookPairingCorrections* G4CookPairingCorrections::GetInstance()
    7979{
    80   static G4CookPairingCorrections theCorrections;
    81   if (!theInstance)  { theInstance = &theCorrections; }
     80  if (!theInstance)  {
     81    static G4CookPairingCorrections theCorrections;
     82    theInstance = &theCorrections;
     83  }
    8284  return theInstance;
    8385}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CookShellCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CookShellCorrections.cc,v 1.7 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7878G4CookShellCorrections* G4CookShellCorrections::GetInstance()
    7979{
    80   static G4CookShellCorrections theCorrections;
    81   if (!theInstance)  { theInstance = &theCorrections; }
     80  if (!theInstance) {
     81    static G4CookShellCorrections theCorrections;
     82    theInstance = &theCorrections;
     83  }
    8284  return theInstance;
    8385}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4CoulombBarrier.cc,v 1.9 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4CoulombBarrier.cc,v 1.10 2010/11/15 12:44:06 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2928//
    3029// Hadronic Process: Nuclear De-excitations
    3130// by V. Lara (Dec 1999)
    32 // modified barrier by JMQ (test30) by 14-11-07
     31//
     32// 14-11-2007 modified barrier by JMQ (test30)
     33// 15-11-2010 V.Ivanchenko use G4Pow and cleanup
    3334
    3435#include "G4CoulombBarrier.hh"
    3536#include "G4HadronicException.hh"
     37#include "G4Pow.hh"
    3638#include <sstream>
    3739
    38 G4CoulombBarrier::G4CoulombBarrier()
    39   : G4VCoulombBarrier(1,0) {}
     40G4CoulombBarrier::G4CoulombBarrier(): G4VCoulombBarrier(1,0)
     41{}
    4042
    41 G4CoulombBarrier::G4CoulombBarrier(const G4int anA,const G4int aZ)
    42   : G4VCoulombBarrier(anA,aZ) {}
     43G4CoulombBarrier::G4CoulombBarrier(G4int anA, G4int aZ)
     44  : G4VCoulombBarrier(anA,aZ)
     45{}
    4346
    44 G4CoulombBarrier::~G4CoulombBarrier() {}
     47G4CoulombBarrier::~G4CoulombBarrier()
     48{}
    4549
    46 G4CoulombBarrier::G4CoulombBarrier(const G4CoulombBarrier & ) : G4VCoulombBarrier()
     50G4double G4CoulombBarrier::BarrierPenetrationFactor(G4double ) const
    4751{
    48   throw G4HadronicException(__FILE__, __LINE__, "G4CoulombBarrier::copy_constructor meant to not be accessable.");
     52  return 1.0;
    4953}
    50 
    51 
    52 const G4CoulombBarrier & G4CoulombBarrier::operator=(const G4CoulombBarrier & )
    53 {
    54   throw G4HadronicException(__FILE__, __LINE__, "G4CoulombBarrier::operator= meant to not be accessable.");
    55   return *this;
    56 }
    57 
    58 G4bool G4CoulombBarrier::operator==(const G4CoulombBarrier & ) const
    59 {
    60   return false;
    61 }
    62 
    63 G4bool G4CoulombBarrier::operator!=(const G4CoulombBarrier & ) const
    64 {
    65   return true;
    66 }
    67 
    68 
    6954
    7055G4double G4CoulombBarrier::GetCoulombBarrier(const G4int ARes, const G4int ZRes, const G4double) const
    … …  
    8570  } else {
    8671
    87 // JMQ: old coulomb barrier commented since it does not agree with Dostrovski's prescription
    88 // and too low  barriers are obtained (for protons at least)
    89 // calculation of K penetration factor is correct
    90 //    G4double CompoundRadius = CalcCompoundRadius(static_cast<G4double>(ZRes));
    91 //    Barrier = elm_coupling/CompoundRadius * static_cast<G4double>(GetZ())*static_cast<G4double>(ZRes)/
    92 //      (std::pow(static_cast<G4double>(GetA()),1./3.) + std::pow(static_cast<G4double>(ARes),1./3.));
     72    // JMQ: old coulomb barrier commented since it does not agree with Dostrovski's prescription
     73    // and too low  barriers are obtained (for protons at least)
     74    // calculation of K penetration factor is correct
     75    //    G4double CompoundRadius = CalcCompoundRadius(static_cast<G4double>(ZRes));
     76    //    Barrier = elm_coupling/CompoundRadius * static_cast<G4double>(GetZ())*static_cast<G4double>(ZRes)/
     77    //      (std::pow(static_cast<G4double>(GetA()),1./3.) + std::pow(static_cast<G4double>(ARes),1./3.));
    9378
    94 ///New coulomb Barrier according to original Dostrovski's paper
    95    G4double rho=1.2*fermi;
    96    if(GetA()==1 && GetZ()==1){  rho=0.0;} 
     79    ///New coulomb Barrier according to original Dostrovski's paper
     80    G4double rho=1.2*fermi;
     81    if(GetA()==1 && GetZ()==1){  rho=0.0;} 
    9782
    98    G4double RN=1.5*fermi; 
    99 Barrier=elm_coupling* static_cast<G4double>(GetZ())*static_cast<G4double>(ZRes)/(RN*std::pow(static_cast<G4double>(ARes),1./3.)+rho);
     83    G4double RN=1.5*fermi; 
     84    // VI cleanup
     85    Barrier=elm_coupling*(GetZ()*ZRes)/(RN * G4Pow::GetInstance()->Z13(ARes) + rho);
    10086
    10187    // Barrier penetration coeficient
    10288    G4double K = BarrierPenetrationFactor(ZRes);
    10389
    104 
    10590    Barrier *= K;
    106 //
    107 
    108        
    109 
    11091               
    111 // JMQ : the following statement has unknown origin and dimensionally is meaningless( energy divided by mass number in argument of sqrt function). Energy dependence of Coulomb barrier penetrability should be included in proper way (if needed..)
    112 //   Barrier /= (1.0 + std::sqrt(U/(2.0*static_cast<G4double>(ARes))));
    113 //
     92    // JMQ : the following statement has unknown origin and dimensionally is meaningless( energy divided by mass number in argument of sqrt function). Energy dependence of Coulomb barrier penetrability should be included in proper way (if needed..)
     93    //   Barrier /= (1.0 + std::sqrt(U/(2.0*static_cast<G4double>(ARes))));
     94    //
    11495  }
    11596  return Barrier;

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4DeuteronCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4DeuteronCoulombBarrier.cc,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
    … …  
    3433#include "G4DeuteronCoulombBarrier.hh"
    3534
    36 G4DeuteronCoulombBarrier::G4DeuteronCoulombBarrier(const G4DeuteronCoulombBarrier & ) : G4CoulombBarrier()
    37 {
    38     throw G4HadronicException(__FILE__, __LINE__, "G4DeuteronCoulombBarrier::copy_constructor meant to not be accessable.");
    39 }
     35G4DeuteronCoulombBarrier::G4DeuteronCoulombBarrier() : G4CoulombBarrier(2,1) {}
     36G4DeuteronCoulombBarrier::~G4DeuteronCoulombBarrier() {}
    4037
    41 
    42 const G4DeuteronCoulombBarrier & G4DeuteronCoulombBarrier::operator=(const G4DeuteronCoulombBarrier & )
    43 {
    44     throw G4HadronicException(__FILE__, __LINE__, "G4DeuteronCoulombBarrier::operator= meant to not be accessable.");
    45     return *this;
    46 }
    47 
    48 G4bool G4DeuteronCoulombBarrier::operator==(const G4DeuteronCoulombBarrier & ) const
    49 {
    50     return false;
    51 }
    52 
    53 G4bool G4DeuteronCoulombBarrier::operator!=(const G4DeuteronCoulombBarrier & ) const
    54 {
    55     return true;
    56 }
    57 
    58 
    59 G4double G4DeuteronCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
     38G4double G4DeuteronCoulombBarrier::BarrierPenetrationFactor(G4double aZ) const
    6039{
    6140    // Data comes from

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4EvaporationLevelDensityParameter.cc,v 1.9 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4EvaporationLevelDensityParameter.cc,v 1.10 2010/11/15 16:09:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4242
    4343//JMQ 17-04-08 these are not used at present in G4Evaporation
    44 const G4double G4EvaporationLevelDensityParameter::ConstEvapLevelDensityParameter = 0.125*(1./MeV);
    45 //const G4double G4EvaporationLevelDensityParameter::ConstEvapLevelDensityParameter= 0.0769231*(1./MeV);
    46 const G4double G4EvaporationLevelDensityParameter::alpha = 0.072*(1./MeV);
    47 const G4double G4EvaporationLevelDensityParameter::beta = 0.257*(1./MeV);
    48 const G4double G4EvaporationLevelDensityParameter::gamma = 0.059*(1./MeV);
     44const G4double G4EvaporationLevelDensityParameter::ConstEvapLevelDensityParameter = 0.125/MeV;
     45//const G4double G4EvaporationLevelDensityParameter::ConstEvapLevelDensityParameter= 0.0769231/MeV;
     46const G4double G4EvaporationLevelDensityParameter::alpha = 0.072/MeV;
     47const G4double G4EvaporationLevelDensityParameter::beta = 0.257/MeV;
     48const G4double G4EvaporationLevelDensityParameter::gamma = 0.059/MeV;
    4949const G4double G4EvaporationLevelDensityParameter::Bs = 1.0;
    5050
    … …  
    5252G4EvaporationLevelDensityParameter::~G4EvaporationLevelDensityParameter() {}
    5353
    54 G4EvaporationLevelDensityParameter::
    55 G4EvaporationLevelDensityParameter(const G4EvaporationLevelDensityParameter &) : G4VLevelDensityParameter()
    56 {
    57     throw G4HadronicException(__FILE__, __LINE__, "G4EvaporationLevelDensityParameter::copy_constructor meant to not be accessable");
    58 }
    59 
    60 
    61 const G4EvaporationLevelDensityParameter & G4EvaporationLevelDensityParameter::
    62 operator=(const G4EvaporationLevelDensityParameter &)
    63 {
    64     throw G4HadronicException(__FILE__, __LINE__, "G4EvaporationLevelDensityParameter::operator= meant to not be accessable");
    65     return *this;
    66 }
    67 
    68 
    69 G4bool G4EvaporationLevelDensityParameter::operator==(const G4EvaporationLevelDensityParameter &) const
    70 {
    71     return false;
    72 }
    73 
    74 G4bool G4EvaporationLevelDensityParameter::operator!=(const G4EvaporationLevelDensityParameter &) const
    75 {
    76     return true;
    77 }
    78 
    79 G4double G4EvaporationLevelDensityParameter::LevelDensityParameter(const G4int A,const G4int,
    80                                                                    const G4double) const
     54G4double
     55G4EvaporationLevelDensityParameter::LevelDensityParameter(G4int A, G4int, G4double) const
    8156//JMQ (Apr .08) this is the method used in G4Evaporation
    8257{
    8358
    84 //JMQ 25/04/08  a=A/10 according to original Gudima's prescription
    85  G4double a=static_cast<G4double>(A)/10.;
    86     return a;
     59  //JMQ 25/04/08  a=A/10 according to original Gudima's prescription
     60  G4double a=static_cast<G4double>(A)/10.;
     61  return a;
    8762//
    8863

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4He3CoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4He3CoulombBarrier.cc,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
    … …  
    3434#include "G4He3CoulombBarrier.hh"
    3535
    36 G4He3CoulombBarrier::G4He3CoulombBarrier(const G4He3CoulombBarrier & ) : G4CoulombBarrier()
    37 {
    38     throw G4HadronicException(__FILE__, __LINE__, "G4He3CoulombBarrier::copy_constructor meant to not be accessable.");
    39 }
     36G4He3CoulombBarrier::G4He3CoulombBarrier() : G4CoulombBarrier(3,2) {}
     37G4He3CoulombBarrier::~G4He3CoulombBarrier() {}
    4038
    41 
    42 const G4He3CoulombBarrier & G4He3CoulombBarrier::operator=(const G4He3CoulombBarrier & )
    43 {
    44     throw G4HadronicException(__FILE__, __LINE__, "G4He3CoulombBarrier::operator= meant to not be accessable.");
    45     return *this;
    46 }
    47 
    48 G4bool G4He3CoulombBarrier::operator==(const G4He3CoulombBarrier & ) const
    49 {
    50     return false;
    51 }
    52 
    53 G4bool G4He3CoulombBarrier::operator!=(const G4He3CoulombBarrier & ) const
    54 {
    55     return true;
    56 }
    57 
    58 
    59 G4double G4He3CoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
     39G4double G4He3CoulombBarrier::BarrierPenetrationFactor(G4double aZ) const
    6040{
    6141    // Data comes from

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4NeutronCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4NeutronCoulombBarrier.cc,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
    … …  
    3434#include "G4NeutronCoulombBarrier.hh"
    3535
    36 G4NeutronCoulombBarrier::G4NeutronCoulombBarrier(const G4NeutronCoulombBarrier & ) : G4CoulombBarrier()
    37 {
    38     throw G4HadronicException(__FILE__, __LINE__, "G4NeutronCoulombBarrier::copy_constructor meant to not be accessable.");
    39 }
     36G4NeutronCoulombBarrier::G4NeutronCoulombBarrier() : G4CoulombBarrier(1,0) {}
     37G4NeutronCoulombBarrier::~G4NeutronCoulombBarrier() {}
    4038
    4139
    42 const G4NeutronCoulombBarrier & G4NeutronCoulombBarrier::operator=(const G4NeutronCoulombBarrier & )
    43 {
    44     throw G4HadronicException(__FILE__, __LINE__, "G4NeutronCoulombBarrier::operator= meant to not be accessable.");
    45     return *this;
    46 }
    47 
    48 G4bool G4NeutronCoulombBarrier::operator==(const G4NeutronCoulombBarrier & ) const
    49 {
    50     return false;
    51 }
    52 
    53 G4bool G4NeutronCoulombBarrier::operator!=(const G4NeutronCoulombBarrier & ) const
    54 {
    55     return true;
    56 }
    57 

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4PairingCorrection.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4PairingCorrection.cc,v 1.8 2010/11/15 12:41:58 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2928//
    3029// Hadronic Process: Nuclear De-excitations
    … …  
    3332
    3433#include "G4PairingCorrection.hh"
    35 
    3634
    3735G4PairingCorrection* G4PairingCorrection::theInstance = 0;
    … …  
    4947G4PairingCorrection* G4PairingCorrection::GetInstance()
    5048{
    51   static G4PairingCorrection theCorrections;
    52   if (!theInstance)  { theInstance = &theCorrections; }
     49  if (!theInstance)  {
     50    static G4PairingCorrection theCorrections;
     51    theInstance = &theCorrections;
     52  }
    5353  return theInstance;
    5454}   
     55
     56G4double G4PairingCorrection::GetPairingCorrection(G4int A, G4int Z) const
     57{
     58  G4double PCorrection = 0.0;
     59  G4int N = A - Z;
     60  if (theCookPairingCorrections->IsInTableThisN(N) &&
     61      theCookPairingCorrections->IsInTableThisZ(Z))
     62    PCorrection = theCookPairingCorrections->GetParingCorrection(A,Z);
     63  else if (theCameronGilbertPairingCorrections->IsInTableThisN(N) &&
     64           theCameronGilbertPairingCorrections->IsInTableThisZ(Z))
     65    PCorrection = theCameronGilbertPairingCorrections->GetPairingCorrection(A,Z);
     66  else {
     67    const G4double PairingConstant = 12.0*MeV;
     68    G4double Pair = (1 - Z + 2*(Z/2)) + (1 - N + 2*(N/2));
     69    PCorrection = Pair*PairingConstant/std::sqrt(static_cast<G4double>(A));
     70  }
     71  return std::max(PCorrection,0.0);
     72}
     73
     74
     75G4double G4PairingCorrection::GetFissionPairingCorrection(G4int A, G4int Z) const
     76{
     77  const G4double PairingConstant = 14.0*MeV;
     78  G4int N = A - Z;
     79  G4double Pair = (1 - Z + 2*(Z/2)) + (1 - N + 2*(N/2));
     80  G4double PCorrection = Pair*PairingConstant/std::sqrt(static_cast<G4double>(A));
     81  return PCorrection;
     82}

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4ProtonCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4ProtonCoulombBarrier.cc,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
    … …  
    3433#include "G4ProtonCoulombBarrier.hh"
    3534
    36 G4ProtonCoulombBarrier::G4ProtonCoulombBarrier(const G4ProtonCoulombBarrier & ) : G4CoulombBarrier()
    37 {
    38     throw G4HadronicException(__FILE__, __LINE__, "G4ProtonCoulombBarrier::copy_constructor meant to not be accessable.");
    39 }
     35G4ProtonCoulombBarrier::G4ProtonCoulombBarrier() : G4CoulombBarrier(1,1)
     36{}
    4037
     38G4ProtonCoulombBarrier::~G4ProtonCoulombBarrier()
     39{}
    4140
    42 const G4ProtonCoulombBarrier & G4ProtonCoulombBarrier::operator=(const G4ProtonCoulombBarrier & )
    43 {
    44     throw G4HadronicException(__FILE__, __LINE__, "G4ProtonCoulombBarrier::operator= meant to not be accessable.");
    45     return *this;
    46 }
    47 
    48 G4bool G4ProtonCoulombBarrier::operator==(const G4ProtonCoulombBarrier & ) const
    49 {
    50     return false;
    51 }
    52 
    53 G4bool G4ProtonCoulombBarrier::operator!=(const G4ProtonCoulombBarrier & ) const
    54 {
    55     return true;
    56 }
    57 
    58 
    59 G4double G4ProtonCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
     41G4double G4ProtonCoulombBarrier::BarrierPenetrationFactor(G4double aZ) const
    6042{
    6143    // Data comes from

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4ShellCorrection.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4ShellCorrection.cc,v 1.7 2010/11/15 11:47:18 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2928//
    3029// Hadronic Process: Nuclear De-excitations
    3130// by V. Lara
    32 
     31//
    3332
    3433#include "G4ShellCorrection.hh"
    … …  
    5049G4ShellCorrection* G4ShellCorrection::GetInstance()
    5150{
    52   static G4ShellCorrection theCorrections;
    53   if (!theInstance)  { theInstance = &theCorrections; }
     51  if (!theInstance)  {
     52    static G4ShellCorrection theCorrections;
     53    theInstance = &theCorrections;
     54  }
    5455  return theInstance;
    5556}   

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4TritonCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     26// $Id: G4TritonCoulombBarrier.cc,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
    … …  
    3433#include "G4TritonCoulombBarrier.hh"
    3534
    36 G4TritonCoulombBarrier::G4TritonCoulombBarrier(const G4TritonCoulombBarrier & ) : G4CoulombBarrier()
    37 {
    38     throw G4HadronicException(__FILE__, __LINE__, "G4TritonCoulombBarrier::copy_constructor meant to not be accessable.");
    39 }
     35G4TritonCoulombBarrier::G4TritonCoulombBarrier() : G4CoulombBarrier(3,1) {}
     36G4TritonCoulombBarrier::~G4TritonCoulombBarrier() {}
    4037
    41 
    42 const G4TritonCoulombBarrier & G4TritonCoulombBarrier::operator=(const G4TritonCoulombBarrier & )
    43 {
    44     throw G4HadronicException(__FILE__, __LINE__, "G4TritonCoulombBarrier::operator= meant to not be accessable.");
    45     return *this;
    46 }
    47 
    48 G4bool G4TritonCoulombBarrier::operator==(const G4TritonCoulombBarrier & ) const
    49 {
    50     return false;
    51 }
    52 
    53 G4bool G4TritonCoulombBarrier::operator!=(const G4TritonCoulombBarrier & ) const
    54 {
    55     return true;
    56 }
    57 
    58 
    59 G4double G4TritonCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
     38G4double G4TritonCoulombBarrier::BarrierPenetrationFactor(G4double aZ) const
    6039{
    6140    // Data comes from

  • trunk/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4VEmissionProbability.cc,v 1.7 2009/03/04 11:05:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4VEmissionProbability.cc,v 1.10 2010/11/15 20:30:26 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Oct 1998)
    3232//
    33 
     33// Modifications:
     34// 28.10.2010 V.Ivanchenko defined members in constructor and cleaned up
    3435
    3536#include "G4VEmissionProbability.hh"
    36 #include "G4HadronicException.hh"
    3737
    38 
    39 G4VEmissionProbability::G4VEmissionProbability() {}
    40 G4VEmissionProbability::~G4VEmissionProbability() {}
    41 
    42 
    43 G4VEmissionProbability::G4VEmissionProbability(const G4VEmissionProbability &)
     38G4VEmissionProbability::G4VEmissionProbability():OPTxs(3),useSICB(false)
    4439{
    45     throw G4HadronicException(__FILE__, __LINE__, "G4VEmissionProbability::copy_constructor meant to not be accessable");
     40  fG4pow = G4Pow::GetInstance();
     41  fPairCorr = G4PairingCorrection::GetInstance();
     42  theEvapLDPptr = new G4EvaporationLevelDensityParameter;
    4643}
    4744
    48 
    49 const G4VEmissionProbability & G4VEmissionProbability::operator=(const G4VEmissionProbability &)
     45G4VEmissionProbability::~G4VEmissionProbability()
    5046{
    51     throw G4HadronicException(__FILE__, __LINE__, "G4VEmissionProbability::operator= meant to not be accessable");
    52     return *this;
     47  delete theEvapLDPptr;
    5348}
    54 
    55 
    56 G4bool G4VEmissionProbability::operator==(const G4VEmissionProbability &) const
    57 {
    58     return false;
    59 }
    60 
    61 G4bool G4VEmissionProbability::operator!=(const G4VEmissionProbability &) const
    62 {
    63     return true;
    64 }
    65 
    66 
    67 
    68 
    69 
Note: See TracChangeset for help on using the changeset viewer.