Changeset 1340 for trunk/source/track/include/G4Step.icc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/track/include/G4Step.icc (modified) (5 diffs)

trunk/source/track/include/G4Step.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4Step.icc,v 1.19 2008/02/05 01:46:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4Step.icc,v 1.22 2010/10/18 23:52:04 kurasige Exp $
+// GEANT4 tag $Name: track-V09-03-09 $
 //
 //
@@ -86 +86 @@
  }
 
-inline 
- G4ThreeVector G4Step::GetDeltaMomentum() const
- { 
-   return fpPostStepPoint->GetMomentum()
-            - fpPreStepPoint->GetMomentum(); 
- }
-
-inline 
- G4double G4Step::GetDeltaEnergy() const
- { 
-   return fpPostStepPoint->GetKineticEnergy()
-            - fpPreStepPoint->GetKineticEnergy(); 
- }
 
 inline 
@@ -163 +150 @@
 inline 
  void G4Step::CopyPostToPreStepPoint( )
- { 
+ {
+   //This method is called at the beggining of each step 
    *(fpPreStepPoint) = *(fpPostStepPoint);
    fpPostStepPoint->SetStepStatus(fUndefined);
- }
+   // clear secondary in current
+   fSecondary->secondaryInCurrent.clear();
+}
 
 
@@ -222 +212 @@
    fpPreStepPoint->SetWeight(fpTrack->GetWeight());
    
-   
+   // clear secondary in current        
+   fSecondary->secondaryInCurrent.clear();
+ 
    (*fpPostStepPoint) = (*fpPreStepPoint);
  }
@@ -251 +243 @@
    fpTrack->SetWeight(fpPostStepPoint->GetWeight());
 
+
    // set velocity 
    fpPostStepPoint->SetVelocity(fpTrack->GetVelocity());
 }
 
-inline G4TrackVector* G4Step::GetfSecondary()  {
+inline   
+ const std::vector<const G4Track*>* G4Step::GetSecondaryInCurrentStep() const 
+{
+  return  &fSecondary->secondaryInCurrent;
+}
+
+inline const G4TrackVector* G4Step::GetSecondary() const  
+{
    return fSecondary;
-    }
-inline G4TrackVector* G4Step::GetSecondary() const {
+}
+
+inline G4TrackVector* G4Step::GetfSecondary()  
+{
    return fSecondary;
-    }
-inline void G4Step::SetSecondary(G4TrackVector* value)  {
+}
+
+inline void G4Step::SetSecondary(G4TrackVector* value)  
+{
    fSecondary=value;
-    }
-inline G4TrackVector* G4Step::NewSecondaryVector()  {
+}
+
+inline 
+ G4TrackVector* G4Step::NewSecondaryVector()  
+{
    fSecondary=new G4TrackVector();
    return fSecondary;
-    }
+}
+
 inline void G4Step::DeleteSecondaryVector()  {
    delete fSecondary;