Import Geant4 10.0.0 source tree

environments/g4py/source/geometry/CMakeLists.txt

@@ -0,0 +1,64 @@
+# - build library
+
+link_directories (${GEANT4_LIBRARY_DIR})
+
+# library
+set(_TARGET pyG4geometry)
+add_library (
+  ${_TARGET} SHARED
+  pyG4BooleanSolid.cc
+  pyG4Box.cc
+  pyG4ChordFinder.cc
+  pyG4Cons.cc
+  pyG4Ellipsoid.cc
+  pyG4EllipticalCone.cc
+  pyG4EllipticalTube.cc
+  pyG4Field.cc
+  pyG4FieldManager.cc
+  pyG4GeometryManager.cc
+  pyG4Hype.cc
+  pyG4IntersctionSolid.cc
+  pyG4LogicalVolume.cc
+  pyG4MagneticField.cc
+  pyG4Navigator.cc
+  pyG4Orb.cc
+  pyG4PVPlacement.cc
+  pyG4PVReplica.cc
+  pyG4Para.cc
+  pyG4Polycone.cc
+  pyG4Polyhedra.cc
+  pyG4Region.cc
+  pyG4Sphere.cc
+  pyG4SubtractionSolid.cc
+  pyG4Tet.cc
+  pyG4Torus.cc
+  pyG4TouchableHistory.cc
+  pyG4TransportationManager.cc
+  pyG4Trap.cc
+  pyG4Trd.cc
+  pyG4Tubs.cc
+  pyG4TwistedBox.cc
+  pyG4TwistedTrap.cc
+  pyG4TwistedTrd.cc
+  pyG4TwistedTubs.cc
+  pyG4UniformMagField.cc
+  pyG4UnionSolid.cc
+  pyG4VPhysicalVolume.cc
+  pyG4VSolid.cc
+  pyG4VTouchable.cc
+  pymodG4geometry.cc
+)
+
+set_target_properties(${_TARGET} PROPERTIES PREFIX "")
+set_target_properties(${_TARGET} PROPERTIES OUTPUT_NAME "G4geometry")
+set_target_properties(${_TARGET}
+                      PROPERTIES INSTALL_RPATH
+                      ${GEANT4_LIBRARY_DIR}
+                      BUILD_WITH_INSTALL_RPATH TRUE)
+
+target_link_libraries (${_TARGET}
+                      ${GEANT4_LIBRARIES_WITH_VIS} boost_python)
+
+
+# install
+install(TARGETS ${_TARGET} LIBRARY DESTINATION ${G4MODULES_INSTALL_DIR})

environments/g4py/source/geometry/GNUmakefile

@@ -1,5 +1,4 @@
-# $Id: GNUmakefile,v 1.2 2006-04-25 08:09:45 kmura Exp $
-# $Name: not supported by cvs2svn $
+# $Id: GNUmakefile 76884 2013-11-18 12:54:03Z gcosmo $
 # ===========================================================
 #   Makefile for building Geant4Py modules
 # ===========================================================

environments/g4py/source/geometry/pyG4BooleanSolid.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4BooleanSolid.cc,v 1.1 2007-08-07 03:35:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4BooleanSolid.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4BooleanSolid.cc
 //

environments/g4py/source/geometry/pyG4Box.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Box.cc,v 1.6 2007-07-12 10:01:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Box.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Box.cc
 //

environments/g4py/source/geometry/pyG4ChordFinder.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4ChordFinder.cc,v 1.4 2006-06-29 15:31:53 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4ChordFinder.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4ChordFinder.cc
 //
@@ -41,9 +40,9 @@ using namespace boost::python;
 // ====================================================================
 namespace pyG4ChordFinder {
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_SetVerbose, SetVerbose, 0, 1);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_SetVerbose, SetVerbose, 0, 1)
 
-};
+}
 
 using namespace pyG4ChordFinder;
 

environments/g4py/source/geometry/pyG4Cons.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Cons.cc,v 1.5 2007-07-12 10:01:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Cons.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Cons.cc
 //

environments/g4py/source/geometry/pyG4Ellipsoid.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Ellipsoid.cc,v 1.2 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Ellipsoid.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4Ellipsoid.cc
 //
@@ -51,7 +50,7 @@ G4Ellipsoid* CreateEllipsoid(const G4String& name,
                          pzBottomCut, pzTopCut);
 }
 
-BOOST_PYTHON_FUNCTION_OVERLOADS(f_CreateEllipsoid, CreateEllipsoid, 4,6); 
+BOOST_PYTHON_FUNCTION_OVERLOADS(f_CreateEllipsoid, CreateEllipsoid, 4,6)
 
 }
 
@@ -67,7 +66,7 @@ void export_G4Ellipsoid()
     // constructors
     .def(init<const G4String&, G4double, G4double, G4double>())
     .def(init<const G4String&, G4double, G4double, G4double, G4double>())
-    .def(init<const G4String&, G4double, G4double, G4double, G4double, 
+    .def(init<const G4String&, G4double, G4double, G4double, G4double,
                                G4double>())
     // ---
     .def("GetSemiAxisMax", &G4Ellipsoid::GetSemiAxisMax)
@@ -78,7 +77,7 @@ void export_G4Ellipsoid()
     // operators
     .def(self_ns::str(self))
     ;
-  
+
     // Create solid
     def("CreateEllipsoid", CreateEllipsoid,
         f_CreateEllipsoid()[return_value_policy<manage_new_object>()]);

environments/g4py/source/geometry/pyG4EllipticalCone.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4EllipticalCone.cc,v 1.2 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4EllipticalCone.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4EllipticalCone.cc
 //

environments/g4py/source/geometry/pyG4EllipticalTube.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4EllipticalTube.cc,v 1.2 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4EllipticalTube.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4EllipticalTube.cc
 //

environments/g4py/source/geometry/pyG4Field.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Field.cc,v 1.4 2006-06-29 15:31:59 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Field.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Field.cc
 //

environments/g4py/source/geometry/pyG4FieldManager.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4FieldManager.cc,v 1.5 2008-03-13 07:32:18 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4FieldManager.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4FieldManager.cc
 //
@@ -58,10 +57,10 @@ namespace pyG4FieldManager {
 
 G4ChordFinder*(G4FieldManager::*f1_GetChordFinder)()
   = &G4FieldManager::GetChordFinder;
-const G4ChordFinder*(G4FieldManager::*f2_GetChordFinder)() const 
+const G4ChordFinder*(G4FieldManager::*f2_GetChordFinder)() const
   = &G4FieldManager::GetChordFinder;
 
-};
+}
 
 using namespace pyG4FieldManager;
 
@@ -92,7 +91,7 @@ void export_G4FieldManager()
     .def("ConfigureForTrack",     &G4FieldManager::ConfigureForTrack)
     .def("GetDeltaIntersection",  &G4FieldManager::GetDeltaIntersection)
     .def("GetDeltaOneStep",       &G4FieldManager::GetDeltaOneStep)
-    .def("SetAccuraciesWithDeltaOneStep", 
+    .def("SetAccuraciesWithDeltaOneStep",
 	 &G4FieldManager::SetAccuraciesWithDeltaOneStep)
     .def("SetDeltaOneStep",       &G4FieldManager::SetDeltaOneStep)
     .def("SetDeltaIntersection",  &G4FieldManager::SetDeltaIntersection)

environments/g4py/source/geometry/pyG4GeometryManager.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4GeometryManager.cc,v 1.1 2008-12-03 07:21:56 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4GeometryManager.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4GeometryManager.cc
 //
@@ -41,10 +40,10 @@ using namespace boost::python;
 // ====================================================================
 namespace pyG4GeometryManager {
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_CloseGeometry, CloseGeometry, 0, 3);
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_OpenGeometry, OpenGeometry, 0, 1);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_CloseGeometry, CloseGeometry, 0, 3)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_OpenGeometry, OpenGeometry, 0, 1)
 
-};
+}
 
 using namespace pyG4GeometryManager;
 
@@ -59,7 +58,7 @@ void export_G4GeometryManager()
          return_value_policy<reference_existing_object>())
     .staticmethod("GetInstance")
     // ---
-    .def("CloseGeometry",         &G4GeometryManager::CloseGeometry, 
+    .def("CloseGeometry",         &G4GeometryManager::CloseGeometry,
          f_CloseGeometry())
     .def("OpenGeometry",          &G4GeometryManager::OpenGeometry,
          f_OpenGeometry())

environments/g4py/source/geometry/pyG4Hype.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Hype.cc,v 1.2 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Hype.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Hype.cc
 //

environments/g4py/source/geometry/pyG4IntersctionSolid.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4IntersctionSolid.cc,v 1.1 2007-08-07 03:35:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4IntersctionSolid.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4IntersectionSolid.cc
 //

environments/g4py/source/geometry/pyG4LogicalVolume.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4LogicalVolume.cc,v 1.5 2008-03-13 07:32:18 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4LogicalVolume.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4LogicalVolume.cc
 //
@@ -50,19 +49,20 @@ using namespace boost::python;
 // ====================================================================
 namespace pyG4LogicalVolume {
 
-void(G4LogicalVolume::*f1_SetVisAttributes)(const G4VisAttributes*) 
+void(G4LogicalVolume::*f1_SetVisAttributes)(const G4VisAttributes*)
   = &G4LogicalVolume::SetVisAttributes;
 
-void(G4LogicalVolume::*f2_SetVisAttributes)(const G4VisAttributes&) 
+void(G4LogicalVolume::*f2_SetVisAttributes)(const G4VisAttributes&)
   = &G4LogicalVolume::SetVisAttributes;
 
-#if G4VERSION_NUMBER <= 701
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetMass, GetMass, 0, 2);
-#elif G4VERSION_NUMBER >=710
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetMass, GetMass, 0, 3);
-#endif
+G4VSolid*(G4LogicalVolume::*f1_GetSolid)() const = &G4LogicalVolume::GetSolid;
 
-};
+void(G4LogicalVolume::*f1_SetSolid)(G4VSolid*)
+  = &G4LogicalVolume::SetSolid;
+
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetMass, GetMass, 0, 3)
+
+}
 
 using namespace pyG4LogicalVolume;
 
@@ -99,9 +99,9 @@ void export_G4LogicalVolume()
     .def("ClearDaughters",  &G4LogicalVolume::ClearDaughters)
     .def("TotalVolumeEntities", &G4LogicalVolume::TotalVolumeEntities)
     // ----
-    .def("GetSolid",        &G4LogicalVolume::GetSolid,
-	 return_internal_reference<>())
-    .def("SetSolid",        &G4LogicalVolume::SetSolid)
+    .def("GetSolid",        f1_GetSolid,
+     return_internal_reference<>())
+    .def("SetSolid",        f1_SetSolid)
     .def("GetMaterial",     &G4LogicalVolume::GetMaterial,
 	 return_internal_reference<>())
     .def("SetMaterial",     &G4LogicalVolume::SetMaterial)
@@ -141,13 +141,7 @@ void export_G4LogicalVolume()
     .def("SetVisAttributes", f1_SetVisAttributes)
     .def("SetVisAttributes", f2_SetVisAttributes)
     // ---
-#if G4VERSION_NUMBER >= 700 && G4VERSION_NUMBER <= 711 
-    .def("BecomeEnvelopeForFastSimulation", 
-	 &G4LogicalVolume::BecomeEnvelopeForFastSimulation)
-    .def("ClearEnvelopeForFastSimulation", 
-	 &G4LogicalVolume::ClearEnvelopeForFastSimulation)
-#endif
-    .def("GetFastSimulationManager", 
+    .def("GetFastSimulationManager",
 	 &G4LogicalVolume::GetFastSimulationManager,
 	 return_internal_reference<>())
     // ---

environments/g4py/source/geometry/pyG4MagneticField.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4MagneticField.cc,v 1.4 2006-06-29 15:32:10 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4MagneticField.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4MagneticField.cc
 //
@@ -48,15 +47,15 @@ public:
   virtual G4ThreeVector GetFieldValue(const G4ThreeVector& pos,
 				      const G4double time) const = 0;
 
-  virtual void GetFieldValue(const G4double Point[4], 
+  virtual void GetFieldValue(const G4double Point[4],
 			     G4double* Bfield) const {
 
-    const G4ThreeVector& bfield= 
+    const G4ThreeVector& bfield=
       GetFieldValue(G4ThreeVector(Point[0], Point[1], Point[2]), Point[3]);
-    
+
     Bfield[0]= bfield.x();
     Bfield[1]= bfield.y();
-    Bfield[2]= bfield.z();    
+    Bfield[2]= bfield.z();
   }
 
 };
@@ -69,7 +68,7 @@ namespace pyG4MagneticField {
 struct CB_PyG4MagneticField :
     PyG4MagneticField, wrapper<PyG4MagneticField> {
 
-  G4ThreeVector GetFieldValue(const G4ThreeVector& pos, 
+  G4ThreeVector GetFieldValue(const G4ThreeVector& pos,
 			      const G4double time) const {
     return get_override("GetFieldValue")(pos, time);
   }
@@ -77,10 +76,10 @@ struct CB_PyG4MagneticField :
 };
 
 G4ThreeVector(PyG4MagneticField::*f1_GetFieldValue)
-  (const G4ThreeVector&, const G4double) const 
+  (const G4ThreeVector&, const G4double) const
   = &PyG4MagneticField::GetFieldValue;
 
-};
+}
 
 using namespace pyG4MagneticField;
 
@@ -93,7 +92,7 @@ void export_G4MagneticField()
     ("__G4MagneticField", "dummy class of magnetic field", no_init)
     ;
 
-  class_<CB_PyG4MagneticField, boost::noncopyable, 
+  class_<CB_PyG4MagneticField, boost::noncopyable,
     bases<G4Field, G4MagneticField> >
     ("G4MagneticField", "base class of magnetic field")
     // ---

environments/g4py/source/geometry/pyG4Navigator.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Navigator.cc,v 1.1 2007-11-13 10:23:51 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Navigator.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4Navigator.cc
 //
@@ -42,7 +41,8 @@ using namespace boost::python;
 // ====================================================================
 void export_G4Navigator()
 {
-  class_<G4Navigator, G4Navigator*>("G4Navigator", "navigator")
+  class_<G4Navigator, G4Navigator*, boost::noncopyable>
+    ("G4Navigator", "navigator")
     // ---
     .def("GetWorldVolume",        &G4Navigator::GetWorldVolume,
          return_value_policy<reference_existing_object>())

environments/g4py/source/geometry/pyG4Orb.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Orb.cc,v 1.5 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Orb.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Orb.cc
 //

environments/g4py/source/geometry/pyG4PVPlacement.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4PVPlacement.cc,v 1.6 2008-03-13 07:32:18 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4PVPlacement.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4PVPlacement.cc
 //
@@ -42,17 +41,8 @@ using namespace boost::python;
 // ====================================================================
 namespace pyG4PVPlacement {
 
-#if G4VERSION_NUMBER <=711
-#elif G4VERSION_NUMBER <= 820
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_CheckOverlaps,
-                                       CheckOverlaps, 0, 1);
-#elif G4VERSION_NUMBER <=821
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_CheckOverlaps,
-                                       CheckOverlaps, 0, 2);
-#else
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_CheckOverlaps,
-                                       CheckOverlaps, 0, 3);
-#endif
+                                       CheckOverlaps, 0, 3)
 
 }
 
@@ -63,7 +53,7 @@ using namespace pyG4PVPlacement;
 // ====================================================================
 void export_G4PVPlacement()
 {
-  class_<G4PVPlacement, G4PVPlacement*, bases<G4VPhysicalVolume>, 
+  class_<G4PVPlacement, G4PVPlacement*, bases<G4VPhysicalVolume>,
     boost::noncopyable >
     ("G4PVPlacement", "physical volume placement", no_init)
     // ---

environments/g4py/source/geometry/pyG4PVReplica.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4PVReplica.cc,v 1.4 2006-06-29 15:32:18 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4PVReplica.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4PVReplica.cc
 //

environments/g4py/source/geometry/pyG4Para.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Para.cc,v 1.5 2007-07-12 10:01:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Para.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Para.cc
 //

environments/g4py/source/geometry/pyG4Polycone.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Polycone.cc,v 1.1 2007-07-11 05:39:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Polycone.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4Polycone.cc
 //
@@ -61,11 +60,11 @@ G4Polycone* f1_CreatePolycone(const G4String& name, G4double phiStart,
   return new G4Polycone(name, phiStart, phiTotal, numZPlanes,
                         zlist, r0list, r1list);
 }
-  
+
 
 G4Polycone* f2_CreatePolycone(const G4String& name, G4double phiStart,
                               G4double phiTotal, G4int numRZ,
-                              const std::vector<G4double>& r, 
+                              const std::vector<G4double>& r,
                               const std::vector<G4double>& z)
 {
   G4double zlist[numRZ];

environments/g4py/source/geometry/pyG4Polyhedra.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Polyhedra.cc,v 1.2 2007-07-11 10:02:22 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Polyhedra.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Polyhedra.cc
 //

environments/g4py/source/geometry/pyG4Region.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Region.cc,v 1.5 2008-03-13 07:32:18 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Region.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Region.cc
 //

environments/g4py/source/geometry/pyG4Sphere.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Sphere.cc,v 1.5 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Sphere.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Sphere.cc
 //

environments/g4py/source/geometry/pyG4SubtractionSolid.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4SubtractionSolid.cc,v 1.1 2007-08-07 03:35:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4SubtractionSolid.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4SubtractionSolid.cc
 //

environments/g4py/source/geometry/pyG4Tet.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Tet.cc,v 1.2 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Tet.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Tet.cc
 //

environments/g4py/source/geometry/pyG4Torus.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Torus.cc,v 1.5 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Torus.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Torus.cc
 //

environments/g4py/source/geometry/pyG4TouchableHistory.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4TouchableHistory.cc,v 1.4 2006-06-29 15:32:33 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4TouchableHistory.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4VTouchable.cc
 //

environments/g4py/source/geometry/pyG4TransportationManager.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4TransportationManager.cc,v 1.4 2006-06-29 15:32:36 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4TransportationManager.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4TransportationManager.cc
 //

environments/g4py/source/geometry/pyG4Trap.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Trap.cc,v 1.6 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Trap.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Trap.cc
 //

environments/g4py/source/geometry/pyG4Trd.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Trd.cc,v 1.5 2007-07-12 10:01:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Trd.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Trd.cc
 //

environments/g4py/source/geometry/pyG4Tubs.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Tubs.cc,v 1.5 2007-07-12 10:01:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Tubs.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4Tubs.cc
 //

environments/g4py/source/geometry/pyG4TwistedBox.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4TwistedBox.cc,v 1.2 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4TwistedBox.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4TwistedBox.cc
 //

environments/g4py/source/geometry/pyG4TwistedTrap.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4TwistedTrap.cc,v 1.2 2007-07-13 04:57:50 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4TwistedTrap.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4TwistedTrap.cc
 //

environments/g4py/source/geometry/pyG4TwistedTrd.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4TwistedTrd.cc,v 1.1 2007-07-13 04:58:29 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4TwistedTrd.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4TwistedTrap.cc
 //

environments/g4py/source/geometry/pyG4TwistedTubs.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4TwistedTubs.cc,v 1.2 2007-07-13 04:57:51 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4TwistedTubs.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4TwistedTubs.cc
 //

environments/g4py/source/geometry/pyG4UniformMagField.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4UniformMagField.cc,v 1.4 2006-06-29 15:32:48 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4UniformMagField.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4UniformMagField.cc
 //

environments/g4py/source/geometry/pyG4UnionSolid.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4UnionSolid.cc,v 1.1 2007-08-07 03:35:53 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4UnionSolid.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4UnionSolid.cc
 //

environments/g4py/source/geometry/pyG4VPhysicalVolume.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4VPhysicalVolume.cc,v 1.7 2008-03-13 07:32:18 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4VPhysicalVolume.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4VPhysicalVolume.cc
 //
@@ -49,7 +48,7 @@ const G4RotationMatrix*(G4VPhysicalVolume::*f1_GetRotation)() const
 G4RotationMatrix*(G4VPhysicalVolume::*f2_GetRotation)()
   = &G4VPhysicalVolume::GetRotation;
 
-};
+}
 
 using namespace pyG4VPhysicalVolume;
 

environments/g4py/source/geometry/pyG4VSolid.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4VSolid.cc,v 1.6 2008-03-13 07:32:18 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4VSolid.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4VSolid.cc
 //

environments/g4py/source/geometry/pyG4VTouchable.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4VTouchable.cc,v 1.4 2006-06-29 15:32:57 gunter Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4VTouchable.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4VTouchable.cc
 //
@@ -43,20 +42,20 @@ using namespace boost::python;
 namespace pyG4VTouchable {
 
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetTranslation,
-				       GetTranslation, 0, 1);
+				       GetTranslation, 0, 1)
 
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetRotation,
-				       GetRotation, 0, 1);
+				       GetRotation, 0, 1)
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetVolume, GetVolume, 0, 1);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetVolume, GetVolume, 0, 1)
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetSolid, GetSolid, 0, 1);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetSolid, GetSolid, 0, 1)
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetReplicaNumber, 
-				       GetReplicaNumber, 0, 1);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetReplicaNumber,
+				       GetReplicaNumber, 0, 1)
+
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_MoveUpHistory, MoveUpHistory, 0, 1)
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_MoveUpHistory, MoveUpHistory, 0, 1);
-  
 }
 
 using namespace pyG4VTouchable;
@@ -80,10 +79,10 @@ void export_G4VTouchable()
     .def("GetSolid", &G4VTouchable::GetSolid,
 	 f_GetSolid()
 	 [return_value_policy<reference_existing_object>()])
-    .def("GetReplicaNumber", &G4VTouchable::GetReplicaNumber, 
+    .def("GetReplicaNumber", &G4VTouchable::GetReplicaNumber,
 	 f_GetReplicaNumber())
     .def("GetHistoryDepth",  &G4VTouchable::GetHistoryDepth)
-    .def("MoveUpHistory", &G4VTouchable::MoveUpHistory, 
+    .def("MoveUpHistory", &G4VTouchable::MoveUpHistory,
 	 f_MoveUpHistory())
     ;
 }

environments/g4py/source/geometry/pymodG4geometry.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pymodG4geometry.cc,v 1.10 2008-12-03 07:21:56 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pymodG4geometry.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pymodG4geometry.cc [Geant4Py module]
 //