Ignore:
Timestamp:
Apr 20, 2009, 5:54:05 PM (15 years ago)
Author:
garnier
Message:

update to geant4.9.2

Location:
trunk/source/processes/hadronic/models/de_excitation/evaporation/src
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r962 r1007  
    2626//
    2727// $Id: G4AlphaEvaporationChannel.cc,v 1.4 2006/06/29 20:10:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    104104//OPT=3,4 Kalbach's parameterization
    105105//
    106 G4double G4AlphaEvaporationProbability::CrossSection(const  G4Fragment & fragment,
    107                                                      const  G4double K)
     106 G4double G4AlphaEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
    108107{
    109108  theA=GetA();
    … …  
    118117 
    119118  if (OPTxs==0) {std::ostringstream errOs;
    120     errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (Alpha's)!!" 
    121           <<G4endl;
     119    errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (Alpha's)!!"  <<G4endl;
    122120    throw G4HadronicException(__FILE__, __LINE__, errOs.str());
    123121    return 0.;}
    … …  
    205203  G4double      ra=1.20;
    206204 
    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);
     205  ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
    210206  ecsq = ec * ec;
    211207  p = p0 + p1/ec + p2/ecsq;
    … …  
    230226 
    231227  if (elab <= ec) { //start for E<Ec
    232     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
     228    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
    233229  }           //end for E<Ec
    234230  else {           //start for E>Ec

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

    r962 r1007  
    2626//
    2727// $Id: G4DeuteronEvaporationChannel.cc,v 1.4 2006/06/29 20:10:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    106106//OPT=3,4 Kalbach's parameterization
    107107//
    108 G4double G4DeuteronEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
     108 G4double G4DeuteronEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
    109109{
    110110       theA=GetA();
    … …  
    205205  G4double      ra=0.80;
    206206       
    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);
     207  ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
    210208  ecsq = ec * ec;
    211209  p = p0 + p1/ec + p2/ecsq;
    … …  
    228226  elab = K * FragmentA / ResidualA;
    229227  sig = 0.;
    230 
     228 
    231229  if (elab <= ec) { //start for E<Ec
    232     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
     230    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
    233231  }           //end for E<Ec
    234232  else {           //start for E>Ec

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

    r962 r1007  
    2626//
    2727// $Id: G4Evaporation.cc,v 1.12 2008/12/09 17:57:36 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    2626//
    2727// $Id: G4EvaporationFactory.cc,v 1.4 2006/06/29 20:10:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    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 //
    36 // JMQ (14 february 2009) bug fixed in emission width: hbarc instead of hbar_Planck in the denominator
    37 //
     35
    3836#include <iostream>
    3937using namespace std;
    … …  
    140138
    141139
    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;
     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;
    153151 } else{
    154152   std::ostringstream errOs;
    … …  
    246244  if (E1<0.) return 0.;
    247245
    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 
     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
     251return Prob;
     252
     253}
     254
     255

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

    r962 r1007  
    2626//
    2727// $Id: G4He3EvaporationChannel.cc,v 1.4 2006/06/29 20:10:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    104104//OPT=3,4 Kalbach's parameterization
    105105//
    106 G4double G4He3EvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
     106 G4double 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)!!" 
    120                <<G4endl;
     119         errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (He3's)!!"  <<G4endl;
    121120         throw G4HadronicException(__FILE__, __LINE__, errOs.str());
    122121         return 0.;}
    … …  
    201200  G4double      ra=0.80;
    202201 
    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);
     202  ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
    206203  ecsq = ec * ec;
    207204  p = p0 + p1/ec + p2/ecsq;
    … …  
    224221  elab = K * FragmentA / ResidualA;
    225222  sig = 0.;
    226 
     223 
    227224  if (elab <= ec) { //start for E<Ec
    228     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
     225    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
    229226  }           //end for E<Ec
    230227  else {           //start for E>Ec

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

    r962 r1007  
    2626//
    2727// $Id: G4NeutronEvaporationChannel.cc,v 1.4 2006/06/29 20:10:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    2626//
    2727// $Id: G4ProtonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    2626//
    2727// $Id: G4TritonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r962 r1007  
    100100//OPT=3,4 Kalbach's parameterization
    101101//
    102 G4double G4TritonEvaporationProbability::CrossSection(const  G4Fragment & fragment, const  G4double K)
     102 G4double 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)!!" 
    116           <<G4endl;
     115    errOs << "We should'n be here (OPT =0) at evaporation cross section calculation (tritons)!!"  <<G4endl;
    117116    throw G4HadronicException(__FILE__, __LINE__, errOs.str());
    118117    return 0.;}
    … …  
    199198  G4double      ra=0.80;
    200199       
    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);
     200  ec = 1.44 * theZ * ResidualZ / (1.5*ResidualAthrd+ra);
    204201  ecsq = ec * ec;
    205202  p = p0 + p1/ec + p2/ecsq;
    … …  
    222219  elab = K * FragmentA / ResidualA;
    223220  sig = 0.;
    224 
     221 
    225222  if (elab <= ec) { //start for E<Ec
    226     if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;
     223    if (elab > ecut2)  sig = (p*elab*elab+a*elab+b) * signor;   
    227224  }           //end for E<Ec
    228   else {           //start for E>Ec 
     225  else {           //start for E>Ec
    229226    sig = (landa*elab+mu+nu/elab) * signor;
    230227    geom = 0.;

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

    r962 r1007  
    2626//
    2727// $Id: G4VEvaporation.cc,v 1.5 2006/06/29 20:10:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
Note: See TracChangeset for help on using the changeset viewer.