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

update ti head

Location:
trunk/source/particles/management/include
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/particles/management/include/G4DecayProducts.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4DecayProducts.hh,v 1.12 2006/06/29 19:22:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4DecayProducts.hh,v 1.14 2010/10/27 07:47:04 gcosmo Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//

  • trunk/source/particles/management/include/G4DynamicParticle.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4DynamicParticle.hh,v 1.20 2010/04/20 00:50:18 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4DynamicParticle.hh,v 1.22 2010/08/11 17:14:02 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    8383     G4DynamicParticle();
    8484
    85      G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
     85     G4DynamicParticle(const G4ParticleDefinition * aParticleDefinition,
    8686                        const G4ThreeVector& aMomentumDirection,
    8787                        G4double aKineticEnergy);
    88      G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
     88     G4DynamicParticle(const G4ParticleDefinition * aParticleDefinition,
    8989                        const G4ThreeVector& aParticleMomentum);
    90      G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
     90     G4DynamicParticle(const G4ParticleDefinition * aParticleDefinition,
    9191                        const G4LorentzVector    &aParticleMomentum);
    92      G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
     92     G4DynamicParticle(const G4ParticleDefinition * aParticleDefinition,
    9393                        G4double aTotalEnergy,
    9494                        const G4ThreeVector &aParticleMomentum);
    … …  
    182182     void   RemoveElectron(G4int orbit, G4int number = 1);
    183183 
     184 
     185     const G4ParticleDefinition* GetParticleDefinition() const;
     186     void SetDefinition(const G4ParticleDefinition * aParticleDefinition);
     187     //   Set/Get particle definition 
     188     //  following method of GetDefinition remains
     189     //  because of backward compatiblity. It will be removed in future
    184190     G4ParticleDefinition* GetDefinition() const;
    185      void SetDefinition(G4ParticleDefinition * aParticleDefinition);
    186       //   Set/Get particle definition 
    187 
     191 
    188192     
    189193     const G4DecayProducts *GetPreAssignedDecayProducts() const;
    … …  
    209213      //  The normalized momentum vector
    210214
    211      G4ParticleDefinition *theParticleDefinition;
     215     const G4ParticleDefinition *theParticleDefinition;
    212216      //  Contains the static information of this particle.
    213217

  • trunk/source/particles/management/include/G4DynamicParticle.icc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4DynamicParticle.icc,v 1.17 2010/04/19 00:23:08 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4DynamicParticle.icc,v 1.21 2010/10/27 07:47:05 gcosmo Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    193193inline G4ParticleDefinition* G4DynamicParticle::GetDefinition() const
    194194{
    195   return theParticleDefinition;
     195  return const_cast<G4ParticleDefinition*>(theParticleDefinition);
     196}
     197
     198inline const G4ParticleDefinition* G4DynamicParticle::GetParticleDefinition() const
     199{
     200  return const_cast<G4ParticleDefinition*>(theParticleDefinition);
    196201}
    197202

  • trunk/source/particles/management/include/G4ElectronOccupancy.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ElectronOccupancy.hh,v 1.10 2009/10/21 12:50:31 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ElectronOccupancy.hh,v 1.12 2010/10/27 07:47:05 gcosmo Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//

  • trunk/source/particles/management/include/G4IonTable.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4IonTable.hh,v 1.28 2009/09/23 12:13:48 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4IonTable.hh,v 1.31 2010/10/16 06:04:51 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    5151#include "globals.hh"
    5252#include "G4ParticleDefinition.hh"
    53 #include "G4ParticleTableIterator.hh"
     53#include "G4ParticleTable.hh"
    5454#include "G4Ions.hh"
    5555
    … …  
    7171 public:
    7272   // Use STL map as list of ions
    73    typedef  std::multimap<G4int, G4ParticleDefinition*> G4IonList;
    74    typedef  std::multimap<G4int, G4ParticleDefinition*>::iterator G4IonListIterator;
     73   typedef  std::multimap<G4int, const G4ParticleDefinition*> G4IonList;
     74   typedef  std::multimap<G4int, const G4ParticleDefinition*>::iterator G4IonListIterator;
    7575
    7676 public:
    … …  
    139139   static G4bool        IsIon(const G4ParticleDefinition*);
    140140   // return true if the particle is ion
     141
     142   static G4bool        IsAntiIon(const G4ParticleDefinition*);
     143   // return true if the particle is anti_ion
     144
    141145
    142146   const G4String&  GetIonName(G4int Z, G4int A, G4double E) const;
    … …  
    194198   // Return 'true' if the ion exists
    195199
    196    void                  Insert(G4ParticleDefinition* particle);
    197    void                  Remove(G4ParticleDefinition* particle);
     200   void                  Insert(const G4ParticleDefinition* particle);
     201   void                  Remove(const G4ParticleDefinition* particle);
    198202   // Insert/Remove an ion in the table
    199203
    … …  
    218222   
    219223   G4ParticleDefinition* GetLightIon(G4int Z, G4int A) const;
    220    
    221    
    222    G4bool                IsLightIon(G4ParticleDefinition*) const;
     224   G4ParticleDefinition* GetLightAntiIon(G4int Z, G4int A) const;
     225   
     226   G4bool                IsLightIon(const G4ParticleDefinition*) const;
     227   G4bool                IsLightAntiIon(const G4ParticleDefinition*) const;
    223228   // return true if the particle is pre-defined ion
    224229 

  • trunk/source/particles/management/include/G4KL3DecayChannel.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4KL3DecayChannel.hh,v 1.5 2006/06/29 19:23:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4KL3DecayChannel.hh,v 1.6 2010/10/30 07:55:00 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    9090     G4double   pLambda;
    9191     G4double   pXi0;
    92      G4double   pNormalization;
    9392
    9493  public:

  • trunk/source/particles/management/include/G4ParticleDefinition.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ParticleDefinition.hh,v 1.33 2008/11/14 16:26:30 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParticleDefinition.hh,v 1.34 2010/08/10 15:47:42 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    161161
    162162  public:// With Description
    163       G4DecayTable* GetDecayTable();
     163      G4DecayTable* GetDecayTable() const;
    164164      void          SetDecayTable(G4DecayTable* aDecayTable);
    165165      // Set/Get Decay Table
    … …  
    172172      //   !! Process Manager can be modified !! 
    173173
    174       G4ParticleTable* GetParticleTable();
     174      G4ParticleTable* GetParticleTable() const;
    175175      // get pointer to the particle table
    176176

  • trunk/source/particles/management/include/G4ParticleDefinition.icc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ParticleDefinition.icc,v 1.14 2009/03/27 20:33:50 gum Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParticleDefinition.icc,v 1.15 2010/08/10 15:47:42 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030
    3131inline
    32  G4ParticleTable* G4ParticleDefinition::GetParticleTable()
     32 G4ParticleTable* G4ParticleDefinition::GetParticleTable() const
    3333{
    3434  return theParticleTable;
    … …  
    3636
    3737inline
    38  G4DecayTable* G4ParticleDefinition::GetDecayTable()
     38 G4DecayTable* G4ParticleDefinition::GetDecayTable() const
    3939{
    4040  return theDecayTable;

  • trunk/source/particles/management/include/G4ParticleTable.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ParticleTable.hh,v 1.21 2008/03/22 06:03:40 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParticleTable.hh,v 1.22 2010/10/30 07:55:00 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    209209   G4PTblDicIterator* fIterator;
    210210   G4PTblEncodingDictionary* fEncodingDictionary;
    211    G4int DictionaryBucketSize;
    212211
    213212   static G4ParticleTable*  fgParticleTable;

  • trunk/source/particles/management/include/G4PrimaryParticle.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PrimaryParticle.hh,v 1.4 2006/09/28 14:29:43 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PrimaryParticle.hh,v 1.8 2010/10/27 07:47:05 gcosmo Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    7777      G4PrimaryParticle(G4int Pcode,
    7878                        G4double px,G4double py,G4double pz,G4double E);
    79       G4PrimaryParticle(G4ParticleDefinition* Gcode);
    80       G4PrimaryParticle(G4ParticleDefinition* Gcode,
     79      G4PrimaryParticle(const G4ParticleDefinition* Gcode);
     80      G4PrimaryParticle(const G4ParticleDefinition* Gcode,
    8181                        G4double px,G4double py,G4double pz);
    82       G4PrimaryParticle(G4ParticleDefinition* Gcode,
     82      G4PrimaryParticle(const G4ParticleDefinition* Gcode,
    8383                        G4double px,G4double py,G4double pz,G4double E);
    8484      ~G4PrimaryParticle();
    … …  
    9494  private:
    9595      G4int PDGcode;
    96       G4ParticleDefinition * G4code;
     96      const G4ParticleDefinition * G4code;
    9797      G4double Px;
    9898      G4double Py;
    … …  
    130130      { return PDGcode; }
    131131      inline G4ParticleDefinition * GetG4code() const
     132      { return const_cast<G4ParticleDefinition*>(G4code); }
     133      inline const G4ParticleDefinition * GetParticleDefinition() const
    132134      { return G4code; }
    133135      inline G4ThreeVector GetMomentum() const
    … …  
    162164      // Followings are available Set methods.
    163165      void SetPDGcode(G4int Pcode);
    164       void SetG4code(G4ParticleDefinition * Gcode);
     166      void SetG4code(const G4ParticleDefinition * Gcode);
     167      void SetParticleDefinition(const G4ParticleDefinition * pdef);
    165168      inline void SetMomentum(G4double px, G4double py, G4double pz)
    166169      {

  • trunk/source/particles/management/include/G4PrimaryVertex.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PrimaryVertex.hh,v 1.4 2006/07/20 15:14:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PrimaryVertex.hh,v 1.6 2010/10/27 07:47:05 gcosmo Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//

  • trunk/source/particles/management/include/G4ShortLivedTable.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ShortLivedTable.hh,v 1.13 2008/03/20 02:23:31 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ShortLivedTable.hh,v 1.14 2010/08/10 15:47:42 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    5858 public:
    5959   // Use STL Vector as list of shortlives
    60    typedef std::vector<G4ParticleDefinition*>  G4ShortLivedList;
     60   typedef std::vector<const G4ParticleDefinition*>  G4ShortLivedList;
    6161
    6262 public:
    … …  
    6969   virtual ~G4ShortLivedTable();
    7070
    71    G4bool                IsShortLived(G4ParticleDefinition*) const;
     71   G4bool                IsShortLived(const G4ParticleDefinition*) const;
    7272   // return true if the particle is shortlived particle
    7373 
    … …  
    8181   // return true if the list contains the specified particle
    8282
    83    void                  Insert(G4ParticleDefinition* particle);
     83   void                  Insert(const G4ParticleDefinition* particle);
    8484   // add the particle in the list
    8585
    86    void                  Remove(G4ParticleDefinition* particle);
     86   void                  Remove(const G4ParticleDefinition* particle);
    8787   // remove the particle (not delete) from the list
    8888
    … …  
    132132{
    133133  if ( (index >=0 ) && (index < Entries()) ) {
    134     return (*fShortLivedList)[index];
     134    return const_cast<G4ParticleDefinition*>( (*fShortLivedList)[index] );
    135135  } else {
    136136    return 0;

  • trunk/source/particles/management/include/G4VDecayChannel.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VDecayChannel.hh,v 1.12 2006/06/29 19:24:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VDecayChannel.hh,v 1.13 2010/08/10 15:47:42 kurasige Exp $
     28// GEANT4 tag $Name: particles-V09-03-15 $
    2929//
    3030//
    … …  
    8787  public: // With Description
    8888     //get kinematics name
    89      G4String  GetKinematicsName() const;
     89     const G4String&  GetKinematicsName() const;
    9090     //get branching ratio
    9191     G4double   GetBR() const;
    … …  
    261261
    262262inline
    263  G4String G4VDecayChannel::GetKinematicsName() const { return kinematics_name; }
     263 const G4String& G4VDecayChannel::GetKinematicsName() const { return kinematics_name; }
    264264
    265265inline
Note: See TracChangeset for help on using the changeset viewer.