Ignore:
Timestamp:
May 28, 2009, 4:26:57 PM (15 years ago)
Author:
garnier
Message:

maj sur la beta de geant 4.9.3

Location:
trunk/source/processes/hadronic/models/de_excitation
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/de_excitation/History

    r1007 r1055  
    1414     * Please list in reverse chronological order (last date on top)
    1515     ---------------------------------------------------------------
     16
     1713 March 2009 Vladimir Ivanchenko (hadr-deex-V09-02-09)
     18---------------------------------------------------------
     19- G4CompetitiveFission - fixed 4-momentum balance by using direct Lorentz
     20                         computations (JMQ);
     21                       - use G4 units (VI).
     22
     2312 March 2009 Alexander Howard (hadr-deex-V09-02-08)
     24----------------------------------------------------
     25- Added Tatsumi's fixes ( G4GEMProbability.cc and G4GEMChannel.cc ) to GEM
     26  on top of patch9-02 ("hadr-deex-V09-02-07" and "hadr-deex-util-V09-02-00")
     27
     2804 March 2009 Gabriele Cosmo
     29----------------------------
     30- Fixed leaks in singleton classes in the 'util' module. Corrected wherever
     31  needed inlining of constructors/destructors for base classes and usage of
     32  virtual specification. Corresponds to tag "hadr-deex-util-V09-02-00".
     33
     3415 February 2009 Vladimir Ivanchenko (hadr-deex-V09-02-07)
     35---------------------------------------------------------
     36- G4EvaporationProbability - hbar_Plank substituted by hbarc (JMQ fix)
     37- G4FissionProbability - fixed forgotten parenthesis (JMQ fix)
     38
     3913 February 2009 Vladimir Ivanchenko (hadr-deex-V09-02-06)
     40---------------------------------------------------------
     41- Jose Manuel Quesada change the shape of probabilities (back to 9.2)
     42  for d, t, He3, alpha near the Coulomb barrier
     43
     4412 February 2009 Vladimir Ivanchenko (hadr-deex-V09-02-05)
     45---------------------------------------------------------
     46- Jose Manuel Quesada change the shape of probabilities
     47  for d, t, He3, alpha near the Coulomb barrier
     48
     4911 February 2009 Vladimir Ivanchenko (hadr-deex-V09-02-04)
     50---------------------------------------------------------
     51- Jose Manuel Quesada set default OPT=3 back for all particles
     52  and add smearing of Coloumb barriers of d, t, he3, alpha
     53
     5410 February 2009 Vladimir Ivanchenko (hadr-deex-V09-02-03)
     55---------------------------------------------------------
     56- Exclude updated G4VGammaDeexcitation
     57
     5810 February 2009 Vladimir Ivanchenko (hadr-deex-V09-02-02)
     59---------------------------------------------------------
     60- Jose Manuel Quesada set default OPT=3 for evaporation of protons
     61  and neutrons and OPT=1 for deuterons, tritons, alpha and He3
     62
     6310 February 2009 Vladimir Ivanchenko (hadr-deex-V09-02-01)
     64---------------------------------------------------------
     65- Miguel Cortes added extra protection to G4VGammaDeexcitation
     66
     6727 January 2009 Vladimir Ivanchenko (hadr-deex-V09-02-00)
     68--------------------------------------------------------
     69- Miguel Cortes fix of Lorentz transformation in G4VGammaDeexcitation,
     70  which provides Doppler broading of gamma lines
    1671
    177209 December 2008 Alexander Howard (hadr-deex-V09-01-25)

  • trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationProbability.cc

    r1007 r1055  
    104104//OPT=3,4 Kalbach's parameterization
    105105//
    106  G4double G4AlphaEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
     106G4double G4AlphaEvaporationProbability::CrossSection(const  G4Fragment & fragment,
     107                                                     const  G4double K)
    107108{
    108109  theA=GetA();
    … …  
    117118 
    118119  if (OPTxs==0) {std::ostringstream errOs;
    119     errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (Alpha's)!!"  <<G4endl;
     120    errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (Alpha's)!!" 
     121          <<G4endl;
    120122    throw G4HadronicException(__FILE__, __LINE__, errOs.str());
    121123    return 0.;}
    … …  
    203205  G4double      ra=1.20;
    204206 
    205   ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     207  //JMQ 13/02/09 increase of reduced radius to lower the barrier
     208  // ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     209  ec = 1.44 * theZ * ResidualZ / (1.7*ResidualAthrd+ra);
    206210  ecsq = ec * ec;
    207211  p = p0 + p1/ec + p2/ecsq;
    … …  
    226230 
    227231  if (elab <= ec) { //start for E<Ec
    228     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
     232    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
    229233  }           //end for E<Ec
    230234  else {           //start for E>Ec

  • trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationProbability.cc

    r1007 r1055  
    106106//OPT=3,4 Kalbach's parameterization
    107107//
    108  G4double G4DeuteronEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
     108G4double G4DeuteronEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
    109109{
    110110       theA=GetA();
    … …  
    205205  G4double      ra=0.80;
    206206       
    207   ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     207  //JMQ 13/02/09 increase of reduced radius to lower the barrier
     208  // ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     209  ec = 1.44 * theZ * ResidualZ / (1.7*ResidualAthrd+ra);
    208210  ecsq = ec * ec;
    209211  p = p0 + p1/ec + p2/ecsq;
    … …  
    226228  elab = K * FragmentA / ResidualA;
    227229  sig = 0.;
    228  
     230
    229231  if (elab <= ec) { //start for E<Ec
    230     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
     232    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
    231233  }           //end for E<Ec
    232234  else {           //start for E>Ec

  • trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationProbability.cc

    r1007 r1055  
    3333// JMQ (06 September 2008) Also external choices have been added for
    3434// superimposed Coulomb barrier (if useSICB is set true, by default is false)
    35 
     35//
     36// JMQ (14 february 2009) bug fixed in emission width: hbarc instead of hbar_Planck in the denominator
     37//
    3638#include <iostream>
    3739using namespace std;
    … …  
    138140
    139141
    140 // if Coulomb barrier cutoff is superimposed for all cross sections the limit is the Coulomb Barrier
    141         G4double LowerLimit= limit;
    142 
    143 //  MaximalKineticEnergy: asimptotic value (already accounted for in G4EvaporationChannel)     
    144 
    145   G4double UpperLimit = MaximalKineticEnergy;
    146 
    147 
    148   G4double Width = IntegrateEmissionProbability(fragment,LowerLimit,UpperLimit);
    149 
    150   return Width;
     142   // if Coulomb barrier cutoff is superimposed for all cross sections the limit is the Coulomb Barrier
     143   G4double LowerLimit= limit;
     144
     145   //  MaximalKineticEnergy: asimptotic value (already accounted for in G4EvaporationChannel)     
     146
     147   G4double UpperLimit = MaximalKineticEnergy;
     148
     149
     150   G4double Width = IntegrateEmissionProbability(fragment,LowerLimit,UpperLimit);
     151
     152   return Width;
    151153 } else{
    152154   std::ostringstream errOs;
    … …  
    244246  if (E1<0.) return 0.;
    245247
    246 
    247 //Without 1/hbar_Panck remains as a width
    248 
    249   G4double  Prob=Gamma*ParticleMass/((pi*hbar_Planck)*(pi*hbar_Planck)*std::exp(2*std::sqrt(a0*E0)))*K*CrossSection(fragment,K)*std::exp(2*std::sqrt(a1*E1))*millibarn;
    250 
    251 return Prob;
    252 
    253 }
    254 
    255 
     248  //JMQ 14/02/09 BUG fixed: hbarc should be in the denominator instead of hbar_Planck
     249  //Without 1/hbar_Panck remains as a width
     250  //  G4double  Prob=Gamma*ParticleMass/((pi*hbar_Planck)*(pi*hbar_Planck)*
     251  //std::exp(2*std::sqrt(a0*E0)))*K*CrossSection(fragment,K)*std::exp(2*std::sqrt(a1*E1))*millibarn;
     252
     253  G4double Prob=Gamma*ParticleMass/((pi*hbarc)*(pi*hbarc)*std::exp(2*std::sqrt(a0*E0)))
     254    *K*CrossSection(fragment,K)*std::exp(2*std::sqrt(a1*E1))*millibarn;
     255
     256  return Prob;
     257}
     258
     259

  • trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationProbability.cc

    r1007 r1055  
    104104//OPT=3,4 Kalbach's parameterization
    105105//
    106  G4double G4He3EvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
     106G4double G4He3EvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
    107107{
    108108       theA=GetA();
    … …  
    117117
    118118       if (OPTxs==0) {std::ostringstream errOs;
    119          errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (He3's)!!"  <<G4endl;
     119         errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (He3's)!!" 
     120               <<G4endl;
    120121         throw G4HadronicException(__FILE__, __LINE__, errOs.str());
    121122         return 0.;}
    … …  
    200201  G4double      ra=0.80;
    201202 
    202   ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     203  //JMQ 13/02/09 increase of reduced radius to lower the barrier
     204  // ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     205  ec = 1.44 * theZ * ResidualZ / (1.7*ResidualAthrd+ra);
    203206  ecsq = ec * ec;
    204207  p = p0 + p1/ec + p2/ecsq;
    … …  
    221224  elab = K * FragmentA / ResidualA;
    222225  sig = 0.;
    223  
     226
    224227  if (elab <= ec) { //start for E<Ec
    225     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
     228    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
    226229  }           //end for E<Ec
    227230  else {           //start for E>Ec

  • trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationProbability.cc

    r1007 r1055  
    100100//OPT=3,4 Kalbach's parameterization
    101101//
    102  G4double G4TritonEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
     102G4double G4TritonEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
    103103{
    104104  theA=GetA();
    … …  
    113113 
    114114  if (OPTxs==0) {std::ostringstream errOs;
    115     errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (tritons)!!"  <<G4endl;
     115    errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (tritons)!!" 
     116          <<G4endl;
    116117    throw G4HadronicException(__FILE__, __LINE__, errOs.str());
    117118    return 0.;}
    … …  
    198199  G4double      ra=0.80;
    199200       
    200   ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     201  //JMQ 13/02/09 increase of reduced radius to lower the barrier
     202  // ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
     203  ec = 1.44 * theZ * ResidualZ / (1.7*ResidualAthrd+ra);
    201204  ecsq = ec * ec;
    202205  p = p0 + p1/ec + p2/ecsq;
    … …  
    219222  elab = K * FragmentA / ResidualA;
    220223  sig = 0.;
    221  
     224
    222225  if (elab <= ec) { //start for E<Ec
    223     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
     226    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
    224227  }           //end for E<Ec
    225   else {           //start for E>Ec
     228  else {           //start for E>Ec 
    226229    sig = (landa*elab+mu+nu/elab) * signor;
    227230    geom = 0.;

  • trunk/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CompetitiveFission.cc,v 1.9 2008/11/20 13:46:27 dennis Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CompetitiveFission.cc,v 1.11 2009/03/13 18:57:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Oct 1998)
     32//
     33// J. M. Quesada (March 2009). Bugs fixed:
     34//          - Full relativistic calculation (Lorentz boosts)
     35//          - Fission pairing energy is included in fragment excitation energies
     36// Now Energy and momentum are conserved in fission
    3237
    3338#include "G4CompetitiveFission.hh"
    … …  
    127132    }
    128133
     134
    129135    // Atomic Mass of Nucleus (in MeV)
    130     G4double M = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A)/MeV;
     136    G4double M = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A);
     137
    131138    // Nucleus Momentum
    132139    G4LorentzVector theNucleusMomentum = theNucleus.GetMomentum();
    … …  
    147154    G4double FragmentsExcitationEnergy = 0.0;
    148155    G4double FragmentsKineticEnergy = 0.0;
     156
     157    //JMQ 04/03/09 It will be used latter to fix the bug in energy conservation
     158    G4double FissionPairingEnergy=G4PairingCorrection::GetInstance()->GetFissionPairingCorrection(A,Z);
    149159
    150160    G4int Trials = 0;
    … …  
    162172        if (A2 < 1 || Z2 < 0)
    163173            throw G4HadronicException(__FILE__, __LINE__, "G4CompetitiveFission::BreakUp: Can't define second fragment! ");
    164         M2 = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z2,A2)/MeV;
     174
     175        M2 = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z2,A2);
    165176
    166177        // Check that fragment masses are less or equal than total energy
    167         //  if (M1 + M2 > theNucleusMomentum.mag()/MeV)
    168         if (M1 + M2 > theNucleusMomentum.e()/MeV)
     178        if (M1 + M2 > theNucleusMomentum.e())
    169179            throw G4HadronicException(__FILE__, __LINE__, "G4CompetitiveFission::BreakUp: Fragments Mass > Total Energy");
    170180
    171181        // Maximal Kinetic Energy (available energy for fragments)
    172         //  G4double Tmax = theNucleusMomentum.mag()/MeV - M1 - M2;
    173182        G4double Tmax = M + U - M1 - M2;
    174183
    … …  
    180189   
    181190        // Excitation Energy
    182         FragmentsExcitationEnergy = Tmax - FragmentsKineticEnergy;
     191        //      FragmentsExcitationEnergy = Tmax - FragmentsKineticEnergy;
     192        // JMQ 04/03/09 BUG FIXED: in order to fulfill energy conservation the
     193        // fragments carry the fission pairing energy in form of
     194        //excitation energy
     195
     196        FragmentsExcitationEnergy = Tmax - FragmentsKineticEnergy+FissionPairingEnergy;
     197
     198    } while (FragmentsExcitationEnergy < 0.0 && Trials++ < 100);
    183199   
    184     } while (FragmentsExcitationEnergy < 0.0 && Trials++ < 100);
    185  
    186200 
    187201
    … …  
    190204 
    191205
    192   // while (FragmentsExcitationEnergy < 0 && Trials < 100);
    193  
    194   // Fragment 1
     206    // while (FragmentsExcitationEnergy < 0 && Trials < 100);
     207 
     208    // Fragment 1
    195209    G4double U1 = FragmentsExcitationEnergy * (static_cast<G4double>(A1)/static_cast<G4double>(A));
    196210    // Fragment 2
    … …  
    198212
    199213
    200     G4double Pmax = std::sqrt( 2 * ( ( (M1+U1)*(M2+U2) ) /
    201                                 ( (M1+U1)+(M2+U2) ) ) * FragmentsKineticEnergy);
    202 
    203     G4ParticleMomentum momentum1 = IsotropicVector( Pmax );
    204     G4ParticleMomentum momentum2( -momentum1 );
     214    //JMQ  04/03/09 Full relativistic calculation is performed
     215    //
     216    G4double Fragment1KineticEnergy=(FragmentsKineticEnergy*(FragmentsKineticEnergy+2*(M2+U2)))/(2*(M1+U1+M2+U2+FragmentsKineticEnergy));
     217    G4ParticleMomentum Momentum1(IsotropicVector(std::sqrt(Fragment1KineticEnergy*(Fragment1KineticEnergy+2*(M1+U1)))));
     218    G4ParticleMomentum Momentum2(-Momentum1);
     219    G4LorentzVector FourMomentum1(Momentum1,std::sqrt(Momentum1.mag2()+(M1+U1)*(M1+U1)));
     220    G4LorentzVector FourMomentum2(Momentum2,std::sqrt(Momentum2.mag2()+(M2+U2)*(M2+U2)));
     221
     222    //JMQ 04/03/09 now we do Lorentz boosts (instead of Galileo boosts)
     223    FourMomentum1.boost(theNucleusMomentum.boostVector());
     224    FourMomentum2.boost(theNucleusMomentum.boostVector());
     225   
     226    //////////JMQ 04/03: Old version calculation is commented
     227    // There was vioation of energy momentum conservation
     228
     229    //    G4double Pmax = std::sqrt( 2 * ( ( (M1+U1)*(M2+U2) ) /
     230    //                          ( (M1+U1)+(M2+U2) ) ) * FragmentsKineticEnergy);
     231
     232    //G4ParticleMomentum momentum1 = IsotropicVector( Pmax );
     233    //  G4ParticleMomentum momentum2( -momentum1 );
    205234
    206235    // Perform a Galileo boost for fragments
    207     momentum1 += (theNucleusMomentum.boostVector() * (M1+U1));
    208     momentum2 += (theNucleusMomentum.boostVector() * (M2+U2));
     236    //    momentum1 += (theNucleusMomentum.boostVector() * (M1+U1));
     237    //    momentum2 += (theNucleusMomentum.boostVector() * (M2+U2));
    209238
    210239
    211240    // Create 4-momentum for first fragment
    212241    // Warning!! Energy conservation is broken
    213     G4LorentzVector FourMomentum1( momentum1 , std::sqrt(momentum1.mag2() + (M1+U1)*(M1+U1)));
     242    //JMQ 04/03/09 ...NOT ANY MORE!! BUGS FIXED: Energy and momentum are NOW conserved
     243    //    G4LorentzVector FourMomentum1( momentum1 , std::sqrt(momentum1.mag2() + (M1+U1)*(M1+U1)));
    214244
    215245    // Create 4-momentum for second fragment
    216246    // Warning!! Energy conservation is broken
    217     G4LorentzVector FourMomentum2( momentum2 , std::sqrt(momentum2.mag2() + (M2+U2)*(M2+U2)));
     247    //JMQ 04/03/09 ...NOT ANY MORE!! BUGS FIXED: Energy and momentum are NOW conserved
     248    //    G4LorentzVector FourMomentum2( momentum2 , std::sqrt(momentum2.mag2() + (M2+U2)*(M2+U2)));
     249
     250    //////////
    218251
    219252    // Create Fragments
    … …  
    227260    Fragment2->SetCreatorModel(G4String("G4CompetitiveFission"));
    228261#endif
    229   // Create Fragment Vector
     262    // Create Fragment Vector
    230263    G4FragmentVector * theResult = new G4FragmentVector;
    231264

  • trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4FissionProbability.cc,v 1.8 2007/02/12 09:39:58 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4FissionProbability.cc,v 1.9 2009/02/15 17:03:25 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Oct 1998)
    3232//
     33//
     34// J.M.Quesada (14 february 2009) bug fixed in fission width: missing parenthesis in the denominator
    3335
    3436
    … …  
    9597    G4double Exp1 = 0.0;
    9698    if (SystemEntropy <= 160.0) Exp1 = std::exp(-SystemEntropy);
    97     // @@@@@@@@@@@@@@@@@ hpw changed max to min - cannot notify vicente now since cern mail gave up on me...
     99    // @@@@@@@@@@@@@@@@@ hpw changed max to min - cannot notify vicente now
    98100    G4double Exp2 = std::exp( std::min(700.0,Cf-SystemEntropy) );
    99101
     102    // JMQ 14/02/09 BUG fixed in fission probability (missing parenthesis at denominator)
    100103    //AH fix from Vincente:    G4double probability = (Exp1 + (1.0-Cf)*Exp2) / 4.0*pi*afission;
    101     G4double probability = (Exp1 + (Cf-1.0)*Exp2) / 4.0*pi*afission;
     104    //    G4double probability = (Exp1 + (Cf-1.0)*Exp2) / 4.0*pi*afission;
     105    G4double probability = (Exp1 + (Cf-1.0)*Exp2) / (4.0*pi*afission);
     106
     107
    102108   
    103109    return probability;

  • trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4GEMChannel.cc,v 1.6 2008/11/18 18:26:30 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4GEMChannel.cc,v 1.7 2009/03/12 11:25:28 ahoward Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    125125    //    G4double ExEnergy = fragment.GetExcitationEnergy() -
    126126    //      G4PairingCorrection::GetInstance()->GetPairingCorrection(anA,aZ);
    127     G4double ExEnergy = fragment.GetExcitationEnergy() -
    128       G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
     127//090120
     128    //G4double ExEnergy = fragment.GetExcitationEnergy() -
     129      //G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
     130    G4double ExEnergy = fragment.GetExcitationEnergy();
     131    if ( AResidual > 0 ) ExEnergy -= G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
     132//090120
    129133   
    130134    // We only take into account channels which are physically allowed
    … …  
    260264    G4double a = theLevelDensityPtr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
    261265                                                           static_cast<G4int>(fragment.GetZ()),U);
    262     G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
    263                                                                                static_cast<G4int>(fragment.GetZ()));
     266//090115
     267//G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
     268//                                                                     static_cast<G4int>(fragment.GetZ()));
     269    G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
     270//090115
    264271   
    265272    G4double Alpha = theEvaporationProbabilityPtr->CalcAlphaParam(fragment);
    … …  
    307314//      std::cout << "\t\tEjectile (" << A << ',' << Z << ") V = " << CoulombBarrier
    308315//            << " Beta = " << Beta << " V+Beta = " << CoulombBarrier+Beta << '\n';
     316
     317//G4cout << AResidual << " " << ZResidual << " " << ConstantFactor << " " << Beta << " " << CoulombBarrier << " " << MaximalKineticEnergy << " " << CoulombBarrier + MaximalKineticEnergy + Beta << G4endl;
     318//090128
     319if ( CoulombBarrier + MaximalKineticEnergy + Beta <= 0 ) return 0;
    309320
    310321    do

  • trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMProbability.cc

    r819 r1055  
    108108    G4double a = theEvapLDPptr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
    109109                                                      static_cast<G4int>(fragment.GetZ()),U);
    110     G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
    111                                                                                static_cast<G4int>(fragment.GetZ()));
     110//090115
     111//G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
     112//                                                                     static_cast<G4int>(fragment.GetZ()));
     113    G4double ResidualZ = static_cast<G4double>(fragment.GetZ() - theZ);
     114    G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection( static_cast<G4int>( ResidualA ) , static_cast<G4int>( ResidualZ ) );
     115//090115
    112116   
    113117    G4double Alpha = CalcAlphaParam(fragment);

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronGilbertPairingCorrections.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronGilbertPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5252  static G4CameronGilbertPairingCorrections* GetInstance();
    5353
    54   ~G4CameronGilbertPairingCorrections() {};
     54  ~G4CameronGilbertPairingCorrections();
    5555
    5656  G4double GetPairingCorrection(const G4int A, const G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronGilbertShellCorrections.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronGilbertShellCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5151  static G4CameronGilbertShellCorrections* GetInstance();
    5252
    53   ~G4CameronGilbertShellCorrections() {};
     53  ~G4CameronGilbertShellCorrections();
    5454 
    5555  G4double GetShellCorrection(const G4int A, const G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronShellPlusPairingCorrections.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronShellPlusPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5151  static G4CameronShellPlusPairingCorrections* GetInstance();
    5252
    53   ~G4CameronShellPlusPairingCorrections() {};
     53  ~G4CameronShellPlusPairingCorrections();
    5454 
    5555  G4double GetShellPlusPairingZ(const G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronTruranHilfPairingCorrections.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronTruranHilfPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5050  static G4CameronTruranHilfPairingCorrections* GetInstance();
    5151
    52   ~G4CameronTruranHilfPairingCorrections() {};
     52  ~G4CameronTruranHilfPairingCorrections();
    5353
    5454  G4double GetParingCorrection(const G4int A, const  G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronTruranHilfShellCorrections.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronTruranHilfShellCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5050  static G4CameronTruranHilfShellCorrections* GetInstance();
    5151 
    52   ~G4CameronTruranHilfShellCorrections() {};
     52  ~G4CameronTruranHilfShellCorrections();
    5353
    5454  G4double GetShellCorrection(const G4int A, const G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4ConstantLevelDensityParameter.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4ConstantLevelDensityParameter.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations (photon evaporation)
    … …  
    4141public:
    4242  G4ConstantLevelDensityParameter() :  EvapLevelDensityParameter(0.125*(1./MeV)) {};
    43   virtual ~G4ConstantLevelDensityParameter() {};
     43  virtual ~G4ConstantLevelDensityParameter();
    4444
    4545private: 

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CookPairingCorrections.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CookPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5050  static G4CookPairingCorrections* GetInstance();
    5151
    52   ~G4CookPairingCorrections() {};
     52  ~G4CookPairingCorrections();
    5353
    5454  G4double GetParingCorrection(const G4int A, const G4int Z) const {

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CookShellCorrections.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CookShellCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5252  static G4CookShellCorrections* GetInstance();
    5353
    54   ~G4CookShellCorrections() {};
     54  ~G4CookShellCorrections();
    5555
    5656  G4double GetShellCorrection(const G4int A, const G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CoulombBarrier.hh,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CoulombBarrier.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4242{
    4343public:
    44   G4CoulombBarrier() : G4VCoulombBarrier(1,0) {};
    45   G4CoulombBarrier(const G4int anA,const G4int aZ) :
    46     G4VCoulombBarrier(anA,aZ) {};
    47   ~G4CoulombBarrier() {};
     44  G4CoulombBarrier();
     45  G4CoulombBarrier(const G4int anA,const G4int aZ);
     46  virtual ~G4CoulombBarrier();
    4847
    4948private:

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4DeuteronCoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4DeuteronCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42         G4DeuteronCoulombBarrier() : G4CoulombBarrier(2,1) {};
    43         ~G4DeuteronCoulombBarrier() {};
     42        G4DeuteronCoulombBarrier() : G4CoulombBarrier(2,1) {}
     43        ~G4DeuteronCoulombBarrier() {}
    4444
    4545private:
    … …  
    5252private:
    5353
    54         virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
    55 
     54        G4double BarrierPenetrationFactor(const G4double aZ) const;
    5655
    5756};

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4EvaporationLevelDensityParameter.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4EvaporationLevelDensityParameter.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4545public:
    4646
    47   G4EvaporationLevelDensityParameter()  {};
     47  G4EvaporationLevelDensityParameter();
    4848
    49   virtual ~G4EvaporationLevelDensityParameter() {};
     49  virtual ~G4EvaporationLevelDensityParameter();
    5050
    5151private: 

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4He3CoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4He3CoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42         G4He3CoulombBarrier() : G4CoulombBarrier(3,2) {};
    43         ~G4He3CoulombBarrier() {};
     42        G4He3CoulombBarrier() : G4CoulombBarrier(3,2) {}
     43        ~G4He3CoulombBarrier() {}
    4444
    4545private:
    … …  
    5252private:
    5353
    54         virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
    55 
     54        G4double BarrierPenetrationFactor(const G4double aZ) const;
    5655
    5756};

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4NeutronCoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4NeutronCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42         G4NeutronCoulombBarrier() : G4CoulombBarrier(1,0) {};
    43         ~G4NeutronCoulombBarrier() {};
     42        G4NeutronCoulombBarrier() : G4CoulombBarrier(1,0) {}
     43        ~G4NeutronCoulombBarrier() {}
    4444
    4545private:
    … …  
    5252private:
    5353
    54         virtual G4double BarrierPenetrationFactor(const G4double ) const
     54        G4double BarrierPenetrationFactor(const G4double ) const
    5555        { return 1.0;}
    56 
    5756
    5857};

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4PairingCorrection.hh,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4PairingCorrection.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5353  static G4PairingCorrection* GetInstance();
    5454 
    55   ~G4PairingCorrection() {};
     55  ~G4PairingCorrection();
    5656
    5757  G4double GetPairingCorrection(const G4int A, const G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4ProtonCoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4ProtonCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42         G4ProtonCoulombBarrier() : G4CoulombBarrier(1,1) {};
    43         ~G4ProtonCoulombBarrier() {};
     42        G4ProtonCoulombBarrier() : G4CoulombBarrier(1,1) {}
     43        ~G4ProtonCoulombBarrier() {}
    4444
    4545private:
    … …  
    5252private:
    5353
    54         virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
    55 
     54        G4double BarrierPenetrationFactor(const G4double aZ) const;
    5655
    5756};

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4ShellCorrection.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4ShellCorrection.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5151public:
    5252  static G4ShellCorrection* GetInstance();
    53   ~G4ShellCorrection() {};
     53  ~G4ShellCorrection();
    5454
    5555  G4double GetShellCorrection(const G4int A, const G4int Z) const

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4TritonCoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4TritonCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4040{
    4141public:
    42     G4TritonCoulombBarrier() : G4CoulombBarrier(3,1) {};
    43     ~G4TritonCoulombBarrier() {};
     42    G4TritonCoulombBarrier() : G4CoulombBarrier(3,1) {}
     43    ~G4TritonCoulombBarrier() {}
    4444
    4545private:
    … …  
    5252private:
    5353
    54     virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
    55 
     54    G4double BarrierPenetrationFactor(const G4double aZ) const;
    5655
    5756};

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4VCoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4141public:
    4242  G4VCoulombBarrier(const G4int anA, const G4int aZ);
    43   virtual ~G4VCoulombBarrier() {};
     43  virtual ~G4VCoulombBarrier();
    4444
    4545protected:
    46   G4VCoulombBarrier() : theA(1),theZ(0) {};
     46  G4VCoulombBarrier();
    4747
    4848private:

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4VEmissionProbability.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VEmissionProbability.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4747{
    4848public:
    49   G4VEmissionProbability() {};
    50   virtual ~G4VEmissionProbability() {};
     49  G4VEmissionProbability();
     50  virtual ~G4VEmissionProbability();
    5151
    5252private: 

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4VLevelDensityParameter.hh,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VLevelDensityParameter.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4444{
    4545public:
    46   G4VLevelDensityParameter() {};
    47   virtual ~G4VLevelDensityParameter() {};
     46  G4VLevelDensityParameter();
     47  virtual ~G4VLevelDensityParameter();
    4848
    4949private: 

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronGilbertPairingCorrections.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronGilbertPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7474{;}
    7575
     76G4CameronGilbertPairingCorrections::~G4CameronGilbertPairingCorrections()
     77{ delete theInstance; }
    7678
    7779G4CameronGilbertPairingCorrections* G4CameronGilbertPairingCorrections::GetInstance()

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronGilbertShellCorrections.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronGilbertShellCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7474{;}
    7575
     76G4CameronGilbertShellCorrections::~G4CameronGilbertShellCorrections()
     77{ delete theInstance; }
     78
    7679G4CameronGilbertShellCorrections* G4CameronGilbertShellCorrections::GetInstance()
    7780{

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronShellPlusPairingCorrections.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronShellPlusPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    9292{;}
    9393
     94G4CameronShellPlusPairingCorrections::~G4CameronShellPlusPairingCorrections()
     95{ delete theInstance; }
     96
    9497G4CameronShellPlusPairingCorrections* G4CameronShellPlusPairingCorrections::GetInstance() {
    9598  if (!theInstance) theInstance = new G4CameronShellPlusPairingCorrections();

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7979{;}
    8080
     81G4CameronTruranHilfPairingCorrections::~G4CameronTruranHilfPairingCorrections()
     82{ delete theInstance; }
     83
    8184G4CameronTruranHilfPairingCorrections* G4CameronTruranHilfPairingCorrections::GetInstance() {
    8285  if (!theInstance) theInstance = new G4CameronTruranHilfPairingCorrections();

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CameronTruranHilfShellCorrections.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CameronTruranHilfShellCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    8181{;}
    8282
     83G4CameronTruranHilfShellCorrections::~G4CameronTruranHilfShellCorrections()
     84{ delete theInstance; }
     85
    8386G4CameronTruranHilfShellCorrections* G4CameronTruranHilfShellCorrections::GetInstance() {
    8487  if (!theInstance) theInstance = new G4CameronTruranHilfShellCorrections();

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

    r819 r1055  
    4242}
    4343
     44G4ConstantLevelDensityParameter::~G4ConstantLevelDensityParameter()
     45{
     46}
    4447
    4548const G4ConstantLevelDensityParameter & G4ConstantLevelDensityParameter::

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CookPairingCorrections.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CookPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7373{;}
    7474
     75G4CookPairingCorrections::~G4CookPairingCorrections()
     76{ delete theInstance; }
     77
    7578G4CookPairingCorrections* G4CookPairingCorrections::GetInstance() {
    7679  if (!theInstance) theInstance = new  G4CookPairingCorrections();

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CookShellCorrections.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CookShellCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    7373{;}
    7474
     75G4CookShellCorrections::~G4CookShellCorrections()
     76{ delete theInstance; }
    7577
    7678G4CookShellCorrections* G4CookShellCorrections::GetInstance() {

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4CoulombBarrier.cc,v 1.8 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4CoulombBarrier.cc,v 1.9 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    3535#include "G4HadronicException.hh"
    3636#include <sstream>
     37
     38G4CoulombBarrier::G4CoulombBarrier()
     39  : G4VCoulombBarrier(1,0) {}
     40
     41G4CoulombBarrier::G4CoulombBarrier(const G4int anA,const G4int aZ)
     42  : G4VCoulombBarrier(anA,aZ) {}
     43
     44G4CoulombBarrier::~G4CoulombBarrier() {}
    3745
    3846G4CoulombBarrier::G4CoulombBarrier(const G4CoulombBarrier & ) : G4VCoulombBarrier()

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4EvaporationLevelDensityParameter.cc,v 1.8 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4EvaporationLevelDensityParameter.cc,v 1.9 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4949const G4double G4EvaporationLevelDensityParameter::Bs = 1.0;
    5050
     51G4EvaporationLevelDensityParameter::G4EvaporationLevelDensityParameter() {}
     52G4EvaporationLevelDensityParameter::~G4EvaporationLevelDensityParameter() {}
    5153
    5254G4EvaporationLevelDensityParameter::

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4PairingCorrection.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4PairingCorrection.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4444}
    4545
     46G4PairingCorrection::~G4PairingCorrection()
     47{ delete theInstance; }
     48
    4649G4PairingCorrection* G4PairingCorrection::GetInstance()
    4750{

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4ShellCorrection.cc,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4ShellCorrection.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4444}
    4545
     46G4ShellCorrection::~G4ShellCorrection()
     47{
     48  delete theInstance;
     49}
    4650
    4751G4ShellCorrection* G4ShellCorrection::GetInstance()

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4VCoulombBarrier.cc,v 1.6 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VCoulombBarrier.cc,v 1.7 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    3535#include "G4HadronicException.hh"
    3636#include <sstream>
     37
     38G4VCoulombBarrier::G4VCoulombBarrier()
     39  : theA(1),theZ(0)
     40{
     41}
     42
    3743
    3844G4VCoulombBarrier::G4VCoulombBarrier(const G4int anA, const G4int aZ)
    … …  
    4955        throw G4HadronicException(__FILE__, __LINE__, errOs.str());
    5056    }
     57}
     58
     59
     60G4VCoulombBarrier::~G4VCoulombBarrier()
     61{
    5162}
    5263

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4VEmissionProbability.cc,v 1.6 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VEmissionProbability.cc,v 1.7 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    3636#include "G4HadronicException.hh"
    3737
     38
     39G4VEmissionProbability::G4VEmissionProbability() {}
     40G4VEmissionProbability::~G4VEmissionProbability() {}
     41
     42
    3843G4VEmissionProbability::G4VEmissionProbability(const G4VEmissionProbability &)
    3944{
    4045    throw G4HadronicException(__FILE__, __LINE__, "G4VEmissionProbability::copy_constructor meant to not be accessable");
    4146}
    42 
    43 
    4447
    4548

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

    r1007 r1055  
    2525//
    2626//
    27 // $Id: G4VLevelDensityParameter.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VLevelDensityParameter.cc,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    3636
    3737
     38G4VLevelDensityParameter::G4VLevelDensityParameter() {}
     39G4VLevelDensityParameter::~G4VLevelDensityParameter() {}
     40
     41
    3842G4VLevelDensityParameter::
    3943G4VLevelDensityParameter(const G4VLevelDensityParameter &)
    … …  
    4145    throw G4HadronicException(__FILE__, __LINE__, "G4VLevelDensityParameter::copy_constructor meant to not be accessable");
    4246}
    43 
    44 
    4547
    4648
Note: See TracChangeset for help on using the changeset viewer.