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/electromagnetic/dna/management/include/G4ITManager.icc
+13 -5
View File
@@ -37,7 +37,7 @@
// -------------------------------------------------------------------
TEMPLATE
G4ITMANAGER * G4ITMANAGER::fInstance(0);
G4ThreadLocal G4ITMANAGER * G4ITMANAGER::fInstance(0);
TEMPLATE
G4ITMANAGER * G4ITMANAGER::Instance()
@@ -118,15 +118,13 @@ void G4ITMANAGER::Push(G4Track* track)
std::pair<typename BoxMap::iterator,bool> ret = fBox.insert(std::make_pair (T(key), itBox)) ;
typename BoxMap::iterator box_placement = ret.first;
typename BoxMap::iterator previous_placement = ret.first;
previous_placement--;
typename BoxMap::iterator next_placement = ret.first;
next_placement++;
typename BoxMap::iterator last_placement = fBox.end();
last_placement--;
if(box_placement != fBox.begin())
{
typename BoxMap::iterator previous_placement = ret.first;
previous_placement--;
G4ITBox* previous_box = previous_placement->second;
if(previous_box)
{
@@ -136,6 +134,8 @@ void G4ITMANAGER::Push(G4Track* track)
}
if(box_placement != last_placement)
{
typename BoxMap::iterator next_placement = ret.first;
next_placement++;
G4ITBox* next_box = next_placement->second;
if(next_box)
{
@@ -395,6 +395,14 @@ void G4ITMANAGER::UpdatePositionMap()
position.y(),
position.z(),
currentIT);
// G4KDNode* node = currentTree->InsertMap(position.x(),
// position.y(),
// position.z(),
// currentIT);
currentIT->SetNode(node);
}
// currentTree->Build();
}