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

Import Geant4 9.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/volumes/GNUmakefile
-1
View File
@@ -21,7 +21,6 @@ CPPFLAGS += -I$(G4BASE)/graphics_reps/include \
-I$(G4BASE)/global/HEPRandom/include \
-I$(G4BASE)/global/HEPGeometry/include \
-I$(G4BASE)/geometry/magneticfield/include \
-I$(G4BASE)/geometry/verification/include \
-I$(G4BASE)/geometry/management/include
ifdef G4DEBUG_NAVIGATION
source/geometry/volumes/History
+10
View File
@@ -17,6 +17,16 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
November 6th, 2012 G.Cosmo - geomvol-V09-05-02
- Fix in G4EnhancedVecAllocator for porting on AIX.
May 14th, 2012 G.Cosmo - geomvol-V09-05-01
- Fixed spurious cases of hidden variable visibility, detected with
'-Wshadow' compilation option on gcc compiler.
April 2nd, 2012 G.Cosmo - geomvol-V09-05-00
- Corrected GNUMakefile for spurious inclusion path.
August 24th, 2011 G.Cosmo - geomvol-V09-04-01
- Migrated to new G4Exception scheme for warnings and errors.
- Defined scheme for warnings/errors coding:
source/geometry/volumes/include/G4AssemblyTriplet.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4AssemblyTriplet.hh,v 1.3 2007-11-16 16:20:25 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class G4AssemblyTriplet
source/geometry/volumes/include/G4AssemblyTriplet.icc
+14 -15
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4AssemblyTriplet.icc,v 1.2 2006-06-29 18:56:49 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class G4AssemblyTriplet - inline implementation
@@ -61,13 +60,13 @@ G4AssemblyTriplet::G4AssemblyTriplet( G4AssemblyVolume* pAssembly,
}
inline
G4AssemblyTriplet::G4AssemblyTriplet( const G4AssemblyTriplet& second )
G4AssemblyTriplet::G4AssemblyTriplet( const G4AssemblyTriplet& scopy )
{
fVolume = second.GetVolume();
fRotation = second.GetRotation();
fTranslation = second.GetTranslation();
fAssembly = second.GetAssembly();
fIsReflection = second.IsReflection();
fVolume = scopy.GetVolume();
fRotation = scopy.GetRotation();
fTranslation = scopy.GetTranslation();
fAssembly = scopy.GetAssembly();
fIsReflection = scopy.IsReflection();
}
inline
@@ -145,15 +144,15 @@ G4bool G4AssemblyTriplet::IsReflection() const
inline
G4AssemblyTriplet&
G4AssemblyTriplet::operator=( const G4AssemblyTriplet& second )
G4AssemblyTriplet::operator=( const G4AssemblyTriplet& scopy )
{
if( this != &second )
if( this != &scopy )
{
fVolume = second.GetVolume();
fRotation = second.GetRotation();
fTranslation = second.GetTranslation();
fAssembly = second.GetAssembly();
fIsReflection = second.IsReflection();
fVolume = scopy.GetVolume();
fRotation = scopy.GetRotation();
fTranslation = scopy.GetTranslation();
fAssembly = scopy.GetAssembly();
fIsReflection = scopy.IsReflection();
}
return *this;
source/geometry/volumes/include/G4AssemblyVolume.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4AssemblyVolume.hh,v 1.7 2006-06-29 18:56:51 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class G4AssemblyVolume
source/geometry/volumes/include/G4AssemblyVolume.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4AssemblyVolume.icc,v 1.3 2006-06-29 18:56:53 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class G4AssemblyVolume - inline implementation
source/geometry/volumes/include/G4EnhancedVecAllocator.hh
+10 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4EnhancedVecAllocator.hh,v 1.3 2010-04-23 10:25:22 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
@@ -99,7 +98,11 @@ class G4EnhancedVecAllocator : public std::allocator<_Tp>
// override allocate / deallocate
//
void deallocate(_Tp* _Ptr, size_t _Count);
#ifdef __IBMCPP__
_Tp* allocate(size_t _Count, void * const hint = 0); // IBM AIX
#else
_Tp* allocate(size_t _Count);
#endif
};
// ------------------------------------------------------------
@@ -141,8 +144,13 @@ void G4EnhancedVecAllocator<_Tp>::deallocate(_Tp* _Ptr, size_t _Count)
// allocate
// ************************************************************
//
#ifdef __IBMCPP__
template<typename _Tp>
_Tp* G4EnhancedVecAllocator<_Tp>::allocate(size_t _Count, void * const hint)
#else
template<typename _Tp>
_Tp* G4EnhancedVecAllocator<_Tp>::allocate(size_t _Count)
#endif
{
size_t totalsize = _Count * sizeof(_Tp);
source/geometry/volumes/include/G4GRSSolid.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSSolid.hh,v 1.8 2006-06-29 18:56:55 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4GRSSolid
source/geometry/volumes/include/G4GRSSolid.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSSolid.icc,v 1.9 2006-06-29 18:56:57 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4GRSSolid inline implementation
source/geometry/volumes/include/G4GRSSolidHandle.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSSolidHandle.hh,v 1.6 2006-06-29 18:56:59 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class G4GRSSolidHandle
//
source/geometry/volumes/include/G4GRSVolume.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSVolume.hh,v 1.8 2006-06-29 18:57:01 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4GRSVolume
source/geometry/volumes/include/G4GRSVolume.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSVolume.icc,v 1.10 2006-06-29 18:57:03 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4GRSVolume inline implementation
source/geometry/volumes/include/G4GRSVolumeHandle.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSVolumeHandle.hh,v 1.6 2006-06-29 18:57:06 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class G4GRSVolumeHandle
//
source/geometry/volumes/include/G4LogicalBorderSurface.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LogicalBorderSurface.hh,v 1.17 2008-08-19 15:31:52 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// class G4LogicalBorderSurface
//
source/geometry/volumes/include/G4LogicalBorderSurface.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LogicalBorderSurface.icc,v 1.9 2006-06-29 18:57:11 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4LogicalBorderSurface inline implementation
source/geometry/volumes/include/G4LogicalSkinSurface.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LogicalSkinSurface.hh,v 1.17 2008-08-19 15:31:52 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// class G4LogicalSkinSurface
//
source/geometry/volumes/include/G4LogicalSkinSurface.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LogicalSkinSurface.icc,v 1.9 2006-06-29 18:57:16 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4LogicalSkinSurface inline implementation
source/geometry/volumes/include/G4NavigationHistory.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationHistory.hh,v 1.19 2010-12-15 17:05:06 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// class G4NavigationHistory
//
source/geometry/volumes/include/G4NavigationHistory.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationHistory.icc,v 1.14 2009-08-04 08:27:20 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4NavigationHistory Inline implementation
source/geometry/volumes/include/G4NavigationLevel.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationLevel.hh,v 1.18 2009-08-04 08:27:20 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// class G4NavigationLevel
//
source/geometry/volumes/include/G4NavigationLevel.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationLevel.icc,v 1.24 2010-10-27 07:34:32 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// 30.09.97 J.Apostolakis Initial version.
//
source/geometry/volumes/include/G4NavigationLevelRep.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationLevelRep.hh,v 1.9 2006-06-29 18:57:27 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// class G4NavigationLevelRep
//
source/geometry/volumes/include/G4NavigationLevelRep.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationLevelRep.icc,v 1.16 2010-10-27 07:34:32 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// 1 October 1997 J.Apostolakis Initial version.
//
source/geometry/volumes/include/G4PVParameterised.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PVParameterised.hh,v 1.8 2007-04-11 07:56:38 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4PVParameterised
source/geometry/volumes/include/G4PVPlacement.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PVPlacement.hh,v 1.8 2007-04-11 07:56:38 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4PVPlacement
source/geometry/volumes/include/G4PVReplica.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PVReplica.hh,v 1.6 2010-07-05 13:29:12 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4PVReplica
source/geometry/volumes/include/G4ReflectionFactory.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ReflectionFactory.hh,v 1.5 2010-04-13 07:19:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4ReflectionFactory
source/geometry/volumes/include/G4TouchableHistory.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4TouchableHistory.hh,v 1.11 2009-11-06 11:10:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4TouchableHistory
source/geometry/volumes/include/G4TouchableHistory.icc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4TouchableHistory.icc,v 1.15 2010-10-27 07:34:32 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4TouchableHistory inline implementation
source/geometry/volumes/include/G4TouchableHistoryHandle.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4TouchableHistoryHandle.hh,v 1.6 2006-06-29 18:57:48 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// Class G4TouchableHistoryHandle
//
source/geometry/volumes/src/G4AssemblyVolume.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4AssemblyVolume.cc,v 1.12 2009-09-22 13:58:48 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class G4AssemblyVolume - implementation
source/geometry/volumes/src/G4GRSSolid.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSSolid.cc,v 1.10 2010-09-06 10:02:02 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4GRSSolid Implementation
source/geometry/volumes/src/G4GRSVolume.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GRSVolume.cc,v 1.10 2010-09-06 10:02:02 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4GRSVolume Implementation
source/geometry/volumes/src/G4LogicalBorderSurface.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LogicalBorderSurface.cc,v 1.17 2008-08-19 15:31:52 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// --------------------------------------------------------------------
// G4LogicalBorderSurface Implementation
source/geometry/volumes/src/G4LogicalSkinSurface.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LogicalSkinSurface.cc,v 1.16 2008-08-19 15:31:52 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// --------------------------------------------------------------------
// G4LogicalSkinSurface Implementation
source/geometry/volumes/src/G4NavigationHistory.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationHistory.cc,v 1.17 2010-12-15 17:05:06 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// G4NavigationHistory Implementation
source/geometry/volumes/src/G4NavigationLevel.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationLevel.cc,v 1.5 2009-08-03 16:13:19 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// 30.09.97 J.Apostolakis Initial version.
//
source/geometry/volumes/src/G4NavigationLevelRep.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4NavigationLevelRep.cc,v 1.2 2006-06-29 18:58:06 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// 1 October 1997 J.Apostolakis Initial version.
//
source/geometry/volumes/src/G4PVParameterised.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PVParameterised.cc,v 1.11 2009-09-21 10:27:05 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4PVParameterised
source/geometry/volumes/src/G4PVPlacement.cc
+3 -4
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PVPlacement.cc,v 1.17 2010-07-05 13:29:12 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4PVPlacement Implementation
@@ -342,9 +341,9 @@ G4bool G4PVPlacement::CheckOverlaps(G4int res, G4double tol, G4bool verbose)
// and finally to current volume's coordinate system
//
G4ThreeVector mp2 = Td.TransformPoint(dPoint);
G4ThreeVector ms = Tm.Inverse().TransformPoint(mp2);
G4ThreeVector msi = Tm.Inverse().TransformPoint(mp2);
if (solid->Inside(ms)==kInside)
if (solid->Inside(msi)==kInside)
{
std::ostringstream message;
message << "Overlap with volume already placed !" << G4endl
source/geometry/volumes/src/G4PVReplica.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PVReplica.cc,v 1.8 2010-07-05 13:29:12 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4PVReplica Implementation
source/geometry/volumes/src/G4ReflectionFactory.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ReflectionFactory.cc,v 1.10 2010-04-13 07:19:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// Class G4ReflectionFactory Implementation
source/geometry/volumes/src/G4TouchableHistory.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4TouchableHistory.cc,v 1.15 2009-11-06 11:10:35 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4TouchableHistory Implementation