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/geometry/volumes/include/G4TouchableHistory.icc
+13 -13
View File
@@ -24,20 +24,20 @@
// ********************************************************************
//
//
// $Id: G4TouchableHistory.icc 86527 2014-11-13 15:06:24Z gcosmo $
// $Id: G4TouchableHistory.icc 110271 2018-05-17 14:41:15Z gcosmo $
//
//
// class G4TouchableHistory inline implementation
// ----------------------------------------------------------------------
extern G4GEOM_DLL G4ThreadLocal G4Allocator<G4TouchableHistory> *aTouchableHistoryAllocator;
extern G4GEOM_DLL G4Allocator<G4TouchableHistory>*& aTouchableHistoryAllocator();
inline
void G4TouchableHistory::UpdateYourself( G4VPhysicalVolume* pPhysVol,
const G4NavigationHistory* pHistory )
{
fhistory = *pHistory;
G4AffineTransform tf(fhistory.GetTopTransform().Inverse());
void G4TouchableHistory::UpdateYourself( G4VPhysicalVolume* pPhysVol,
const G4NavigationHistory* pHistory )
{
fhistory = *pHistory;
const G4AffineTransform& tf = fhistory.GetTopTransform();
if( pPhysVol == 0 )
{
// This means that the track has left the World Volume.
@@ -46,8 +46,8 @@ void G4TouchableHistory::UpdateYourself( G4VPhysicalVolume* pPhysVol,
//
fhistory.SetFirstEntry(pPhysVol);
}
ftlate = tf.NetTranslation();
frot = tf.NetRotation();
ftlate = tf.InverseNetTranslation();
frot = tf.InverseNetRotation();
}
inline
@@ -117,16 +117,16 @@ void* G4TouchableHistory::operator new(size_t)
// Once the Navigator calls InitializeAllocator,
// the if block below can be removed.
//
if (!aTouchableHistoryAllocator)
if (!aTouchableHistoryAllocator())
{
aTouchableHistoryAllocator = new G4Allocator<G4TouchableHistory>;
aTouchableHistoryAllocator() = new G4Allocator<G4TouchableHistory>;
}
return (void *) aTouchableHistoryAllocator->MallocSingle();
return (void *) aTouchableHistoryAllocator()->MallocSingle();
}
inline
void G4TouchableHistory::operator delete(void *aTH)
{
aTouchableHistoryAllocator->FreeSingle((G4TouchableHistory *) aTH);
aTouchableHistoryAllocator()->FreeSingle((G4TouchableHistory *) aTH);
}