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/evaporation/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • 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.;
Note: See TracChangeset for help on using the changeset viewer.