Changeset 1342 for trunk/examples/extended/electromagnetic/TestEm7/src/SteppingAction.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/SteppingAction.cc (modified) (4 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: SteppingAction.cc,v 1.14 2008/08/22 18:30:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: SteppingAction.cc,v 1.15 2010/09/17 18:45:43 maire Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -32 +32 @@
 #include "SteppingAction.hh"
 #include "DetectorConstruction.hh"
+#include "HistoManager.hh"
 #include "RunAction.hh"
 #include "G4SteppingManager.hh"
@@ -38 +39 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-SteppingAction::SteppingAction(DetectorConstruction* det,RunAction* RuAct)
-:detector(det),runAction(RuAct)
+SteppingAction::SteppingAction(DetectorConstruction* det, HistoManager* histo,
+                                RunAction* RuAct)
+:detector(det), histoManager(histo), runAction(RuAct)
 { }
 
@@ -49 +51 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void SteppingAction::UserSteppingAction(const G4Step* aStep)
+void SteppingAction::UserSteppingAction(const G4Step* step)
 {
-  G4double edep = aStep->GetTotalEnergyDeposit();
+  G4double edep = step->GetTotalEnergyDeposit();
   if (edep <= 0.) return;
+  
+  G4double niel = step->GetNonIonizingEnergyDeposit();
 
-  // G4cout << "edep= " << edep << "NIEL= " << aStep->GetNonIonizingEnergyDeposit()<<G4endl;
+  runAction->FillEdep(edep, niel);
 
-  runAction->FillEdep(edep,aStep->GetNonIonizingEnergyDeposit());
-
-  if(aStep->GetTrack()->GetTrackID() == 1) runAction->AddPrimaryStep();  
+  if (step->GetTrack()->GetTrackID() == 1) runAction->AddPrimaryStep();  
  
   //Bragg curve
   //    
-  G4StepPoint* prePoint  = aStep->GetPreStepPoint();
-  G4StepPoint* postPoint = aStep->GetPostStepPoint();
+  G4StepPoint* prePoint  = step->GetPreStepPoint();
+  G4StepPoint* postPoint = step->GetPostStepPoint();
    
-  G4double x1 = prePoint->GetPosition().x(), x2 = postPoint->GetPosition().x();  
-  G4double x = runAction->GetOffsetX() + x1 + G4UniformRand()*(x2-x1);
-  runAction->FillHisto(0, x/mm , edep);
-  runAction->FillHisto(1, x/mm , edep);
+  G4double x1 = prePoint->GetPosition().x();
+  G4double x2 = postPoint->GetPosition().x();  
+  G4double x  = x1 + G4UniformRand()*(x2-x1) + 0.5*(detector->GetAbsorSizeX());
+  histoManager->FillHisto(1, x, edep);
+  histoManager->FillHisto(2, x, edep);
 
   //fill tallies