Changeset 1315 for trunk/source/particles/management/include

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/particles/management/include

Files:

• G4DynamicParticle.hh (modified) (5 diffs)
• G4DynamicParticle.icc (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4DynamicParticle.hh,v 1.18 2007/03/11 07:17:35 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4DynamicParticle.hh,v 1.20 2010/04/20 00:50:18 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -201 +201 @@
      //    mode 1 : 0 + electron occupancy
 
-   private:
+   protected:
      void      AllocateElectronOccupancy(); 
      G4double  GetElectronMass() const;
 
-   private:
+   protected:
      G4ThreeVector theMomentumDirection;
       //  The normalized momentum vector
@@ -232 +232 @@
      G4double thePreAssignedDecayTime;
 
- private:
+ protected:
    G4int verboseLevel;
  
@@ -243 +243 @@
    //  2: More
 
- private:
+ protected:
    G4PrimaryParticle* primaryParticle;
    // This void pointer is used by G4EventManager to maintain the
@@ -266 +266 @@
    // returned if available. Otherwise (e.g. for geantino) returns 0.
 
- private:
+ protected:
    G4int thePDGcode;
 };

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

@@ -25 +25 @@
 //
 //
-// $Id: G4DynamicParticle.icc,v 1.16 2007/03/11 07:17:35 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4DynamicParticle.icc,v 1.17 2010/04/19 00:23:08 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -87 +87 @@
 inline void  G4DynamicParticle::AddElectron(G4int orbit, G4int number )
 {
+  if ( theElectronOccupancy == 0) AllocateElectronOccupancy();
   if ( theElectronOccupancy != 0) { 
     G4int n = theElectronOccupancy->AddElectron(orbit, number );
@@ -96 +97 @@
 inline void    G4DynamicParticle::RemoveElectron(G4int orbit, G4int number)
 {
-  if ( theElectronOccupancy != 0) { 
+ if ( theElectronOccupancy == 0) AllocateElectronOccupancy();
+ if ( theElectronOccupancy != 0) { 
     G4int n = theElectronOccupancy->RemoveElectron(orbit, number );
     theDynamicalCharge += eplus * n;