Ignore:
Timestamp:
Jun 18, 2010, 11:42:07 AM (14 years ago)
Author:
garnier
Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:
trunk/source/processes/hadronic/models/de_excitation/management
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4VEvaporationChannel.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4VEvaporationChannel.hh,v 1.6 2010/05/11 11:16:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2928//
    3029// Hadronic Process: Nuclear De-excitations
    3130// by V. Lara (Oct 1998)
    3231//
    33 // Modif (03 September 2008) by J. M. Quesada for external choice of inverse
    34 // cross section option
    35 // JMQ (06 September 2008) Also external choices have been added for
    36 // superimposed Coulomb barrier (if useSICB is set true, by default is false)
    37 
    38 
     32// Modified:
     33// 03.09.2008 (J.M.Quesada) for external choice of inverse cross section option
     34// 06.09.2008 (J.M.Quesada) external choices have been added for superimposed
     35//                          Coulomb barrier (if useSICB is set true, by default is false)
     36// 24.04.2010 (V.Ivanchenko) moved constructor and destructor to source; added two
     37//                          new virtual methods EmittedFragment(s) to allow more optimal
     38//                          work with G4Fragment objects
     39//                         
    3940
    4041#ifndef G4VEvaporationChannel_h
    … …  
    4748{
    4849public:
    49   G4VEvaporationChannel() : Name("Anonymous") {};
    50   G4VEvaporationChannel(const G4String & aName) : Name(aName) {};
    51   G4VEvaporationChannel(const G4String * aName) : Name(*aName) {};
    52   virtual ~G4VEvaporationChannel() {};
     50
     51  G4VEvaporationChannel(const G4String & aName = "Anonymous");
     52  virtual ~G4VEvaporationChannel();
    5353
    5454private:
     55
    5556  G4VEvaporationChannel(const G4VEvaporationChannel & right);
     57  const G4VEvaporationChannel & operator=(const G4VEvaporationChannel & right);
    5658
    57   const G4VEvaporationChannel & operator=(const G4VEvaporationChannel & right);
    5859public:
     60
    5961  G4bool operator==(const G4VEvaporationChannel & right) const;
    6062  G4bool operator!=(const G4VEvaporationChannel & right) const;
    6163
    62 public:
    6364  virtual void Initialize(const G4Fragment & fragment) = 0;
    6465
     66  // return emitted fragment, initial fragment is modified
     67  // and not deleted
     68  virtual G4Fragment* EmittedFragment(G4Fragment* theNucleus);
     69
     70  // return vector of emitted fragments, initial fragment is modified
     71  // but not included in this vector
     72  virtual G4FragmentVector* BreakUpFragment(G4Fragment* theNucleus);
     73
     74  // old method initial fragment is not modified, its copy included
     75  // in the list of emitted fragments
    6576  virtual G4FragmentVector * BreakUp(const G4Fragment & theNucleus) = 0;
    6677
    6778  virtual G4double GetEmissionProbability(void) const = 0;
    68 
    6979
    7080  G4String GetName() const {return Name;}
    … …  
    7585  // for superimposed Coulomb Barrier for inverse cross sections       
    7686  inline void UseSICB(G4bool use) { useSICB = use; }   
     87
    7788protected:
     89
    7890  G4int OPTxs;
    7991  G4bool useSICB;
    80 
    8192
    8293private:

  • trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh

    r1228 r1315  
    2525//
    2626//
    27 // $Id: G4VEvaporationFactory.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4VEvaporationFactory.hh,v 1.5 2010/04/27 11:43:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    4242{
    4343public:
    44   G4VEvaporationFactory() : _channel(0) {};
     44  G4VEvaporationFactory();
    4545  virtual ~G4VEvaporationFactory();
    4646

  • trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4VEvaporationChannel.cc,v 1.5 2006/06/29 20:23:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4VEvaporationChannel.cc,v 1.6 2010/04/25 18:43:08 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2928//
    3029// Hadronic Process: Nuclear De-excitations
    3130// by V. Lara (Oct 1998)
    3231//
     32// Modified:
     33// 24.04.2010 (V.Ivanchenko) moved constructor and destructor to source; added two
     34//                          new virtual methods EmittedFragment(s) to allow more optimal
     35//                          work with G4Fragment objects; removed unnecesary exceptions
    3336
    3437#include "G4VEvaporationChannel.hh"
    3538#include "G4HadronicException.hh"
    3639
    37 G4VEvaporationChannel::G4VEvaporationChannel(const G4VEvaporationChannel &)
    38 {
    39  throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationChannel::copy_constructor meant to not be accessable");
    40 }
     40G4VEvaporationChannel::G4VEvaporationChannel(const G4String & aName)
     41  : Name(aName)
     42{}
    4143
     44G4VEvaporationChannel::~G4VEvaporationChannel()
     45{}
    4246
    43 
    44 
    45 const G4VEvaporationChannel & G4VEvaporationChannel::operator=(const G4VEvaporationChannel &)
    46 {
    47   throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationChannel::operator= meant to not be accessable");
    48   return *this;
    49 }
    50 
     47//G4VEvaporationChannel::G4VEvaporationChannel(const G4VEvaporationChannel &)
     48//{
     49// throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationChannel::copy_constructor meant to not be accessable");
     50//}
     51//const G4VEvaporationChannel & G4VEvaporationChannel::operator=(const G4VEvaporationChannel &)
     52//{
     53//  throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationChannel::operator= meant to not be accessable");
     54//  return *this;
     55//}
    5156
    5257G4bool G4VEvaporationChannel::operator==(const G4VEvaporationChannel &right) const
    5358{
    54     return (this == (G4VEvaporationChannel *) &right);
    55     //  return false;
     59  return (this == (G4VEvaporationChannel *) &right);
    5660}
    5761
    5862G4bool G4VEvaporationChannel::operator!=(const G4VEvaporationChannel &right) const
    5963{
    60     return (this != (G4VEvaporationChannel *) &right);
    61     //  return true;
     64  return (this != (G4VEvaporationChannel *) &right);
    6265}
    6366
     67G4Fragment* G4VEvaporationChannel::EmittedFragment(G4Fragment*)
     68{
     69  return 0;
     70}
    6471
     72G4FragmentVector* G4VEvaporationChannel::BreakUpFragment(G4Fragment*)
     73{
     74  return 0;
     75}

  • trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc

    r1228 r1315  
    2525//
    2626//
    27 // $Id: G4VEvaporationFactory.cc,v 1.6 2008/09/19 13:32:54 ahoward Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4VEvaporationFactory.cc,v 1.7 2010/04/27 11:43:16 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030// Hadronic Process: Nuclear De-excitations
    … …  
    3232
    3333#include "G4VEvaporationFactory.hh"
    34 #include "G4HadronicException.hh"
    3534
    36 const G4VEvaporationFactory &
    37 G4VEvaporationFactory::operator=(const G4VEvaporationFactory & )
    38 {
    39   throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationFactory::operator= meant to not be accessable.");
    40   return *this;
    41 }
    42 
    43 G4bool
    44 G4VEvaporationFactory::operator==(const G4VEvaporationFactory & ) const
    45 {
    46   throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationFactory::operator== meant to not be accessable.");
    47   return false;
    48 }
    49 
    50 G4bool
    51 G4VEvaporationFactory::operator!=(const G4VEvaporationFactory & ) const
    52 {
    53   throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationFactory::operator!= meant to not be accessable.");
    54   return true;
    55 }
    56 
    57 
    58 
     35G4VEvaporationFactory::G4VEvaporationFactory() : _channel(0)
     36{}
    5937
    6038G4VEvaporationFactory::~G4VEvaporationFactory()
Note: See TracChangeset for help on using the changeset viewer.