Changeset 1342 for trunk/examples/extended/electromagnetic/TestEm7/src/TrackingAction.cc

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/examples/extended/electromagnetic/TestEm7/src/TrackingAction.cc (modified) (3 diffs)

trunk/examples/extended/electromagnetic/TestEm7/src/TrackingAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: TrackingAction.cc,v 1.5 2008/08/22 18:30:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: TrackingAction.cc,v 1.6 2010/09/17 18:45:43 maire Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -32 +32 @@
 #include "TrackingAction.hh"
 
+#include "DetectorConstruction.hh"
+#include "HistoManager.hh"
 #include "RunAction.hh"
 
@@ -38 +40 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-TrackingAction::TrackingAction(RunAction* run)
-:runAction(run)
+TrackingAction::TrackingAction(DetectorConstruction* det, HistoManager* histo,
+                               RunAction* run)
+:detector(det), histoManager(histo), runAction(run)
 { }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void TrackingAction::PostUserTrackingAction(const G4Track* aTrack)
+void TrackingAction::PostUserTrackingAction(const G4Track* track)
 {
   // extract Projected Range of primary particle
-  if (aTrack->GetTrackID() == 1) {
-    G4double x = aTrack->GetPosition().x() + runAction->GetOffsetX();
-    if(x > runAction->GetLength()) x = runAction->GetLength(); 
-    //G4cout << " range= " << x << " x= " << aTrack->GetPosition().x()
-    //     << " ofset= " << runAction->GetOffsetX() << G4endl;
+  if (track->GetTrackID() == 1) {
+    G4double x = track->GetPosition().x() + 0.5*detector->GetAbsorSizeX();
     if(x > 0.0) runAction->AddProjRange(x);
-    runAction->FillHisto(2, x/mm, 1.0);
+    histoManager->FillHisto(3, x);
   }  
 }