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

update CVS release candidate geant4.9.3.01

Location:
trunk/source/processes/hadronic/models/de_excitation/fission
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh

    r1007 r1196  
    2626//
    2727// $Id: G4CompetitiveFission.hh,v 1.3 2006/06/29 20:13:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

  • trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh

    r1007 r1196  
    2626//
    2727// $Id: G4FissionBarrier.hh,v 1.3 2006/06/29 20:13:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

  • trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh

    r1007 r1196  
    2626//
    2727// $Id: G4FissionLevelDensityParameter.hh,v 1.3 2006/06/29 20:13:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

  • trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh

    r1007 r1196  
    2626//
    2727// $Id: G4FissionParameters.hh,v 1.3 2006/06/29 20:13:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

  • trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh

    r1007 r1196  
    2626//
    2727// $Id: G4FissionProbability.hh,v 1.3 2006/06/29 20:13:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

  • trunk/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh

    r1007 r1196  
    2626//
    2727// $Id: G4VFissionBarrier.hh,v 1.4 2006/06/29 20:13:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1055 r1196  
    2626//
    2727// $Id: G4CompetitiveFission.cc,v 1.11 2009/03/13 18:57:17 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2626//
    2727// $Id: G4FissionBarrier.cc,v 1.5 2006/06/29 20:13:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4FissionLevelDensityParameter.cc,v 1.4 2006/06/29 20:13:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4FissionLevelDensityParameter.cc,v 1.6 2009/11/19 10:32:42 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 
     33// J.M.Quesada (July 2009):  fission level density parameter tuned for spallation data.
     34// V.Ivanchenko (July 2009): fixed logic and remove wrong usage of MeV
     35// J.M.Quesada (30.10.09):   retuning for IAEA spallation data
    3436
    3537#include "G4FissionLevelDensityParameter.hh"
    … …  
    6870LevelDensityParameter(const G4int A,const G4int Z,const G4double U) const
    6971{
    70     G4double EvapLDP = theEvaporationLevelDensityParameter.LevelDensityParameter(A,Z,U);
     72  G4double EvapLDP =
     73    theEvaporationLevelDensityParameter.LevelDensityParameter(A,Z,U);
    7174
    72     if (Z >= 89) return 1.04*EvapLDP;
    73     else if (Z >= 85) return (1.04*(1./MeV) + 0.01*(89-Z))*EvapLDP;
    74     else return 1.08*EvapLDP;
     75  if(Z >= 89)      { EvapLDP *= 1.01; }
     76  else if(Z >= 85) { EvapLDP *= (1.01 + 0.002*(89 - Z)); }
     77  else             { EvapLDP *= 1.02; }
     78
     79  return EvapLDP;
     80
     81  /*
     82  if(Z >= 89)      EvapLDP *= 1.04;
     83  else if(Z >= 85) EvapLDP *= (1.04 + 0.01*(89 - Z));
     84  else             EvapLDP *= 1.09;
     85
     86  //JMQ 310509
     87  return 1.07*EvapLDP;
     88  */
    7589}

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

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4FissionParameters.cc,v 1.5 2006/06/29 20:13:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4FissionParameters.cc,v 1.7 2009/11/19 10:30:49 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 
     33//J. M. Quesada (May 2009): sigma_sym (SigmaS) tuned for spallation data.
     34//J. M. Quesada (30.10.09): retuning for IAEA spallation data
    3435
    3536#include "G4FissionParameters.hh"
    … …  
    4546{
    4647    G4double U = ExEnergy;
    47  
     48   
    4849    As = A/2.0;
    49 
     50   
    5051    if (A <= 235) Sigma2 = 5.6;  // MeV
    5152    else Sigma2 = 5.6 + 0.096*(A-235); // MeV
    52 
     53   
    5354    Sigma1 = 0.5*Sigma2; // MeV
    54 
     55   
    5556    SigmaS = std::exp(0.00553*U/MeV + 2.1386); // MeV
    56     if (SigmaS > 20.0) SigmaS = 20.0;
    57 
     57   
     58    //JMQ 310509
     59    //    if (SigmaS > 20.0) SigmaS = 20.0;
     60    //   SigmaS*=1.3;
     61    //JMQ 301009: retuning (after CEM transition prob.have been chosen as default)
     62    SigmaS*=0.8;
     63    //
     64   
    5865    G4double FasymAsym = 2.0*std::exp(-((A2-As)*(A2-As))/(2.0*Sigma2*Sigma2)) +
    59         std::exp(-((A1-As)*(A1-As))/(2.0*Sigma1*Sigma1));
    60  
     66      std::exp(-((A1-As)*(A1-As))/(2.0*Sigma1*Sigma1));
     67   
    6168    G4double FsymA1A2 = std::exp(-((As-(A1+A2)/2.0)*(As-(A1+A2)/2.0))/(2.0*SigmaS*SigmaS));
    62  
    63 
     69   
     70   
    6471    G4double wa = 0.0;
    6572    w = 0.0;
    6673    if (Z >= 90) {         // Z >= 90
    67         if (U <= 16.25) wa = std::exp(0.5385*U/MeV-9.9564);  // U <= 16.25 MeV
    68         else wa = std::exp(0.09197*U/MeV-2.7003);            // U  > 16.25 MeV
     74      if (U <= 16.25) wa = std::exp(0.5385*U/MeV-9.9564);  // U <= 16.25 MeV
     75      else wa = std::exp(0.09197*U/MeV-2.7003);            // U  > 16.25 MeV
    6976    } else if (Z == 89) {  // Z == 89
    70         wa = std::exp(0.09197*U-1.0808);
     77      wa = std::exp(0.09197*U-1.0808);
    7178    } else if (Z >= 82) {  //  82 <= Z <= 88
    72         G4double X = FissionBarrier - 7.5*MeV;
    73         if (X < 0.0) X = 0.0;
    74         wa = std::exp(0.09197*(U-X)/MeV-1.0808);
     79      G4double X = FissionBarrier - 7.5*MeV;
     80      if (X < 0.0) X = 0.0;
     81      wa = std::exp(0.09197*(U-X)/MeV-1.0808);
    7582    } else {               // Z < 82
    76         w = 1001.0;
     83      w = 1001.0;
    7784    }
    78  
     85   
    7986    if (w == 0.0) {
    80         G4double w1 = std::max(1.03*wa - FasymAsym, 0.0001);
    81         G4double w2 = std::max(1.0 - FsymA1A2*wa,   0.0001);
     87      G4double w1 = std::max(1.03*wa - FasymAsym, 0.0001);
     88      G4double w2 = std::max(1.0 - FsymA1A2*wa,   0.0001);
     89     
     90      w = w1/w2;
     91     
     92      if (82 <= Z && Z < 89 && A < 227)  w *= std::exp(0.3*(227-A));
     93    }
    8294   
    83         w = w1/w2;
    84 
    85         if (82 <= Z && Z < 89 && A < 227)  w *= std::exp(0.3*(227-A));
    86     }
    87  
    8895}
    8996

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

    r1055 r1196  
    2626//
    2727// $Id: G4FissionProbability.cc,v 1.9 2009/02/15 17:03:25 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations

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

    r1007 r1196  
    2626//
    2727// $Id: G4VFissionBarrier.cc,v 1.4 2006/06/29 20:13:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
Note: See TracChangeset for help on using the changeset viewer.