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

Legend:

Unmodified
Added
Removed

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

    r1007 r1196  
    2626//
    2727// $Id: G4AlphaEvaporationChannel.cc,v 1.4 2006/06/29 20:10:17 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/evaporation/src/G4DeuteronEvaporationChannel.cc

    r1007 r1196  
    2626//
    2727// $Id: G4DeuteronEvaporationChannel.cc,v 1.4 2006/06/29 20:10: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/evaporation/src/G4Evaporation.cc

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4Evaporation.cc,v 1.12 2008/12/09 17:57:36 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4Evaporation.cc,v 1.15 2009/09/16 15:32:25 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    3737// JMQ (06 September 2008) Also external choices have been added for
    3838// superimposed Coulomb barrier (if useSICBis set true, by default is false)
     39//
     40// V.Ivanchenko added G4EvaporationDefaultGEMFactory option, 27/07/09
    3941
    4042#include "G4Evaporation.hh"
    4143#include "G4EvaporationFactory.hh"
    4244#include "G4EvaporationGEMFactory.hh"
     45#include "G4EvaporationDefaultGEMFactory.hh"
    4346#include "G4HadronicException.hh"
    4447#include <numeric>
    … …  
    4750{
    4851  theChannelFactory = new G4EvaporationFactory();
    49   theChannels = theChannelFactory->GetChannel();
    50 }
    51 
    52 G4Evaporation::G4Evaporation(const G4Evaporation &) : G4VEvaporation()
    53 {
    54     throw G4HadronicException(__FILE__, __LINE__, "G4Evaporation::copy_constructor meant to not be accessable.");
    55 }
    56 
     52  //theChannelFactory = new G4EvaporationDefaultGEMFactory();
     53  theChannels = theChannelFactory->GetChannel();
     54}
    5755
    5856G4Evaporation::~G4Evaporation()
    … …  
    6260}
    6361
    64 const G4Evaporation & G4Evaporation::operator=(const G4Evaporation &)
    65 {
    66     throw G4HadronicException(__FILE__, __LINE__, "G4Evaporation::operator= meant to not be accessable.");
    67     return *this;
    68 }
    69 
    70 
    71 G4bool G4Evaporation::operator==(const G4Evaporation &) const
    72 {
    73     return false;
    74 }
    75 
    76 G4bool G4Evaporation::operator!=(const G4Evaporation &) const
    77 {
    78     return true;
    79 }
    80 
    81 
    8262void G4Evaporation::SetDefaultChannel()
    8363{
    … …  
    9373  theChannels = theChannelFactory->GetChannel();
    9474}
     75
     76void G4Evaporation::SetCombinedChannel()
     77{
     78  if (theChannelFactory != 0) delete theChannelFactory;
     79  theChannelFactory = new G4EvaporationDefaultGEMFactory();
     80  theChannels = theChannelFactory->GetChannel();
     81}
     82
    9583
    9684G4FragmentVector * G4Evaporation::BreakItUp(const G4Fragment &theNucleus)

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

    r1007 r1196  
    2626//
    2727// $Id: G4EvaporationFactory.cc,v 1.4 2006/06/29 20:10:29 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/evaporation/src/G4He3EvaporationChannel.cc

    r1007 r1196  
    2626//
    2727// $Id: G4He3EvaporationChannel.cc,v 1.4 2006/06/29 20:10:33 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/evaporation/src/G4NeutronEvaporationChannel.cc

    r1007 r1196  
    2626//
    2727// $Id: G4NeutronEvaporationChannel.cc,v 1.4 2006/06/29 20:10:37 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/evaporation/src/G4ProtonEvaporationChannel.cc

    r1007 r1196  
    2626//
    2727// $Id: G4ProtonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:41 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/evaporation/src/G4TritonEvaporationChannel.cc

    r1007 r1196  
    2626//
    2727// $Id: G4TritonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:45 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/evaporation/src/G4VEvaporation.cc

    r1007 r1196  
    2626//
    2727// $Id: G4VEvaporation.cc,v 1.5 2006/06/29 20:10:49 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.