Ignore:
Timestamp:
Dec 22, 2010, 3:52:27 PM (14 years ago)
Author:
garnier
Message:

geant4 tag 9.4

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

Legend:

Unmodified
Added
Removed

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

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4CompetitiveFission.hh,v 1.3 2006/06/29 20:13:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4CompetitiveFission.hh,v 1.5 2010/11/17 20:22:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    5858private:
    5959  G4CompetitiveFission(const G4CompetitiveFission &right);
    60 
    6160  const G4CompetitiveFission & operator=(const G4CompetitiveFission &right);
    62 public:
    6361  G4bool operator==(const G4CompetitiveFission &right) const;
    6462  G4bool operator!=(const G4CompetitiveFission &right) const;
    … …  
    121119  G4double LevelDensityParameter;
    122120
    123 
    124 
    125 
    126121  //  --------------------
    127122
    128 
    129123  // Sample AtomicNumber of Fission products
    130   G4int FissionAtomicNumber(const G4int A, const G4FissionParameters & theParam);
    131   G4double MassDistribution(const G4double x, const G4double A, const G4FissionParameters & theParam);
     124  G4int FissionAtomicNumber(G4int A, const G4FissionParameters & theParam);
     125  G4double MassDistribution(G4double x, G4double A, const G4FissionParameters & theParam);
    132126
    133127
    134128  // Sample Charge of fission products
    135   G4int FissionCharge(const G4double A, const G4double Z, const G4double Af);
     129  G4int FissionCharge(G4double A, G4double Z, G4double Af);
    136130
    137131
    138132  // Sample Kinetic energy of fission products
    139   G4double FissionKineticEnergy(const G4double A, const G4double Z,
    140                                 const G4double Af1, const G4double Zf1,
    141                                 const G4double Af2, const G4double Zf2,
    142                                 const G4double U, const G4double Tmax,
     133  G4double FissionKineticEnergy(G4int A, G4int Z,
     134                                G4double Af1, G4double Zf1,
     135                                G4double Af2, G4double Zf2,
     136                                G4double U, G4double Tmax,
    143137                                const G4FissionParameters & theParam);
    144138   
     139  G4double Ratio(G4double A, G4double A11, G4double B1, G4double A00);
     140  G4double SymmetricRatio(G4int A, G4double A11);
     141  G4double AsymmetricRatio(G4int A, G4double A11);
    145142
    146 
    147   G4double Ratio(const G4double A,const G4double A11,const G4double B1,const G4double A00);
    148   G4double SymmetricRatio(const G4double A,const G4double A11);
    149   G4double AsymmetricRatio(const G4double A,const G4double A11);
    150 
    151 
    152 
    153   G4ThreeVector IsotropicVector(const G4double Magnitude = 1.0);
    154 
     143  G4ThreeVector IsotropicVector(G4double Magnitude = 1.0);
    155144
    156145#ifdef debug
    … …  
    159148#endif
    160149
    161 
    162150};
    163 
    164 
    165151
    166152#endif

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

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4FissionBarrier.hh,v 1.5 2009/12/16 16:50:07 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4FissionBarrier.hh,v 1.6 2010/11/17 20:22:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4141{
    4242public:
    43   G4FissionBarrier() {};
    44   ~G4FissionBarrier() {};
     43  G4FissionBarrier();
     44  ~G4FissionBarrier();
    4545
    4646private:
    … …  
    5252 
    5353public:
    54   G4double FissionBarrier(const G4int A, const G4int Z, const G4double U);
     54  G4double FissionBarrier(G4int A, G4int Z, G4double U);
    5555
    5656
    5757private:
    5858
    59   G4double BarashenkovFissionBarrier(const G4int A, const G4int Z);
     59  G4double BarashenkovFissionBarrier(G4int A, G4int Z);
    6060 
    61   G4double SellPlusPairingCorrection(const G4int Z, const G4int N)
     61  inline G4double SellPlusPairingCorrection(G4int Z, G4int N)
    6262  {
    6363    G4CameronShellPlusPairingCorrections* SPtr = G4CameronShellPlusPairingCorrections::GetInstance();

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

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4FissionLevelDensityParameter.hh,v 1.3 2006/06/29 20:13:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4FissionLevelDensityParameter.hh,v 1.4 2010/11/17 20:22:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4545{
    4646public:
    47   G4FissionLevelDensityParameter() {};
    48   virtual ~G4FissionLevelDensityParameter() {};
     47  G4FissionLevelDensityParameter();
     48  virtual ~G4FissionLevelDensityParameter();
    4949
    5050private: 
    … …  
    5656 
    5757public:
    58   G4double LevelDensityParameter(const G4int A,const G4int Z,const G4double U) const;
     58  G4double LevelDensityParameter(G4int A, G4int Z, G4double U) const;
    5959
    6060 

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

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4FissionParameters.hh,v 1.3 2006/06/29 20:13:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4FissionParameters.hh,v 1.4 2010/11/17 20:22:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4444public:
    4545  // Only available constructor
    46   G4FissionParameters(const G4int A, const G4int Z, const G4double ExEnergy, const G4double FissionBarrier);
     46  G4FissionParameters(G4int A, G4int Z, G4double ExEnergy, G4double FissionBarrier);
    4747
    48   ~G4FissionParameters() {}; 
     48  ~G4FissionParameters(); 
    4949
    5050private: 
    5151  // Default constructor
    52   G4FissionParameters() {};
     52  G4FissionParameters();
    5353
    5454  // Copy constructor

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

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4FissionProbability.hh,v 1.3 2006/06/29 20:13:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4FissionProbability.hh,v 1.4 2010/11/17 20:22:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4646public:
    4747  // Default constructor
    48   G4FissionProbability() {};
     48  G4FissionProbability();
    4949
    50   ~G4FissionProbability() {}; 
     50  ~G4FissionProbability(); 
    5151
    5252private: 
    … …  
    5959 
    6060public:
    61         G4double EmissionProbability(const G4Fragment & fragment, const G4double MaximalKineticEnergy);
     61  G4double EmissionProbability(const G4Fragment & fragment, G4double MaximalKineticEnergy);
    6262
    6363private:
    64         G4EvaporationLevelDensityParameter theEvapLDP;
    65         G4FissionLevelDensityParameter theFissLDP;
     64  G4EvaporationLevelDensityParameter theEvapLDP;
     65  G4FissionLevelDensityParameter theFissLDP;
    6666
    6767

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

    r819 r1347  
    2525//
    2626#ifndef G4ParaFissionModel_h
    27 #define G4ParaFissionModel_h
     27#define G4ParaFissionModel_h 1
    2828
    2929#include "G4CompetitiveFission.hh"
    … …  
    4949    SetMaxEnergy( 60.*MeV );
    5050  }
     51
     52  ~G4ParaFissionModel() {};
    5153 
    5254  virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack,
    53                                               G4Nucleus& theNucleus)
     55                                        G4Nucleus& theNucleus)
    5456  {
    5557    theParticleChange.Clear();
    … …  
    5961    // prepare the fragment
    6062
    61     G4Fragment anInitialState;
    62     G4double anA = theNucleus.GetN();
    63     G4double aZ = theNucleus.GetZ();
    64     G4double nucMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(G4int(aZ) ,G4int(anA));
    65      
    66     anA += aTrack.GetDefinition()->GetBaryonNumber();
    67     aZ += aTrack.GetDefinition()->GetPDGCharge();
     63    G4int A = theNucleus.GetA_asInt();
     64    G4int Z = theNucleus.GetZ_asInt();
     65    G4double nucMass =
     66      G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A);
    6867     
    6968    G4int numberOfEx = aTrack.GetDefinition()->GetBaryonNumber();
    70     G4int numberOfCh = G4int(std::abs(aTrack.GetDefinition()->GetPDGCharge()));
     69    G4int numberOfCh = G4int(aTrack.GetDefinition()->GetPDGCharge() + 0.5);
    7170    G4int numberOfHoles = 0;
     71
     72    A += numberOfEx;
     73    Z += numberOfCh;
    7274     
    73     G4ThreeVector exciton3Momentum = aTrack.Get4Momentum().vect();
    74     G4double compoundMass = aTrack.GetTotalEnergy();
    75     compoundMass += nucMass;
    76     compoundMass = std::sqrt(compoundMass*compoundMass - exciton3Momentum*exciton3Momentum);
    77     G4LorentzVector fragment4Momentum(exciton3Momentum,
    78                                std::sqrt(exciton3Momentum.mag2()+compoundMass*compoundMass));
    79    
    80     anInitialState.SetA(anA);
    81     anInitialState.SetZ(aZ);
    82     anInitialState.SetNumberOfParticles(numberOfEx-numberOfHoles);
    83     anInitialState.SetNumberOfCharged(numberOfCh);
    84     anInitialState.SetNumberOfHoles(numberOfHoles);
    85     anInitialState.SetMomentum(fragment4Momentum);
     75    G4LorentzVector v = aTrack.Get4Momentum() + G4LorentzVector(0.0,0.0,0.0,nucMass);
     76    G4Fragment anInitialState(Z,A,v);
     77    anInitialState.SetNumberOfExcitedParticle(numberOfEx,numberOfCh);
     78    anInitialState.SetNumberOfHoles(0,0);
    8679
    8780    // do the fission
    … …  
    10396        {
    10497          G4ReactionProduct* rp0 = (*theExcitationResult)[j];
    105           G4DynamicParticle* p0 = new G4DynamicParticle;
    106           p0->SetDefinition(rp0->GetDefinition() );
    107           p0->SetMomentum(rp0->GetMomentum() );
     98          G4DynamicParticle* p0 =
     99            new G4DynamicParticle(rp0->GetDefinition(),rp0->GetMomentum());
    108100          theParticleChange.AddSecondary(p0);
    109101          delete rp0;
    … …  
    114106      {
    115107        // add secondary
    116         G4DynamicParticle* p0 = new G4DynamicParticle;
    117         p0->SetDefinition(aFragment->GetParticleDefinition());
    118         p0->SetMomentum(aFragment->GetMomentum().vect());
     108        G4DynamicParticle* p0 =
     109          new G4DynamicParticle(aFragment->GetParticleDefinition(),
     110                                aFragment->GetMomentum());
    119111        theParticleChange.AddSecondary(p0);
    120112      }

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

    r1340 r1347  
    2525//
    2626//
    27 // $Id: G4VFissionBarrier.hh,v 1.4 2006/06/29 20:13:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-ref-09 $
     27// $Id: G4VFissionBarrier.hh,v 1.5 2010/11/17 20:22:46 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4141{
    4242public:
    43   G4VFissionBarrier() {};
    44   virtual ~G4VFissionBarrier() {};
     43  G4VFissionBarrier();
     44  virtual ~G4VFissionBarrier();
    4545
    4646private:
    … …  
    5252 
    5353public:
    54   virtual G4double FissionBarrier(const G4int A, const G4int Z,const G4double U) = 0;
     54  virtual G4double FissionBarrier(G4int A, G4int Z,const G4double U) = 0;
    5555 
    5656
Note: See TracChangeset for help on using the changeset viewer.