Changeset 1196 for trunk/source/tracking/src/G4RichTrajectory.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/G4RichTrajectory.cc (modified) (8 diffs)

trunk/source/tracking/src/G4RichTrajectory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RichTrajectory.cc,v 1.6 2006/10/16 13:43:43 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4RichTrajectory.cc,v 1.7 2009/11/12 09:09:56 allison Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // ---------------------------------------------------------------
@@ -49 +49 @@
 #include "G4AttDef.hh"
 #include "G4AttValue.hh"
+#include "G4UnitsTable.hh"
 #include "G4VProcess.hh"
 
@@ -62 +63 @@
   fpInitialVolume(0),
   fpInitialNextVolume(0),
-  fpCreatorProcess(0)
+  fpCreatorProcess(0),
+  fFinalKineticEnergy(0.)
 {}
 
@@ -81 +83 @@
   // Insert the first rich trajectory point (see note above)...
   fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aTrack));
+  // On construction, set final KE to initial KE.
+  // Final KE is updated at the addition of every step - see AppendStep.
+  fFinalKineticEnergy = aTrack->GetKineticEnergy();
 }
 
@@ -90 +95 @@
   fpCreatorProcess = right.fpCreatorProcess;
   fpRichPointsContainer = new RichTrajectoryPointsContainer;
+  fFinalKineticEnergy = right.fFinalKineticEnergy;
   for(size_t i=0;i<right.fpRichPointsContainer->size();i++)
   {
@@ -114 +120 @@
 {
   fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aStep));
+  // Except for first step, which is a sort of virtual step to start
+  // the track, compute the final energy.
+  if (aStep->GetTrack()->GetCurrentStepNumber() > 0) {
+    fFinalKineticEnergy =
+      aStep->GetPreStepPoint()->GetKineticEnergy() -
+      aStep->GetTotalEnergyDeposit();
+  }
 }
   
@@ -160 +173 @@
     (*store)[ID] = G4AttDef(ID,"Creator Process Type Name",
                             "Physics","","G4String");
+
+    ID = "FKE";
+    (*store)[ID] = G4AttDef(ID,"Final kinetic energy",
+                            "Physics","G4BestUnit","G4double");
 
   }
@@ -184 +201 @@
   }
 
+  values->push_back
+    (G4AttValue("FKE",G4BestUnit(fFinalKineticEnergy,"Energy"),""));
+
 #ifdef G4ATTDEBUG
   G4cout << G4AttCheck(values,GetAttDefs());