Ignore:
Timestamp:
Nov 5, 2010, 3:45:55 PM (14 years ago)
Author:
garnier
Message:

update ti head

Location:
trunk/source/processes/hadronic/models/management
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/management/History

    r1337 r1340  
    1414     * Please list in reverse chronological order (last date on top)
    1515     ---------------------------------------------------------------
     16
     178 September 2010 - G.Folger   (hadr-modman-V09-03-04)
     18------------------------------------------------------
     19- G4V3DNucleus; use integer for A and Z
     20
     2128 August 2010 - V.Ivanchenko (hadr-modman-V09-03-03)
     22------------------------------------------------------
     23- G4VPreCompoundModel - make deexcited G4Fragment non-const
     24- G4VIntraNuclearTransportModel - moved constructor and destructor
     25                                  to the source
    1626
    172711 June 2010 - V.Ivanchenko (hadr-modman-V09-03-02)

  • trunk/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh

    r1337 r1340  
    2626//
    2727// $Id: G4HadronicInteraction.hh,v 1.14 2010/04/03 00:40:45 dennis Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030// Hadronic Interaction  abstract base class

  • trunk/source/processes/hadronic/models/management/include/G4HadronicInteractionRegistry.hh

    r1337 r1340  
    2525//
    2626// $Id: G4HadronicInteractionRegistry.hh,v 1.5 2009/08/30 16:12:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2828//
    2929// 23-Jan-2009 V.Ivanchenko make the class to be a singleton

  • trunk/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh

    r1337 r1340  
    2626//
    2727// $Id: G4InelasticInteraction.hh,v 1.7 2009/08/30 16:12:13 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030// Hadronic Process: Inelastic Interaction

  • trunk/source/processes/hadronic/models/management/include/G4V3DNucleus.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4V3DNucleus.hh,v 1.7 2009/11/19 14:29:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4V3DNucleus.hh,v 1.8 2010/09/08 16:39:22 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030#ifndef G4V3DNucleus_h
    … …  
    5252
    5353  public:
    54       virtual void Init(G4double theA, G4double theZ) = 0;
     54      virtual void Init(G4int theA, G4int theZ) = 0;
    5555      virtual G4bool StartLoop() = 0;
    5656      virtual G4Nucleon * GetNextNucleon() = 0;

  • trunk/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh

    r1337 r1340  
    2626//
    2727// $Id: G4VHighEnergyGenerator.hh,v 1.4 2006/06/29 20:45:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030#ifndef G4VHighEnergyGenerator_h

  • trunk/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh

    r1337 r1340  
    2424// ********************************************************************
    2525//
     26// $Id: G4VIntraNuclearTransportModel.hh,v 1.5 2010/08/28 15:53:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2628//
    27 // $Id: G4VIntraNuclearTransportModel.hh,v 1.4 2007/01/11 05:29:46 dennis Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
    29 //
    30 // $Id: G4IntraNuclearTransportMode.hh,v 1.0 1998/06/30
    3129// -----------------------------------------------------------------------------
    3230//      GEANT 4 class header file
    … …  
    5553#include "G4HadProjectile.hh"
    5654#include "G4HadFinalState.hh"
     55
    5756class G4KineticTrackVector;
    5857
     58class G4VIntraNuclearTransportModel : public G4HadronicInteraction
     59{
     60public:
    5961
    60 class G4VIntraNuclearTransportModel : public G4HadronicInteraction
     62  G4VIntraNuclearTransportModel(const G4String& modelName = "CascadeModel");
    6163
    62 {
    63   public:
     64  virtual ~G4VIntraNuclearTransportModel();
    6465
    65       G4VIntraNuclearTransportModel(const G4String& modelName = "CascadeModel");
     66  virtual
     67  G4ReactionProductVector* Propagate(G4KineticTrackVector* theSecondaries,
     68                                     G4V3DNucleus* theNucleus) = 0;
    6669
    67       G4VIntraNuclearTransportModel(const G4VIntraNuclearTransportModel& right);
     70  inline void SetDeExcitation(G4VPreCompoundModel* const  value);
    6871
    69       virtual ~G4VIntraNuclearTransportModel();
     72  inline void Set3DNucleus(G4V3DNucleus* const value);
    7073
    71       const G4VIntraNuclearTransportModel& operator=(const G4VIntraNuclearTransportModel &right);
     74  inline const G4String& GetModelName() const;
    7275
    73       int operator==(const G4VIntraNuclearTransportModel& right) const;
     76private:
    7477
    75       int operator!=(const G4VIntraNuclearTransportModel& right) const;
     78  G4VIntraNuclearTransportModel(const G4VIntraNuclearTransportModel& right);
     79  const G4VIntraNuclearTransportModel& operator=(const G4VIntraNuclearTransportModel &right);
     80  int operator==(const G4VIntraNuclearTransportModel& right) const;
     81  int operator!=(const G4VIntraNuclearTransportModel& right) const;
    7682
    77       virtual G4ReactionProductVector* Propagate(G4KineticTrackVector* theSecondaries,
    78                                                  G4V3DNucleus* theNucleus) = 0;
     83protected:
    7984
    80       void SetDeExcitation(G4VPreCompoundModel* const  value);
    81       void Set3DNucleus(G4V3DNucleus* const value);
     85  inline G4V3DNucleus* Get3DNucleus() const;
    8286
     87  inline G4VPreCompoundModel* GetDeExcitation() const;
    8388
    84   protected:
     89  G4String theTransportModelName;
    8590
    86       G4String GetModelName() const;
     91  G4V3DNucleus* the3DNucleus;
    8792
    88       G4V3DNucleus* Get3DNucleus() const;
    89 
    90       G4VPreCompoundModel* GetDeExcitation() const;
    91 
    92 
    93   protected:
    94 
    95       G4String theTransportModelName;
    96 
    97       G4V3DNucleus* the3DNucleus;
    98 
    99       G4VPreCompoundModel* theDeExcitation;
     93  G4VPreCompoundModel* theDeExcitation;
    10094};
    10195
    102 
    103 
    104 // Class G4VIntraNuclearTransportModel
    105 
    106 
    107 inline G4String G4VIntraNuclearTransportModel::GetModelName() const
     96inline const G4String& G4VIntraNuclearTransportModel::GetModelName() const
    10897{
    10998  return theTransportModelName;
    … …  
    120109}
    121110
    122 
    123 
    124111inline G4VPreCompoundModel* G4VIntraNuclearTransportModel::GetDeExcitation() const
    125112{
    … …  
    127114}
    128115
    129 inline void G4VIntraNuclearTransportModel::SetDeExcitation(G4VPreCompoundModel* const  value)
     116inline void
     117G4VIntraNuclearTransportModel::SetDeExcitation(G4VPreCompoundModel* const  value)
    130118{
    131    delete theDeExcitation; theDeExcitation = value;
     119   delete theDeExcitation;
     120   theDeExcitation = value;
    132121}
    133122

  • trunk/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh

    r1337 r1340  
    2626//
    2727// $Id: G4VKineticNucleon.hh,v 1.4 2006/06/29 20:45:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030#ifndef G4VKineticNucleon_h

  • trunk/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh

    r1337 r1340  
    2626//
    2727// $Id: G4VNuclearDensity.hh,v 1.4 2006/06/29 20:45:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030#ifndef G4VNuclearDensity_h

  • trunk/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VPreCompoundModel.hh,v 1.6 2010/06/11 15:26:36 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VPreCompoundModel.hh,v 1.7 2010/08/20 07:43:28 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030
    … …  
    5858  virtual ~G4VPreCompoundModel();
    5959 
    60 protected:
     60private:
     61
    6162  // default constructor
    6263  G4VPreCompoundModel();
    63 
    64 private:
    65 
    6664  // copy constructor
    67   G4VPreCompoundModel(const G4VPreCompoundModel &) : G4HadronicInteraction() {};
     65  G4VPreCompoundModel(const G4VPreCompoundModel &);
    6866  // operators
    6967  const G4VPreCompoundModel& operator=(const G4VPreCompoundModel &right);
    … …  
    7674          ApplyYourself(const G4HadProjectile & thePrimary, G4Nucleus & theNucleus) = 0;
    7775 
    78   virtual G4ReactionProductVector*
    79           DeExcite(const G4Fragment& aFragment) const = 0;
     76  virtual G4ReactionProductVector* DeExcite(G4Fragment& aFragment) = 0;
    8077
    8178  inline void SetExcitationHandler(G4ExcitationHandler *const  value);

  • trunk/source/processes/hadronic/models/management/src/G4HadronicInteraction.cc

    r1337 r1340  
    2525//
    2626// $Id: G4HadronicInteraction.cc,v 1.7 2010/04/03 00:40:57 dennis Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2828//
    2929// Hadronic Interaction  base class

  • trunk/source/processes/hadronic/models/management/src/G4HadronicInteractionRegistry.cc

    r1337 r1340  
    2525//
    2626// $Id: G4HadronicInteractionRegistry.cc,v 1.10 2010/03/25 15:31:42 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2828//
    2929// 23-Jan-2009 V.Ivanchenko make the class to be a singleton

  • trunk/source/processes/hadronic/models/management/src/G4InelasticInteraction.cc

    r1337 r1340  
    2525//
    2626// $Id: G4InelasticInteraction.cc,v 1.12 2009/01/24 11:56:27 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2828//
    2929// Hadronic Process: Inelastic Interaction

  • trunk/source/processes/hadronic/models/management/src/G4V3DNucleus.cc

    r1337 r1340  
    2626//
    2727// $Id: G4V3DNucleus.cc,v 1.5 2006/06/29 20:45:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030#include "G4V3DNucleus.hh"

  • trunk/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc

    r1337 r1340  
    2626//
    2727// $Id: G4VHighEnergyGenerator.cc,v 1.5 2006/06/29 20:46:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030// G4VHighEnergyGenerator

  • trunk/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc

    r1337 r1340  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4VIntraNuclearTransportModel.cc,v 1.5 2007/01/11 05:28:56 dennis Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4VIntraNuclearTransportModel.cc,v 1.6 2010/08/28 15:53:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2928//
    3029// $Id: G4VIntraNuclearTransportModel.cc,v 1.0 1998/06/30
    … …  
    3938#include "G4VIntraNuclearTransportModel.hh"
    4039
    41 
    42 // Class G4VIntraNuclearTransportModel
    43 
    44 
    45 G4VIntraNuclearTransportModel::G4VIntraNuclearTransportModel(const G4String& modelName) :
    46   G4HadronicInteraction(modelName),
    47   theTransportModelName(modelName), the3DNucleus(NULL), theDeExcitation(NULL)
     40G4VIntraNuclearTransportModel::G4VIntraNuclearTransportModel(const G4String& modName)
     41  : G4HadronicInteraction(modName),
     42    theTransportModelName(modName), the3DNucleus(0), theDeExcitation(0)
    4843{}
    49 
    50 
    51 G4VIntraNuclearTransportModel::
    52 G4VIntraNuclearTransportModel(const G4VIntraNuclearTransportModel& right) :
    53   G4HadronicInteraction(right.GetModelName() )
    54 {
    55   theTransportModelName = right.GetModelName();
    56   the3DNucleus = right.Get3DNucleus();
    57   theDeExcitation = right.GetDeExcitation();
    58 }
    59 
    6044
    6145G4VIntraNuclearTransportModel::~G4VIntraNuclearTransportModel()
    6246{
    63 //  if(the3DNucleus!=NULL) delete the3DNucleus;
     47  //  if(the3DNucleus!=NULL) delete the3DNucleus;
    6448  // This is deleted by ~G4HadronicInteractionRegistry
    6549  // if(theDeExcitation!=NULL) delete theDeExcitation;
    6650}
    6751
    68 
    69 const G4VIntraNuclearTransportModel&
    70 G4VIntraNuclearTransportModel::
    71 operator=(const G4VIntraNuclearTransportModel& right)
    72 {
    73  if (this != &right)
    74    {
    75      theTransportModelName = right.GetModelName();
    76      the3DNucleus = right.Get3DNucleus();
    77      theDeExcitation = right.GetDeExcitation();
    78    }
    79  return *this;
    80 }
    81 
    82 
    83 int G4VIntraNuclearTransportModel::
    84 operator==(const G4VIntraNuclearTransportModel& right) const
    85 {
    86  return (this == (G4VIntraNuclearTransportModel *) & right);
    87 }
    88 
    89 int G4VIntraNuclearTransportModel::
    90 operator!=(const G4VIntraNuclearTransportModel& right) const
    91 {
    92  return (this != (G4VIntraNuclearTransportModel *) & right);
    93 }

  • trunk/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc

    r1337 r1340  
    2626//
    2727// $Id: G4VKineticNucleon.cc,v 1.3 2006/06/29 20:46:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030#include "G4VKineticNucleon.hh"

  • trunk/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc

    r1337 r1340  
    2626//
    2727// $Id: G4VNuclearDensity.cc,v 1.3 2006/06/29 20:46:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030

  • trunk/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc

    r1337 r1340  
    2626//
    2727// $Id: G4VPreCompoundModel.cc,v 1.7 2010/06/11 15:26:36 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-03-ref-09 $
    2929//
    3030
Note: See TracChangeset for help on using the changeset viewer.