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

Import Geant4 10.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/scoring/src/G4ParallelWorldProcess.cc
+8 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4ParallelWorldProcess.cc 76935 2013-11-19 09:46:31Z gcosmo $
// GEANT4 tag $Name: geant4-09-04-ref-00 $
//
//
@@ -49,9 +49,9 @@
#include "G4SDManager.hh"
#include "G4VSensitiveDetector.hh"
G4Step* G4ParallelWorldProcess::fpHyperStep = 0;
G4int G4ParallelWorldProcess::nParallelWorlds = 0;
G4int G4ParallelWorldProcess::fNavIDHyp = 0;
G4ThreadLocal G4Step* G4ParallelWorldProcess::fpHyperStep = 0;
G4ThreadLocal G4int G4ParallelWorldProcess::nParallelWorlds = 0;
G4ThreadLocal G4int G4ParallelWorldProcess::fNavIDHyp = 0;
const G4Step* G4ParallelWorldProcess::GetHyperStep()
{ return fpHyperStep; }
G4int G4ParallelWorldProcess::GetHypNavigatorID()
@@ -72,6 +72,7 @@ G4ParallelWorldProcess(const G4String& processName,G4ProcessType theType)
fGhostPostStepPoint = fGhostStep->GetPostStepPoint();
fTransportationManager = G4TransportationManager::GetTransportationManager();
fTransportationManager->GetNavigatorForTracking()->SetPushVerbosity(false);
fPathFinder = G4PathFinder::GetInstance();
if (verboseLevel>0)
@@ -97,6 +98,7 @@ SetParallelWorld(G4String parallelWorldName)
fGhostWorldName = parallelWorldName;
fGhostWorld = fTransportationManager->GetParallelWorld(fGhostWorldName);
fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld);
fGhostNavigator->SetPushVerbosity(false);
}
void G4ParallelWorldProcess::
@@ -105,6 +107,7 @@ SetParallelWorld(G4VPhysicalVolume* parallelWorld)
fGhostWorldName = parallelWorld->GetName();
fGhostWorld = parallelWorld;
fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld);
fGhostNavigator->SetPushVerbosity(false);
}
void G4ParallelWorldProcess::StartTracking(G4Track* trk)
@@ -130,10 +133,8 @@ void G4ParallelWorldProcess::StartTracking(G4Track* trk)
fGhostPostStepPoint->SetStepStatus(fUndefined);
// G4VPhysicalVolume* thePhys = fNewGhostTouchable->GetVolume();
// G4cout << "======= G4ParallelWorldProcess::StartTracking() =======" << G4endl;
// if(thePhys)
// {
// G4cout << " --- Parallel world volume : " << thePhys->GetName() << G4endl;
// G4Material* ghostMaterial = thePhys->GetLogicalVolume()->GetMaterial();
// if(ghostMaterial)
// { G4cout << " --- Material : " << ghostMaterial->GetName() << G4endl; }
@@ -259,7 +260,7 @@ G4double G4ParallelWorldProcess::AlongStepGetPhysicalInteractionLength(
const G4Track& track, G4double previousStepSize, G4double currentMinimumStep,
G4double& proposedSafety, G4GPILSelection* selection)
{
static G4FieldTrack endTrack('0');
static G4ThreadLocal G4FieldTrack *endTrack_G4MT_TLS_ = 0 ; if (!endTrack_G4MT_TLS_) endTrack_G4MT_TLS_ = new G4FieldTrack ('0') ; G4FieldTrack &endTrack = *endTrack_G4MT_TLS_;
//static ELimited eLimited;
ELimited eLimited;
ELimited eLim = kUndefLimited;
source/processes/scoring/src/G4ParallelWorldScoringProcess.cc
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4ParallelWorldScoringProcess.cc 68733 2013-04-05 09:45:28Z gcosmo $
//
//
@@ -325,8 +325,8 @@ G4double G4ParallelWorldScoringProcess::AlongStepGetPhysicalInteractionLength(
const G4Track& track, G4double previousStepSize, G4double currentMinimumStep,
G4double& proposedSafety, G4GPILSelection* selection)
{
static G4FieldTrack endTrack('0');
static ELimited eLimited;
static G4ThreadLocal G4FieldTrack *endTrack_G4MT_TLS_ = 0 ; if (!endTrack_G4MT_TLS_) endTrack_G4MT_TLS_ = new G4FieldTrack ('0') ; G4FieldTrack &endTrack = *endTrack_G4MT_TLS_;
static G4ThreadLocal ELimited *eLimited_G4MT_TLS_ = 0 ; if (!eLimited_G4MT_TLS_) eLimited_G4MT_TLS_ = new ELimited ; ELimited &eLimited = *eLimited_G4MT_TLS_;
*selection = NotCandidateForSelection;
G4double returnedStep = DBL_MAX;
source/processes/scoring/src/G4ScoreSplittingProcess.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4ScoreSplittingProcess.cc 68733 2013-04-05 09:45:28Z gcosmo $
//
#include "G4ScoreSplittingProcess.hh"