Ignore:
Timestamp:
Nov 25, 2009, 5:13:58 PM (16 years ago)
Author:
garnier
Message:

update CVS release candidate geant4.9.3.01

Location:
trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src
Files:
76 edited

Legend:

Unmodified
Added
Removed

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4AlphaGEMChannel.cc,v 1.4 2006/06/29 20:20:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4AlphaGEMChannel.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4AlphaGEMProbability.cc,v 1.4 2006/06/29 20:20:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4AlphaGEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Nov 1999)
    3232//
    33 
     33// J.M. Quesada (July 2009) C's and k's  values according to Furihata's paper
     34// (based on notes added on proof in Dostrovskii's paper)
    3435
    3536#include "G4AlphaGEMProbability.hh"
    … …  
    8687}
    8788
     89//JMQ 190709 C's values from Furihata's paper
     90//(notes added on proof in Dostrovskii's paper)
     91G4double G4AlphaGEMProbability::CCoeficient(const G4double/* aZ*/) const
     92{
     93    return 0.;
     94}
    8895
    89 G4double G4AlphaGEMProbability::CCoeficient(const G4double aZ) const
    90 {
     96
     97//G4double G4AlphaGEMProbability::CCoeficient(const G4double aZ) const
     98//{
    9199    // Data comes from
    92100    // Dostrovsky, Fraenkel and Friedlander
    … …  
    96104    // G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
    97105    //  G4double Calpha[5] = { 0.10, 0.10, 0.10, 0.08, 0.06};
    98     G4double C = 0.0;
     106//    G4double C = 0.0;
    99107       
    100108       
    101     if (aZ <= 30) {
    102         C = 0.10;
    103     } else if (aZ <= 50) {
    104         C = 0.1 + -((aZ-50.)/20.)*0.02;
    105     } else if (aZ < 70) {
    106         C = 0.08 + -((aZ-70.)/20.)*0.02;
    107     } else {
    108         C = 0.06;
    109     }
    110     return C;
    111 }
     109//    if (aZ <= 30) {
     110//        C = 0.10;
     111//    } else if (aZ <= 50) {
     112//        C = 0.1 + -((aZ-50.)/20.)*0.02;
     113//    } else if (aZ < 70) {
     114//        C = 0.08 + -((aZ-70.)/20.)*0.02;
     115//    } else {
     116//        C = 0.06;
     117//    }
     118//    return C;
     119//}
    112120

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4B10GEMProbability.cc,v 1.5 2006/06/29 20:20:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4B10GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4B11GEMProbability.cc,v 1.5 2006/06/29 20:20:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4B11GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4B12GEMProbability.cc,v 1.5 2006/06/29 20:20:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4B12GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4B13GEMProbability.cc,v 1.4 2006/06/29 20:20:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4B13GEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4B8GEMProbability.cc,v 1.5 2006/06/29 20:21:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4B8GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Be10GEMProbability.cc,v 1.5 2006/06/29 20:21:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Be10GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Be11GEMProbability.cc,v 1.5 2006/06/29 20:21:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Be11GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Be12GEMProbability.cc,v 1.4 2006/06/29 20:21:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Be12GEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Be7GEMProbability.cc,v 1.5 2006/06/29 20:21:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Be7GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Be9GEMProbability.cc,v 1.5 2006/06/29 20:21:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Be9GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4C10GEMProbability.cc,v 1.5 2006/06/29 20:21:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4C10GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4C11GEMProbability.cc,v 1.5 2006/06/29 20:21:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4C11GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4C12GEMProbability.cc,v 1.5 2006/06/29 20:21:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4C12GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4C13GEMProbability.cc,v 1.5 2006/06/29 20:21:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4C13GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4C14GEMProbability.cc,v 1.5 2006/06/29 20:21:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4C14GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4C15GEMProbability.cc,v 1.5 2006/06/29 20:21:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4C15GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4C16GEMProbability.cc,v 1.4 2006/06/29 20:21:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4C16GEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4DeuteronGEMChannel.cc,v 1.4 2006/06/29 20:21:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4DeuteronGEMChannel.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4DeuteronGEMProbability.cc,v 1.4 2006/06/29 20:21:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4DeuteronGEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Nov 1999)
    3232//
    33 
     33// J.M. Quesada (July 2009) C's and k's  values according to Furihata's paper
     34// (based on notes added on proof in Dostrovskii's paper)
    3435
    3536#include "G4DeuteronGEMProbability.hh"
    … …  
    7172
    7273
     74//JMQ 190709 C's values from Furihata's paper
     75//(notes added on proof in Dostrovskii's paper)
     76//data = {{20, 0.}, {30, -0.06}, {40, -0.10}, {50, -0.10}};
    7377G4double G4DeuteronGEMProbability::CCoeficient(const G4double aZ) const
    7478{
     79   G4double C = 0.0;
     80       
     81    if (aZ >= 50){
     82      C=-0.10;     
     83    } else if (aZ <= 20) {
     84        C = 0.0;
     85    } else C=0.123482-0.00534691*aZ-0.0000610624*aZ*aZ+5.93719*1e-7*aZ*aZ*aZ+1.95687*1e-8*aZ*aZ*aZ*aZ; 
     86    return C/2.;
     87       
     88}
     89
     90
     91
     92//G4double G4DeuteronGEMProbability::CCoeficient(const G4double aZ) const
     93//{
    7594    // Data comes from
    7695    // Dostrovsky, Fraenkel and Friedlander
    … …  
    81100    // G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
    82101    // C for deuteron is equal to C for protons divided by 2
    83     G4double C = 0.0;
     102//    G4double C = 0.0;
     103//     
     104//    if (aZ >= 70) {
     105//        C = 0.10;
     106//    } else {
     107//        C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
     108//    }
    84109       
    85     if (aZ >= 70) {
    86         C = 0.10;
    87     } else {
    88         C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
    89     }
     110//    return C/2.0;
    90111       
    91     return C/2.0;
    92        
    93 }
     112//}

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4EvaporationGEMFactory.cc,v 1.7 2006/06/29 20:21:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4EvaporationGEMFactory.cc,v 1.9 2009/09/15 12:54:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4F17GEMProbability.cc,v 1.5 2006/06/29 20:21:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4F17GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4F18GEMProbability.cc,v 1.5 2006/06/29 20:21:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4F18GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4F19GEMProbability.cc,v 1.5 2006/06/29 20:22:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4F19GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4F20GEMProbability.cc,v 1.5 2006/06/29 20:22:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4F20GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4F21GEMProbability.cc,v 1.4 2006/06/29 20:22:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4F21GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1055 r1196  
    2525//
    2626//
    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 $
     27// $Id: G4GEMChannel.cc,v 1.10 2009/10/08 07:55:39 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Oct 1998)
    3232//
     33// J. M. Quesada (September 2009) bugs fixed in  probability distribution for kinetic
     34//              energy sampling:
     35//              -hbarc instead of hbar_Planck (BIG BUG)
     36//              -quantities for initial nucleus and residual are calculated separately
     37// V.Ivanchenko (September 2009) Added proper protection for unphysical final state
     38// J. M. Quesada (October 2009) fixed bug in CoulombBarrier calculation
    3339
    3440#include "G4GEMChannel.hh"
    … …  
    6571}
    6672
    67 G4GEMChannel::G4GEMChannel(const G4int theA, const G4int theZ, const G4String * aName,
    68                            G4GEMProbability * aEmissionStrategy,
    69                            G4VCoulombBarrier * aCoulombBarrier) :
    70   G4VEvaporationChannel(aName),
    71   A(theA),
    72   Z(theZ),
    73   theEvaporationProbabilityPtr(aEmissionStrategy),
    74   theCoulombBarrierPtr(aCoulombBarrier),
    75   EmissionProbability(0.0),
    76   MaximalKineticEnergy(-1000.0)
    77 {
    78   theLevelDensityPtr = new G4EvaporationLevelDensityParameter;
    79   MyOwnLevelDensity = true;
    80 }
    81 
    82 
    8373G4GEMChannel::~G4GEMChannel()
    8474{
    8575    if (MyOwnLevelDensity) delete theLevelDensityPtr;
    8676}
    87 
    88 
    89 
    9077
    9178G4GEMChannel::G4GEMChannel(const G4GEMChannel & ) : G4VEvaporationChannel()
    … …  
    11299}
    113100
    114 
    115 
    116101void G4GEMChannel::Initialize(const G4Fragment & fragment)
    117102{
    118 
    119     G4int anA = static_cast<G4int>(fragment.GetA());
    120     G4int aZ = static_cast<G4int>(fragment.GetZ());
    121     AResidual = anA - A;
    122     ZResidual = aZ - Z;
    123    
    124     // Effective excitation energy
    125     //    G4double ExEnergy = fragment.GetExcitationEnergy() -
    126     //      G4PairingCorrection::GetInstance()->GetPairingCorrection(anA,aZ);
    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
    133    
    134     // We only take into account channels which are physically allowed
    135     if (AResidual <= 0 || ZResidual <= 0 || AResidual < ZResidual ||
    136         (AResidual == ZResidual && AResidual > 1) || ExEnergy <= 0.0)
    137       {
    138         CoulombBarrier = 0.0;
    139         MaximalKineticEnergy = -1000.0*MeV;
    140         EmissionProbability = 0.0;
    141       }
    142     else
    143       {
     103  G4int anA = static_cast<G4int>(fragment.GetA());
     104  G4int aZ = static_cast<G4int>(fragment.GetZ());
     105  AResidual = anA - A;
     106  ZResidual = aZ - Z;
     107  //G4cout << "G4GEMChannel::Initialize: Z= " << aZ << " A= " << anA
     108  //       << " Zres= " << ZResidual << " Ares= " << AResidual << G4endl;
     109
     110  // We only take into account channels which are physically allowed
     111  if (AResidual <= 0 || ZResidual <= 0 || AResidual < ZResidual ||
     112      (AResidual == ZResidual && AResidual > 1))
     113    {
     114      CoulombBarrier = 0.0;
     115      MaximalKineticEnergy = -1000.0*MeV;
     116      EmissionProbability = 0.0;
     117    }
     118  else
     119    {
     120
     121      // Effective excitation energy
     122      // JMQ 071009: pairing in ExEnergy should be the one of parent compound nucleus
     123      // FIXED the bug causing reported crash by VI (negative Probabilities
     124      // due to inconsistency in Coulomb barrier calculation (CoulombBarrier and -Beta
     125      // param for protons must be the same)   
     126      //    G4double ExEnergy = fragment.GetExcitationEnergy() -
     127      //    G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
     128      G4double ExEnergy = fragment.GetExcitationEnergy() -
     129        G4PairingCorrection::GetInstance()->GetPairingCorrection(anA,aZ);
     130
     131      //G4cout << "Eexc(MeV)= " << ExEnergy/MeV << G4endl;
     132
     133      if( ExEnergy <= 0.0) {
     134        CoulombBarrier = 0.0;
     135        MaximalKineticEnergy = -1000.0*MeV;
     136        EmissionProbability = 0.0;
     137
     138      } else {
     139
    144140        // Coulomb Barrier calculation
    145         CoulombBarrier = theCoulombBarrierPtr->GetCoulombBarrier(AResidual,ZResidual,ExEnergy);
    146 
    147 //      std::cout << "\tfragment (" << A << ',' << Z << ") residual (" << AResidual << ',' << ZResidual << ')';
    148 //      std::cout << " U = " << fragment.GetExcitationEnergy();
    149 //      std::cout << " delta = " << G4PairingCorrection::GetInstance()->GetPairingCorrection(anA,aZ);
    150 //      std::cout << " U-delta = " << ExEnergy;
    151 //      std::cout << " V = " << CoulombBarrier;
    152        
    153         // Maximal Kinetic Energy
    154         MaximalKineticEnergy = CalcMaximalKineticEnergy(G4ParticleTable::GetParticleTable()->
    155                                                         GetIonTable()->GetNucleusMass(aZ,anA)+ExEnergy);
    156 
    157 //      std::cout << " Tmax-V = " << MaximalKineticEnergy << '\n';
     141        CoulombBarrier = theCoulombBarrierPtr->GetCoulombBarrier(AResidual,ZResidual,ExEnergy);
     142        //G4cout << "CBarrier(MeV)= " << CoulombBarrier/MeV << G4endl;
     143
     144        //Maximal kinetic energy (JMQ : at the Coulomb barrier)
     145        MaximalKineticEnergy =
     146          CalcMaximalKineticEnergy(G4ParticleTable::GetParticleTable()->
     147                                   GetIonTable()->GetNucleusMass(aZ,anA)+ExEnergy);
     148        //G4cout << "MaxE(MeV)= " << MaximalKineticEnergy/MeV << G4endl;
     149
    158150               
    159         // Emission probability
    160         if (MaximalKineticEnergy <= 0.0)
     151        // Emission probability
     152        if (MaximalKineticEnergy <= 0.0)
    161153          {
    162154            EmissionProbability = 0.0;
    … …  
    165157          {
    166158            // Total emission probability for this channel
    167             EmissionProbability = theEvaporationProbabilityPtr->EmissionProbability(fragment,MaximalKineticEnergy);
     159            EmissionProbability =
     160              theEvaporationProbabilityPtr->EmissionProbability(fragment,MaximalKineticEnergy);
    168161          }
    169162      }
    170    
     163    }
     164   
     165    //G4cout << "Prob= " << EmissionProbability << G4endl;
    171166    return;
    172167}
    173168
    174 
    175169G4FragmentVector * G4GEMChannel::BreakUp(const G4Fragment & theNucleus)
    176170{
    177    
    178171    G4double EvaporatedKineticEnergy = CalcKineticEnergy(theNucleus);
    179172    G4double EvaporatedMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A);
    180173    G4double EvaporatedEnergy = EvaporatedKineticEnergy + EvaporatedMass;
     174
    181175   
    182176    G4ThreeVector momentum(IsotropicVector(std::sqrt(EvaporatedKineticEnergy*
    … …  
    187181    G4LorentzVector EvaporatedMomentum(momentum,EvaporatedEnergy);
    188182    EvaporatedMomentum.boost(theNucleus.GetMomentum().boostVector());
    189    
    190183    G4Fragment * EvaporatedFragment = new G4Fragment(A,Z,EvaporatedMomentum);
    191184#ifdef PRECOMPOUND_TEST
    … …  
    238231
    239232G4double G4GEMChannel::CalcMaximalKineticEnergy(const G4double NucleusTotalE)
    240     // Calculate maximal kinetic energy that can be carried by fragment.
    241 {
    242     G4double ResidualMass = G4ParticleTable::GetParticleTable()->
    243         GetIonTable()->GetNucleusMass( ZResidual, AResidual );
    244     G4double EvaporatedMass = G4ParticleTable::GetParticleTable()->
    245         GetIonTable()->GetNucleusMass( Z, A );
    246        
    247     G4double T = (NucleusTotalE*NucleusTotalE + EvaporatedMass*EvaporatedMass - ResidualMass*ResidualMass)/
    248         (2.0*NucleusTotalE) -
    249         EvaporatedMass - CoulombBarrier;
    250        
    251     return T;
     233// Calculate maximal kinetic energy that can be carried by fragment.
     234//JMQ this is not the assimptotic kinetic energy but the one at the Coulomb barrier
     235{
     236  G4double ResidualMass = G4ParticleTable::GetParticleTable()->
     237    GetIonTable()->GetNucleusMass( ZResidual, AResidual );
     238  G4double EvaporatedMass = G4ParticleTable::GetParticleTable()->
     239    GetIonTable()->GetNucleusMass( Z, A );
     240       
     241  G4double T = (NucleusTotalE*NucleusTotalE + EvaporatedMass*EvaporatedMass - ResidualMass*ResidualMass)/
     242    (2.0*NucleusTotalE) -
     243    EvaporatedMass - CoulombBarrier;
     244       
     245  return T;
    252246}
    253247
    … …  
    256250
    257251G4double G4GEMChannel::CalcKineticEnergy(const G4Fragment & fragment)
    258     // Samples fragment kinetic energy.
    259 {
    260     G4double U = fragment.GetExcitationEnergy();
    261        
    262     G4double NuclearMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass(Z,A);
    263 
    264     G4double a = theLevelDensityPtr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
    265                                                            static_cast<G4int>(fragment.GetZ()),U);
    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
    271    
    272     G4double Alpha = theEvaporationProbabilityPtr->CalcAlphaParam(fragment);
    273     G4double Beta = theEvaporationProbabilityPtr->CalcBetaParam(fragment);
    274     G4double Normalization = theEvaporationProbabilityPtr->GetNormalization();
    275    
    276     G4double Ux = (2.5 + 150.0/AResidual)*MeV;
    277     G4double Ex = Ux + delta0;
    278     G4double T = 1.0/(std::sqrt(a/Ux) - 1.5/Ux);
    279     G4double E0 = Ex - T*(std::log(T*MeV) - std::log(a/MeV)/4.0 - 1.25*std::log(Ux*MeV) + 2.0*std::sqrt(a*Ux));
    280 
    281     G4double InitialLevelDensity;
    282     if ( U < Ex )
     252// Samples fragment kinetic energy.
     253{
     254  G4double U = fragment.GetExcitationEnergy();
     255  G4double NuclearMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass(Z,A);
     256 
     257  G4double Alpha = theEvaporationProbabilityPtr->CalcAlphaParam(fragment);
     258  G4double Beta = theEvaporationProbabilityPtr->CalcBetaParam(fragment);
     259
     260  G4double Normalization = theEvaporationProbabilityPtr->GetNormalization();
     261
     262//                       ***RESIDUAL***
     263  //JMQ (September 2009) the following quantities  refer to the RESIDUAL:
     264  G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
     265  G4double Ux = (2.5 + 150.0/AResidual)*MeV;
     266  G4double Ex = Ux + delta0;
     267  G4double InitialLevelDensity;
     268  //                    ***end RESIDUAL ***
     269 
     270  //                       ***PARENT***
     271  //JMQ (September 2009) the following quantities   refer to the PARENT:
     272 
     273  G4double deltaCN = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
     274                                                                              static_cast<G4int>(fragment.GetZ()));
     275  G4double aCN = theLevelDensityPtr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
     276                                                           static_cast<G4int>(fragment.GetZ()),U-deltaCN);   
     277  G4double UxCN = (2.5 + 150.0/fragment.GetA())*MeV;
     278  G4double ExCN = UxCN + deltaCN;
     279  G4double TCN = 1.0/(std::sqrt(aCN/UxCN) - 1.5/UxCN);
     280  G4double E0CN = ExCN - TCN*(std::log(TCN/MeV) - std::log(aCN*MeV)/4.0 - 1.25*std::log(UxCN/MeV) + 2.0*std::sqrt(aCN*UxCN));
     281  //                       ***end PARENT***
     282 
     283  //JMQ quantities calculated for  CN in InitialLevelDensity
     284  if ( U < ExCN )
     285    {
     286      InitialLevelDensity = (pi/12.0)*std::exp((U-E0CN)/TCN)/TCN;
     287    }
     288  else
     289    {
     290      InitialLevelDensity = (pi/12.0)*std::exp(2*std::sqrt(aCN*(U-deltaCN)))/std::pow(aCN*std::pow(U-deltaCN,5.0),1.0/4.0);
     291    }
     292 
     293  const G4double Spin = theEvaporationProbabilityPtr->GetSpin();
     294//JMQ  BIG BUG fixed: hbarc instead of hbar_Planck !!!!
     295//     it was fixed in total probability (for this channel) but remained still here!!
     296//    G4double g = (2.0*Spin+1.0)*NuclearMass/(pi2* hbar_Planck*hbar_Planck);
     297    G4double g = (2.0*Spin+1.0)*NuclearMass/(pi2* hbarc*hbarc);
     298//
     299//JMQ  fix on Rb and  geometrical cross sections according to Furihata's paper
     300//                      (JAERI-Data/Code 2001-105, p6)
     301  G4double Rb = 0.0;
     302    if (A > 4)
     303    {
     304      G4double Ad = std::pow(G4double(fragment.GetA()-A),1.0/3.0);
     305      G4double Aj = std::pow(G4double(A),1.0/3.0);
     306      Rb = 1.12*(Aj + Ad) - 0.86*((Aj+Ad)/(Aj*Ad))+2.85;
     307      Rb *= fermi;
     308    }
     309    else if (A>1)
    283310      {
    284         InitialLevelDensity = (pi/12.0)*std::exp((U-E0)/T)/T;
    285       }
     311        //      G4double R1 = std::pow(G4double(fragment.GetA()-A),1.0/3.0);
     312        //      G4double R2 = std::pow(G4double(A),1.0/3.0);
     313      G4double Ad = std::pow(G4double(fragment.GetA()-A),1.0/3.0);
     314      G4double Aj = std::pow(G4double(A),1.0/3.0);
     315      //        RN = 1.12*(R1 + R2) - 0.86*((R1+R2)/(R1*R2));
     316      Rb=1.5*(Aj+Ad)*fermi;
     317    }
    286318    else
    287       {
    288         InitialLevelDensity = (pi/12.0)*std::exp(2*std::sqrt(a*(U-delta0)))/std::pow(a*std::pow(U-delta0,5.0),1.0/4.0);
    289       }
    290 
    291     const G4double Spin = theEvaporationProbabilityPtr->GetSpin();
    292     G4double g = (2.0*Spin+1.0)*NuclearMass/(pi2* hbar_Planck*hbar_Planck);
    293     G4double RN = 0.0;
    294     if (A > 4)
    295     {
    296         G4double R1 = std::pow(G4double(fragment.GetA()-A),1.0/3.0);
    297         G4double R2 = std::pow(G4double(A),1.0/3.0);
    298         RN = 1.12*(R1 + R2) - 0.86*((R1+R2)/(R1*R2));
    299         RN *= fermi;
    300     }
    301     else
    302     {
    303         RN = 1.5*fermi;
    304     }
    305     G4double GeometricalXS = pi*RN*RN*std::pow(G4double(fragment.GetA()-A),2./3.);
     319    {
     320      G4double Ad = std::pow(G4double(fragment.GetA()-A),1.0/3.0);
     321      //        RN = 1.5*fermi;
     322      Rb = 1.5*Ad*fermi;
     323    }
     324    //   G4double GeometricalXS = pi*RN*RN*std::pow(G4double(fragment.GetA()-A),2./3.);
     325    G4double GeometricalXS = pi*Rb*Rb;
    306326   
    307327
    308328    G4double ConstantFactor = g*GeometricalXS*Alpha/InitialLevelDensity;
    309329    ConstantFactor *= pi/12.0;
     330    //JMQ : this is the assimptotic maximal kinetic energy of the ejectile
     331    //      (obtained by energy-momentum conservation).
     332    //      In general smaller than U-theSeparationEnergy
    310333    G4double theEnergy = MaximalKineticEnergy + CoulombBarrier;
    311334    G4double KineticEnergy;
    312335    G4double Probability;
    313 
    314 //      std::cout << "\t\tEjectile (" << A << ',' << Z << ") V = " << CoulombBarrier
    315 //            << " Beta = " << Beta << " V+Beta = " << CoulombBarrier+Beta << '\n';
    316 
    317 //G4cout << AResidual << " " << ZResidual << " " << ConstantFactor << " " << Beta << " " << CoulombBarrier << " " << MaximalKineticEnergy << " " << CoulombBarrier + MaximalKineticEnergy + Beta << G4endl;
    318 //090128
    319 if ( CoulombBarrier + MaximalKineticEnergy + Beta <= 0 ) return 0;
    320336
    321337    do
    … …  
    323339        KineticEnergy =  CoulombBarrier + G4UniformRand()*MaximalKineticEnergy;
    324340        Probability = ConstantFactor*(KineticEnergy + Beta);
     341        G4double a = theLevelDensityPtr->LevelDensityParameter(AResidual,ZResidual,theEnergy-KineticEnergy-delta0);
     342        G4double T = 1.0/(std::sqrt(a/Ux) - 1.5/Ux);
     343        //JMQ fix in units
     344        G4double E0 = Ex - T*(std::log(T/MeV) - std::log(a*MeV)/4.0 - 1.25*std::log(Ux/MeV) + 2.0*std::sqrt(a*Ux));
     345       
    325346        if ( theEnergy-KineticEnergy < Ex)
    326347          {
    … …  
    333354          }
    334355        Probability /= Normalization;
    335     }
     356      }
    336357    while (G4UniformRand() > Probability);
    337 
    338 
    339     //  ---------------------------------------------------------------------------------------------------
    340358   
    341359    return KineticEnergy;

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4GEMCoulombBarrierHE.cc,v 1.6 2006/06/29 20:22:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4GEMCoulombBarrierHE.cc,v 1.7 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1055 r1196  
    2929// by V. Lara (Sept 2001)
    3030//
    31 
     31// J. M. Quesada : several fixes in total GEM width
     32// J. M. Quesada 14/07/2009 bug fixed in total emission width (hbarc)
     33// J. M. Quesada (September 2009) several fixes:
     34//       -level density parameter of residual calculated at its right excitation energy.
     35//       -InitialLeveldensity calculated according to the right conditions of the
     36//        initial excited nucleus.
    3237
    3338#include "G4GEMProbability.hh"
    … …  
    6570                                               const G4double MaximalKineticEnergy)
    6671{
    67     G4double EmissionProbability = 0.0;
     72  G4double EmissionProbability = 0.0;
    6873   
    69     if (MaximalKineticEnergy > 0.0 && fragment.GetExcitationEnergy() > 0.0) {
    70         G4double CoulombBarrier = GetCoulombBarrier(fragment);
    71        
    72         EmissionProbability = CalcProbability(fragment,MaximalKineticEnergy,CoulombBarrier);
    73         Normalization = EmissionProbability;
    74         // Next there is a loop over excited states for this channel summing probabilities
    75         if (ExcitationEnergies  &&  ExcitationSpins && ExcitationLifetimes) {
    76             G4double SavedSpin = Spin;
    77             for (unsigned int i = 0; i < ExcitationEnergies->size(); i++) {
    78                 Spin = ExcitationSpins->operator[](i);
    79                 // substract excitation energies
    80                 G4double Tmax = MaximalKineticEnergy - ExcitationEnergies->operator[](i);
    81                 if (Tmax > 0.0) {
    82                     G4double width = CalcProbability(fragment,Tmax,CoulombBarrier);
    83                     // update probability
    84                     if (hbar_Planck*std::log(2.0)/width < ExcitationLifetimes->operator[](i)) {
    85                         EmissionProbability += width;
    86                     }
    87                 }
    88             }
    89             // Restore Spin
    90             Spin = SavedSpin;
    91         }
    92     }
    93     return EmissionProbability;
     74  if (MaximalKineticEnergy > 0.0 && fragment.GetExcitationEnergy() > 0.0) {
     75    G4double CoulombBarrier = GetCoulombBarrier(fragment);
     76     
     77    EmissionProbability = CalcProbability(fragment,MaximalKineticEnergy,CoulombBarrier);
     78    Normalization = EmissionProbability;
     79    // Next there is a loop over excited states for this channel summing probabilities
     80    if (ExcitationEnergies  &&  ExcitationSpins && ExcitationLifetimes) {
     81      G4double SavedSpin = Spin;
     82      for (unsigned int i = 0; i < ExcitationEnergies->size(); i++) {
     83        Spin = ExcitationSpins->operator[](i);
     84        // substract excitation energies
     85        G4double Tmax = MaximalKineticEnergy - ExcitationEnergies->operator[](i);
     86        if (Tmax > 0.0) {
     87          G4double width = CalcProbability(fragment,Tmax,CoulombBarrier);
     88          // update probability
     89          if (hbar_Planck*std::log(2.0)/width < ExcitationLifetimes->operator[](i)) {
     90            EmissionProbability += width;
     91          }
     92        }
     93      }
     94      // Restore Spin
     95      Spin = SavedSpin;
     96    }
     97  }
     98  return EmissionProbability;
    9499}
    95100
    … …  
    97102                                           const G4double MaximalKineticEnergy,
    98103                                           const G4double V)
    99     // Calculate integrated probability (width) for evaporation channel
    100 {
    101     G4double ResidualA = static_cast<G4double>(fragment.GetA() - theA);
    102     //    G4double ResidualZ = static_cast<G4double>(fragment.GetZ() - theZ);
    103     G4double U = fragment.GetExcitationEnergy();
    104        
    105     G4double NuclearMass = G4ParticleTable::GetParticleTable()->
    106         GetIonTable()->GetNucleusMass(theZ,theA);
    107 
    108     G4double a = theEvapLDPptr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
    109                                                       static_cast<G4int>(fragment.GetZ()),U);
    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
    116    
    117     G4double Alpha = CalcAlphaParam(fragment);
    118     G4double Beta = CalcBetaParam(fragment);
    119    
    120    
    121     G4double Ux = (2.5 + 150.0/ResidualA)*MeV;
    122     G4double Ex = Ux + delta0;
    123     G4double T = 1.0/(std::sqrt(a/Ux) - 1.5/Ux);
    124     G4double E0 = Ex - T*(std::log(T*MeV) - std::log(a/MeV)/4.0 - 1.25*std::log(Ux*MeV) + 2.0*std::sqrt(a*Ux));
    125    
    126     G4double Width;
    127     G4double InitialLevelDensity;
    128     if ( MaximalKineticEnergy < Ex ) {
    129         G4double t = MaximalKineticEnergy/T;
    130         Width = (I1(t,t) + (Beta+V)*I0(t))/std::exp(E0/T);
    131         InitialLevelDensity = (pi/12.0)*std::exp((U-E0)/T)/T;
    132     } else {
    133         G4double t = MaximalKineticEnergy/T;
    134         G4double tx = Ex/T;
    135         G4double s = 2.0*std::sqrt(a*(MaximalKineticEnergy-delta0));
    136         G4double sx = 2.0*std::sqrt(a*(Ex-delta0));
    137         Width = I1(t,tx)/std::exp(E0/T) + I3(s,sx)*std::exp(s)/(std::sqrt(2.0)*a);
    138         // For charged particles (Beta+V) = 0 beacuse Beta = -V
    139         if (theZ == 0) {
    140             Width += (Beta+V)*(I0(tx)/std::exp(E0/T) + 2.0*std::sqrt(2.0)*I2(s,sx)*std::exp(s));
    141         }
    142         InitialLevelDensity = (pi/12.0)*std::exp(2*std::sqrt(a*(U-delta0)))/std::pow(a*std::pow(U-delta0,5.0),1.0/4.0);
    143     }
    144    
    145 
    146     G4double g = (2.0*Spin+1.0)*NuclearMass/(pi2* hbar_Planck*hbar_Planck);
    147 
    148     G4double RN = 0.0;
    149     if (theA > 4)
     104// Calculate integrated probability (width) for evaporation channel
     105{
     106  G4double ResidualA = static_cast<G4double>(fragment.GetA() - theA);
     107  G4double ResidualZ = static_cast<G4double>(fragment.GetZ() - theZ);
     108  G4double U = fragment.GetExcitationEnergy();
     109 
     110  G4double NuclearMass = G4ParticleTable::GetParticleTable()->
     111    GetIonTable()->GetNucleusMass(theZ,theA);
     112 
     113 
     114  G4double Alpha = CalcAlphaParam(fragment);
     115  G4double Beta = CalcBetaParam(fragment);
     116 
     117 
     118  //                       ***RESIDUAL***
     119  //JMQ (September 2009) the following quantities refer to the RESIDUAL:
     120 
     121  G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection( static_cast<G4int>( ResidualA ) , static_cast<G4int>( ResidualZ ) ); 
     122 
     123  G4double a = theEvapLDPptr->LevelDensityParameter(static_cast<G4int>(ResidualA),
     124                                                    static_cast<G4int>(ResidualZ),MaximalKineticEnergy+V-delta0);
     125  G4double Ux = (2.5 + 150.0/ResidualA)*MeV;
     126  G4double Ex = Ux + delta0;
     127  G4double T = 1.0/(std::sqrt(a/Ux) - 1.5/Ux);
     128  //JMQ fixed bug in units
     129  G4double E0 = Ex - T*(std::log(T/MeV) - std::log(a*MeV)/4.0 - 1.25*std::log(Ux/MeV) + 2.0*std::sqrt(a*Ux));
     130  //                      ***end RESIDUAL ***
     131 
     132  //                       ***PARENT***
     133  //JMQ (September 2009) the following quantities refer to the PARENT:
     134     
     135  G4double deltaCN=G4PairingCorrection::GetInstance()->
     136    GetPairingCorrection(static_cast<G4int>(fragment.GetA()),static_cast<G4int>(fragment.GetZ()));                                     
     137  G4double aCN = theEvapLDPptr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
     138                                                      static_cast<G4int>(fragment.GetZ()),U-deltaCN);
     139  G4double UxCN = (2.5 + 150.0/fragment.GetA())*MeV;
     140  G4double ExCN = UxCN + deltaCN;
     141  G4double TCN = 1.0/(std::sqrt(aCN/UxCN) - 1.5/UxCN);
     142  //JMQ fixed bug in units
     143  G4double E0CN = ExCN - TCN*(std::log(TCN/MeV) - std::log(aCN*MeV)/4.0 - 1.25*std::log(UxCN/MeV) + 2.0*std::sqrt(aCN*UxCN));
     144//                       ***end PARENT***
     145
     146  G4double Width;
     147  G4double InitialLevelDensity;
     148  G4double t = MaximalKineticEnergy/T;
     149  if ( MaximalKineticEnergy < Ex ) {
     150    //JMQ 190709 bug in I1 fixed (T was  missing)
     151    Width = (I1(t,t)*T + (Beta+V)*I0(t))/std::exp(E0/T);
     152//JMQ 160909 fix:  InitialLevelDensity has been taken away (different conditions for initial CN..)
     153  } else {
     154    G4double tx = Ex/T;
     155    G4double s = 2.0*std::sqrt(a*(MaximalKineticEnergy-delta0));
     156    G4double sx = 2.0*std::sqrt(a*(Ex-delta0));
     157    Width = I1(t,tx)*T/std::exp(E0/T) + I3(s,sx)*std::exp(s)/(std::sqrt(2.0)*a);
     158    // For charged particles (Beta+V) = 0 beacuse Beta = -V
     159    if (theZ == 0) {
     160      Width += (Beta+V)*(I0(tx)/std::exp(E0/T) + 2.0*std::sqrt(2.0)*I2(s,sx)*std::exp(s));
     161    }
     162  }
     163 
     164  //JMQ 14/07/2009 BIG BUG : NuclearMass is in MeV => hbarc instead of hbar_planck must be used
     165  //    G4double g = (2.0*Spin+1.0)*NuclearMass/(pi2* hbar_Planck*hbar_Planck);
     166  G4double g = (2.0*Spin+1.0)*NuclearMass/(pi2* hbarc*hbarc);
     167 
     168  //JMQ 190709 fix on Rb and  geometrical cross sections according to Furihata's paper
     169  //                      (JAERI-Data/Code 2001-105, p6)
     170  //    G4double RN = 0.0;
     171  G4double Rb = 0.0;
     172  if (theA > 4)
    150173    {
    151         G4double R1 = std::pow(ResidualA,1.0/3.0);
    152         G4double R2 = std::pow(G4double(theA),1.0/3.0);
    153         RN = 1.12*(R1 + R2) - 0.86*((R1+R2)/(R1*R2));
    154         RN *= fermi;
    155     }
     174      //        G4double R1 = std::pow(ResidualA,1.0/3.0);
     175      //        G4double R2 = std::pow(G4double(theA),1.0/3.0);
     176      G4double Ad = std::pow(ResidualA,1.0/3.0);
     177      G4double Aj = std::pow(G4double(theA),1.0/3.0);
     178      //        RN = 1.12*(R1 + R2) - 0.86*((R1+R2)/(R1*R2));
     179      Rb = 1.12*(Aj + Ad) - 0.86*((Aj+Ad)/(Aj*Ad))+2.85;
     180      Rb *= fermi;
     181    }
     182  else if (theA>1)
     183    {
     184      G4double Ad = std::pow(ResidualA,1.0/3.0);
     185      G4double Aj = std::pow(G4double(theA),1.0/3.0);
     186      Rb=1.5*(Aj+Ad)*fermi;
     187    }
     188  else
     189    {
     190      G4double Ad = std::pow(ResidualA,1.0/3.0);
     191      Rb = 1.5*Ad*fermi;
     192    }
     193  //   G4double GeometricalXS = pi*RN*RN*std::pow(ResidualA,2./3.);
     194  G4double GeometricalXS = pi*Rb*Rb;
     195  //end of JMQ fix on Rb by 190709
     196 
     197
     198
     199//JMQ 160909 fix: initial level density must be calculated according to the
     200// conditions at the initial compound nucleus
     201// (it has been removed from previous "if" for the residual)
     202
     203   if ( U < ExCN )
     204      {
     205        InitialLevelDensity = (pi/12.0)*std::exp((U-E0CN)/TCN)/TCN;
     206      }
    156207    else
    157     {
    158         RN = 1.5*fermi;
    159     }
    160     G4double GeometricalXS = pi*RN*RN*std::pow(ResidualA,2./3.);
    161 
    162 
    163     Width *= std::sqrt(pi)*g*GeometricalXS*Alpha/(12.0*InitialLevelDensity);
    164     return Width;
     208      {
     209        InitialLevelDensity = (pi/12.0)*std::exp(2*std::sqrt(aCN*(U-deltaCN)))/std::pow(aCN*std::pow(U-deltaCN,5.0),1.0/4.0);
     210      }
     211 //
     212
     213
     214  //JMQ 190709 BUG : pi instead of sqrt(pi) must be here according to Furihata's report:
     215  //    Width *= std::sqrt(pi)*g*GeometricalXS*Alpha/(12.0*InitialLevelDensity);
     216  Width *= pi*g*GeometricalXS*Alpha/(12.0*InitialLevelDensity);
     217   
     218
     219  return Width;
    165220}
    166221
    … …  
    170225G4double G4GEMProbability::I0(const G4double t)
    171226{
    172     G4double result = (std::exp(t) - 1.0);
    173     return result;
     227  G4double result = (std::exp(t) - 1.0);
     228  return result;
    174229}
    175230
    176231G4double G4GEMProbability::I1(const G4double t, const G4double tx)
    177232{
    178     G4double result = t - tx + 1.0;
    179     result *= std::exp(tx);
    180     result -= (t + 1.0);
    181     return result;
     233  G4double result = t - tx + 1.0;
     234  result *= std::exp(tx);
     235  result -= (t + 1.0);
     236  return result;
    182237}
    183238
    … …  
    185240G4double G4GEMProbability::I2(const G4double s, const G4double sx)
    186241{
    187     G4double S = 1.0/std::sqrt(s);
    188     G4double Sx = 1.0/std::sqrt(sx);
    189    
    190     G4double p1 = S*S*S*( 1.0 + S*S*( 1.5 + 3.75*S*S) );
    191     G4double p2 = Sx*Sx*Sx*( 1.0 + Sx*Sx*( 1.5 + 3.75*Sx*Sx) )*std::exp(sx-s);
    192    
    193     return p1-p2;
     242  G4double S = 1.0/std::sqrt(s);
     243  G4double Sx = 1.0/std::sqrt(sx);
     244 
     245  G4double p1 = S*S*S*( 1.0 + S*S*( 1.5 + 3.75*S*S) );
     246  G4double p2 = Sx*Sx*Sx*( 1.0 + Sx*Sx*( 1.5 + 3.75*Sx*Sx) )*std::exp(sx-s);
     247 
     248  return p1-p2;
    194249}
    195250
    196251G4double G4GEMProbability::I3(const G4double s, const G4double sx)
    197252{
    198     G4double s2 = s*s;
    199     G4double sx2 = sx*sx;
    200     G4double S = 1.0/std::sqrt(s);
    201     G4double S2 = S*S;
    202     G4double Sx = 1.0/std::sqrt(sx);
    203     G4double Sx2 = Sx*Sx;
    204    
    205     G4double p1 = S *(2.0 + S2 *( 4.0 + S2 *( 13.5 + S2 *( 60.0 + S2 * 325.125 ))));
    206     G4double p2 = Sx*Sx2 *(
    207         (s2-sx2) + Sx2 *(
    208             (1.5*s2+0.5*sx2) + Sx2 *(
    209                 (3.75*s2+0.25*sx2) + Sx2 *(
    210                     (12.875*s2+0.625*sx2) + Sx2 *(
    211                         (59.0625*s2+0.9375*sx2) + Sx2 *(324.8*s2+3.28*sx2))))));
    212 
     253  G4double s2 = s*s;
     254  G4double sx2 = sx*sx;
     255  G4double S = 1.0/std::sqrt(s);
     256  G4double S2 = S*S;
     257  G4double Sx = 1.0/std::sqrt(sx);
     258  G4double Sx2 = Sx*Sx;
     259 
     260  G4double p1 = S *(2.0 + S2 *( 4.0 + S2 *( 13.5 + S2 *( 60.0 + S2 * 325.125 ))));
     261  G4double p2 = Sx*Sx2 *(
     262                        (s2-sx2) + Sx2 *(
     263                                          (1.5*s2+0.5*sx2) + Sx2 *(
     264                                                                   (3.75*s2+0.25*sx2) + Sx2 *(
     265                                                                                              (12.875*s2+0.625*sx2) + Sx2 *(
     266                                                                                                                            (59.0625*s2+0.9375*sx2) + Sx2 *(324.8*s2+3.28*sx2))))));
     267 
    213268  p2 *= std::exp(sx-s);
    214 
     269 
    215270  return p1-p2;
    216271}

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4He3GEMChannel.cc,v 1.4 2006/06/29 20:22:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4He3GEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4He3GEMProbability.cc,v 1.4 2006/06/29 20:22:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4He3GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Nov 1999)
    3232//
    33 
     33// J.M. Quesada (July 2009) C's and k's  values according to Furihata's paper
     34// (based on notes added on proof in Dostrovskii's paper)
    3435
    3536#include "G4He3GEMProbability.hh"
    … …  
    7071}
    7172
     73//JMQ 190709 C's values from Furihata's paper
     74//(notes added on proof in Dostrovskii's paper)
     75G4double G4He3GEMProbability::CCoeficient(const G4double/* aZ*/) const
     76{
     77    return 0.;
     78}
    7279
    73 G4double G4He3GEMProbability::CCoeficient(const G4double aZ) const
    74 {
     80
     81//G4double G4He3GEMProbability::CCoeficient(const G4double aZ) const
     82//{
    7583    // Data comes from
    7684    // Dostrovsky, Fraenkel and Friedlander
    … …  
    8189    //  G4double Calpha[5] = { 0.10, 0.10, 0.10, 0.08, 0.06};
    8290    // C for He3 is equal to C for alpha times 4/3
    83     G4double C = 0.0;
     91//    G4double C = 0.0;
    8492       
    8593       
    86     if (aZ <= 30) {
    87         C = 0.10;
    88     } else if (aZ <= 50) {
    89         C = 0.1 + -((aZ-50.)/20.)*0.02;
    90     } else if (aZ < 70) {
    91         C = 0.08 + -((aZ-70.)/20.)*0.02;
    92     } else {
    93         C = 0.06;
    94     }
    95     return C*(4.0/3.0);
    96 }
     94//    if (aZ <= 30) {
     95//        C = 0.10;
     96//    } else if (aZ <= 50) {
     97//        C = 0.1 + -((aZ-50.)/20.)*0.02;
     98//   } else if (aZ < 70) {
     99//        C = 0.08 + -((aZ-70.)/20.)*0.02;
     100//    } else {
     101//        C = 0.06;
     102//    }
     103//    return C*(4.0/3.0);
     104//}
    97105

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4He6GEMProbability.cc,v 1.5 2006/06/29 20:22:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4He6GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4He8GEMProbability.cc,v 1.4 2006/06/29 20:22:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4He8GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Li6GEMProbability.cc,v 1.5 2006/06/29 20:22:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Li6GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Li7GEMProbability.cc,v 1.5 2006/06/29 20:22:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Li7GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Li8GEMProbability.cc,v 1.5 2006/06/29 20:22:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Li8GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Li9GEMProbability.cc,v 1.5 2006/06/29 20:22:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Li9GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Mg22GEMProbability.cc,v 1.4 2006/06/29 20:22:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Mg22GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Mg23GEMProbability.cc,v 1.4 2006/06/29 20:22:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Mg23GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Mg24GEMProbability.cc,v 1.5 2006/06/29 20:22:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Mg24GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Mg25GEMProbability.cc,v 1.5 2006/06/29 20:22:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Mg25GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Mg26GEMProbability.cc,v 1.4 2006/06/29 20:22:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Mg26GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Mg27GEMProbability.cc,v 1.4 2006/06/29 20:22:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Mg27GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Mg28GEMProbability.cc,v 1.4 2006/06/29 20:22:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Mg28GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4N12GEMProbability.cc,v 1.5 2006/06/29 20:22:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4N12GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4N13GEMProbability.cc,v 1.5 2006/06/29 20:22:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4N13GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4N14GEMProbability.cc,v 1.5 2006/06/29 20:22:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4N14GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4N15GEMProbability.cc,v 1.5 2006/06/29 20:22:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4N15GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4N16GEMProbability.cc,v 1.5 2006/06/29 20:22:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4N16GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4N17GEMProbability.cc,v 1.4 2006/06/29 20:22:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4N17GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Na21GEMProbability.cc,v 1.5 2006/06/29 20:22:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Na21GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Na22GEMProbability.cc,v 1.5 2006/06/29 20:22:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Na22GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Na23GEMProbability.cc,v 1.5 2006/06/29 20:22:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Na23GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Na24GEMProbability.cc,v 1.4 2006/06/29 20:23:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Na24GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Na25GEMProbability.cc,v 1.4 2006/06/29 20:23:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Na25GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Ne18GEMProbability.cc,v 1.5 2006/06/29 20:23:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Ne18GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Ne19GEMProbability.cc,v 1.5 2006/06/29 20:23:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Ne19GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Ne20GEMProbability.cc,v 1.5 2006/06/29 20:23:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Ne20GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Ne21GEMProbability.cc,v 1.5 2006/06/29 20:23:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Ne21GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Ne22GEMProbability.cc,v 1.4 2006/06/29 20:23:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Ne22GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Ne23GEMProbability.cc,v 1.4 2006/06/29 20:23:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Ne23GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Ne24GEMProbability.cc,v 1.4 2006/06/29 20:23:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Ne24GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4NeutronGEMChannel.cc,v 1.4 2006/06/29 20:23:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4NeutronGEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4NeutronGEMProbability.cc,v 1.4 2006/06/29 20:23:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4NeutronGEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4O14GEMProbability.cc,v 1.5 2006/06/29 20:23:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4O14GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4O15GEMProbability.cc,v 1.5 2006/06/29 20:23:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4O15GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4O16GEMProbability.cc,v 1.5 2006/06/29 20:23:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4O16GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4O17GEMProbability.cc,v 1.5 2006/06/29 20:23:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4O17GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4O18GEMProbability.cc,v 1.5 2006/06/29 20:23:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4O18GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4O19GEMProbability.cc,v 1.5 2006/06/29 20:23:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4O19GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4O20GEMProbability.cc,v 1.4 2006/06/29 20:23:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4O20GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4ProtonGEMChannel.cc,v 1.4 2006/06/29 20:23:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4ProtonGEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4ProtonGEMProbability.cc,v 1.4 2006/06/29 20:23:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4ProtonGEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Sept 2001)
    3232//
    33 
     33// J.M. Quesada (July 2009) C's and k's  values according to Furihata's paper
     34// (based on notes added on proof in Dostrovskii's paper)
    3435
    3536#include "G4ProtonGEMProbability.hh"
    … …  
    7071}
    7172
    72 
     73//JMQ 190709 C's values from Furihata's paper
     74//(notes added on proof in Dostrovskii's paper)
     75//data = {{20, 0.}, {30, -0.06}, {40, -0.10}, {50, -0.10}};
    7376G4double G4ProtonGEMProbability::CCoeficient(const G4double aZ) const
    7477{
     78   G4double C = 0.0;
     79       
     80    if (aZ >= 50){
     81      C=-0.10;     
     82    } else if (aZ <= 20) {
     83        C = 0.0;
     84    } else C=0.123482-0.00534691*aZ-0.0000610624*aZ*aZ+5.93719*1e-7*aZ*aZ*aZ+1.95687*1e-8*aZ*aZ*aZ*aZ; 
     85    return C;
     86       
     87}
     88
     89//G4double G4ProtonGEMProbability::CCoeficient(const G4double aZ) const
     90//{
    7591    // Data comes from
    7692    // Dostrovsky, Fraenkel and Friedlander
    … …  
    8096    // G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
    8197    // G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
    82     G4double C = 0.0;
     98//    G4double C = 0.0;
    8399       
    84     if (aZ >= 70) {
    85         C = 0.10;
    86     } else {
    87         C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
    88     }
     100//    if (aZ >= 70) {
     101//        C = 0.10;
     102//    } else {
     103//        C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
     104//    }
    89105       
    90     return C;
     106//    return C;
    91107       
    92 }
     108//}

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4TritonGEMChannel.cc,v 1.4 2006/06/29 20:23:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4TritonGEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4TritonGEMProbability.cc,v 1.4 2006/06/29 20:23:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4TritonGEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    3131// by V. Lara (Nov 1999)
    3232//
     33// J.M. Quesada (July 2009) C's and k's  values according to Furihata's paper
     34// (based on notes added on proof in Dostrovskii's paper)
    3335
    3436
    … …  
    7072}
    7173
    72 
     74//JMQ 190709 C's values from Furihata's paper
     75//(notes added on proof in Dostrovskii's paper)
     76//data = {{20, 0.}, {30, -0.06}, {40, -0.10}, {50, -0.10}};
    7377G4double G4TritonGEMProbability::CCoeficient(const G4double aZ) const
    7478{
     79   G4double C = 0.0;
     80       
     81    if (aZ >= 50){
     82      C=-0.10;     
     83    } else if (aZ <= 20) {
     84        C = 0.0;
     85    } else C=0.123482-0.00534691*aZ-0.0000610624*aZ*aZ+5.93719*1e-7*aZ*aZ*aZ+1.95687*1e-8*aZ*aZ*aZ*aZ; 
     86    return C/3.;
     87       
     88}
     89
     90
     91//G4double G4TritonGEMProbability::CCoeficient(const G4double aZ) const
     92//{
    7593    // Data comes from
    7694    // Dostrovsky, Fraenkel and Friedlander
    … …  
    8199    // G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
    82100    // C for triton is equal to C for protons divided by 3
    83     G4double C = 0.0;
     101//    G4double C = 0.0;
    84102       
    85     if (aZ >= 70) {
    86         C = 0.10;
    87     } else {
    88         C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
    89     }
     103//    if (aZ >= 70) {
     104//      C = 0.10;
     105//    } else {
     106//      C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
     107//    }
    90108       
    91     return C/3.0;
     109//    return C/3.0;
    92110       
    93 }
     111//}
Note: See TracChangeset for help on using the changeset viewer.