lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.5.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/RayTracer/src/G4RayTrajectory.cc
+24 -5
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4RayTrajectory.cc 104015 2017-05-08 07:28:08Z gcosmo $
// $Id: G4RayTrajectory.cc 110261 2018-05-17 14:24:23Z gcosmo $
//
//
//
@@ -43,8 +43,13 @@
#include "G4Colour.hh"
#include "G4TransportationManager.hh"
#include "G4ios.hh"
#include "G4ParallelWorldProcess.hh"
G4ThreadLocal G4Allocator<G4RayTrajectory>* rayTrajectoryAllocator = 0;
G4Allocator<G4RayTrajectory>*& rayTrajectoryAllocator()
{
G4ThreadLocalStatic G4Allocator<G4RayTrajectory>* _instance = nullptr;
return _instance;
}
G4RayTrajectory :: G4RayTrajectory()
{
@@ -72,14 +77,28 @@ G4RayTrajectory :: ~G4RayTrajectory()
delete positionRecord;
}
void G4RayTrajectory::AppendStep(const G4Step* aStep)
void G4RayTrajectory::AppendStep(const G4Step* theStep)
{
G4RayTrajectoryPoint* trajectoryPoint = new G4RayTrajectoryPoint();
trajectoryPoint->SetStepLength(aStep->GetStepLength());
const G4Step* aStep = theStep;
G4Navigator* theNavigator
= G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
// Take care of parallel world(s)
if(G4ParallelWorldProcess::GetHyperStep())
{
aStep = G4ParallelWorldProcess::GetHyperStep();
G4int navID = G4ParallelWorldProcess::GetHypNavigatorID();
std::vector<G4Navigator*>::iterator iNav =
G4TransportationManager::GetTransportationManager()->
GetActiveNavigatorsIterator();
theNavigator = iNav[navID];
}
trajectoryPoint->SetStepLength(aStep->GetStepLength());
// Surface normal
G4bool valid;
G4ThreeVector theLocalNormal = theNavigator->GetLocalExitNormal(&valid);
if(valid) { theLocalNormal = -theLocalNormal; }
source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc
+6 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4RayTrajectoryPoint.cc 71495 2013-06-17 09:13:30Z gcosmo $
// $Id: G4RayTrajectoryPoint.cc 110261 2018-05-17 14:24:23Z gcosmo $
//
//
//
@@ -35,7 +35,11 @@
#include"G4RayTrajectoryPoint.hh"
G4ThreadLocal G4Allocator<G4RayTrajectoryPoint>* rayTrajectoryPointAllocator = 0;
G4Allocator<G4RayTrajectoryPoint>*& rayTrajectoryPointAllocator()
{
G4ThreadLocalStatic G4Allocator<G4RayTrajectoryPoint>* _instance = nullptr;
return _instance;
}
G4RayTrajectoryPoint :: G4RayTrajectoryPoint()
:preStepAtt(0)