Changeset 1196 for trunk/source/tracking/src/G4SmoothTrajectory.cc

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

File:

• trunk/source/tracking/src/G4SmoothTrajectory.cc (modified) (6 diffs)

trunk/source/tracking/src/G4SmoothTrajectory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4SmoothTrajectory.cc,v 1.18 2006/10/16 13:37:17 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4SmoothTrajectory.cc,v 1.19 2009/11/12 09:09:56 allison Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -60 +60 @@
 :  positionRecord(0), fTrackID(0), fParentID(0),
    PDGEncoding( 0 ), PDGCharge(0.0), ParticleName(""),
-   initialMomentum( G4ThreeVector() )
+   initialKineticEnergy( 0. ), initialMomentum( G4ThreeVector() )
 {;}
 
@@ -71 +71 @@
    fTrackID = aTrack->GetTrackID();
    fParentID = aTrack->GetParentID();
+   initialKineticEnergy = aTrack->GetKineticEnergy();
    initialMomentum = aTrack->GetMomentum();
    positionRecord = new TrajectoryPointContainer();
@@ -88 +89 @@
   fTrackID = right.fTrackID;
   fParentID = right.fParentID;
+  initialKineticEnergy = right.initialKineticEnergy;
   initialMomentum = right.initialMomentum;
   positionRecord = new TrajectoryPointContainer();
@@ -147 +149 @@
     (*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Physics","","G4int");
 
+    G4String IKE("IKE");
+    (*store)[IKE] = 
+      G4AttDef(IKE, "Initial kinetic energy",
+               "Physics","G4BestUnit","G4double");
+
     G4String IMom("IMom");
-    (*store)[IMom] = G4AttDef(IMom, "Momentum of track at start of trajectory",
+    (*store)[IMom] = G4AttDef(IMom, "Initial momentum",
                               "Physics","G4BestUnit","G4ThreeVector");
 
     G4String IMag("IMag");
     (*store)[IMag] = G4AttDef
-      (IMag, "Magnitude of momentum of track at start of trajectory",
+      (IMag, "Initial momentum magnitude",
        "Physics","G4BestUnit","G4double");
 
@@ -181 +188 @@
   values->push_back
     (G4AttValue("PDG",G4UIcommand::ConvertToString(PDGEncoding),""));
+
+  values->push_back
+    (G4AttValue("IKE",G4BestUnit(initialKineticEnergy,"Energy"),""));
 
   values->push_back