Import Geant4 10.5.0 source tree

CMakeLists.txt

@@ -3,7 +3,6 @@
 #
 # 21st September 2010 Ben Morgan
 #
-# $Id: CMakeLists.txt 110849 2018-06-20 06:36:08Z gcosmo $
 #
 
 #-----------------------------------------------------------------------

ReleaseNotes/Beta4.10.5-1.txt

@@ -58,8 +58,6 @@
   o G4LindhardSorensenIonModel, G4LindhardSorensenData: new relativistic ion 
     ionisation model.
   o Introduced switch in cross-sections to allow transuranic elements.
-  o Implemented simple algorithm in visualization to allow colouring of
-    detector elements based on materials density.
   o Removed unnecessary checks of process manager for generic ion and muonic
     atom in G4SteppingManager.
   o Implemented simple algorithm in visualization to allow colouring of
@@ -840,8 +838,6 @@ List of features and fixes included in this Beta release since 10.4.p02:
       o Removed obsloete class PhysListEmStandardSSM.
       o PhysicsList: make Opt4 default, removed local instantiation of G4Decay.
       o Corrected input macros to optimise output.
-    + extended/electromagnetic/TestEm5
-      o Corrected input macros to optimise output.
     + extended/electromagnetic/TestEm7
       o SteppingAction: added edep at end of step for photo-electric.
       o Fixed compilation warning on gcc-8.1.0.

cmake/History

@@ -1,4 +1,3 @@
-cvs log $Id: History,v 1.3 2010-12-03 17:58:51 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -31,6 +30,53 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
 
      ----------------------------------------------------------
 
+5th November 2018 - Gunter Folger  (cmake-V10-04-27)
+- Switch to G4PARTICLEXS 1.1
+
+5th November 2018 - Gunter Folger  (cmake-V10-04-26)
+- Modules/Geant4DatasetDefinitions.cmake:
+   remove entry for G4NEUTRONXS 
+
+2nd November 2018 - Gunter Folger  (cmake-V10-04-25)
+- Modules/Geant4DatasetDefinitions.cmake: 
+   Add new  G4PARTICLEXS data set; this replaces G4NEUTRONXS
+- fix dates of two entries below; was wrong, not even a typo   
+
+29th October 2018 - Gunter Folger  (cmake-V10-04-24)
+- Switch to new dataset RadioactiveDecay5.3
+
+29th October 2018 - Gunter Folger  (cmake-V10-04-23)
+- Switch to new dataset PhotonEvaporation5.3
+
+18th October 2018 - Ben Morgan (cmake-V10-04-22)
+- Modules/Geant4InstallData.cmake: Use https for URL
+- Templates/geant4-config.in: Add -L flag to curl to follow redirects
+  when accessing dataset url
+
+28th September 2018  - Gabriele Cosmo (cmake-V10-04-21)
+- Modules/Geant4MakeRules_cxx.cmake: added -DGL_SILENCE_DEPRECATION
+  to CMAKE_CXX_FLAGS_INIT for clang to silence GL deprecation compilation
+  warnings on MacOS 10.14 Mojave.
+
+19th September 2018  - Gunter Folger (cmake-V10-04-20)
+- Switch to G4SAIDDATA2.0
+
+17th September 2018  - Gunter Folger (cmake-V10-04-19)
+- Switch to G4EMLOW7.7
+
+22nd August 2018 - Gabriele Cosmo (cmake-V10-04-18)
+- Updated FindInventor.cmake to properly setup SoQt if existing.
+- Geant4InterfaceOptions.cmake: added check for existance of SoQt package.
+
+9th August 2018  - Gunter Folger (cmake-V10-04-17)
+- Switch to G4EMLOW7.6
+
+3rd August 2018  - Gunter Folger (cmake-V10-04-16)
+- Add new dataset for INCL, G4INCL1.0
+
+4th July 2018  - Gunter Folger (cmake-V10-04-15)
+- Switch to G4EMLOW7.5
+
 19th June 2018 - Gunter Folger (cmake-V10-04-14)
 - Templates/geant4_validate_sources.cmake.in, revert addition of .c and .h
   Skip checking sources for zlib

cmake/Modules/FindInventor.cmake

@@ -213,24 +213,48 @@ if(UNIX)
     PATHS ${INVENTOR_LIB_SEARCH_PATH}
     )
 
-  # try to find SoXt debug lib (priority paths)
+  #
-  #FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG
+  #  SoQt
-  #  NAMES soxt1d
+  #
-  #  PATHS ${SOXT_PREFIX}/lib
+  #  notes:
-  #  $ENV{COINDIR}/lib
+  #  - SoQt is detected by soqt-config script (as expected by
-  #  NO_DEFAULT_PATH
+  #    Coin's SoQt on Linux/Unix) and on standard system locations
-  #  )
+  #
 
-  # try to find SoXt debug lib (regular paths)
+  # soqt-config tells much of SoQt installation (if present)
-  #FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG
+  execute_process (COMMAND soqt-config --prefix
-  #  NAMES soxt1d
+    OUTPUT_VARIABLE SOQT_PREFIX
-  #  PATHS ${INVENTOR_LIB_SEARCH_PATH}
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  #  )
+
+  # try to find Inventor includes (priority paths from coin-config and COINDIR)
+  FIND_PATH(INVENTOR_SOQT_INCLUDE_DIR Inventor/Qt/SoQt.h
+    ${SOQT_PREFIX}/include
+    $ENV{COINDIR}/include
+    NO_DEFAULT_PATH
+  )
+
+  # try to find Inventor includes (system paths)
+  FIND_PATH(INVENTOR_SOQT_INCLUDE_DIR Inventor/Qt/SoQt.h
+    /usr/local/include
+    /usr/include
+    /sw/include
+    /opt/local/include
+    /opt/csw/include
+    /opt/include
+  )
+
+  # try to find SoQt lib (priority paths)
+  FIND_LIBRARY(INVENTOR_SOQT_LIBRARY
+    NAMES soqt1 SoQt
+    PATHS ${SOQT_PREFIX}/lib
+    $ENV{COINDIR}/lib
+    NO_DEFAULT_PATH
+    )
+
+  # try to find SoQt lib (regular paths)
+  FIND_LIBRARY(INVENTOR_SOQT_LIBRARY
+    NAMES soqt1 SoQt
+    PATHS ${INVENTOR_LIB_SEARCH_PATH}
+    )
 
-  # SoXt debug library defaults to non-debug lib
-  #IF(NOT INVENTOR_SOXT_LIBRARY_DEBUG)
-  #  IF(INVENTOR_SOXT_LIBRARY)
-  #    SET(INVENTOR_SOXT_LIBRARY_DEBUG INVENTOR_SOXT_LIBRARY)
-  #  ENDIF(INVENTOR_SOXT_LIBRARY)
-  #ENDIF(NOT INVENTOR_SOXT_LIBRARY_DEBUG)
 endif()

cmake/Modules/G4BuildSettings.cmake

@@ -197,8 +197,6 @@ endif()
 # Smart pointers are a library implementation feature
 # Hashed containers are a library implementation feature
 # Random numbers are a library implementation feature?
-# - Thread local? Yes, though on AppleClang platforms, see this:
-  #http://stackoverflow.com/questions/28094794/why-does-apple-clang-disallow-c11-thread-local-when-official-clang-supports
 # An example of where a workaround is needed
 # Rest of concurrency a library implementation feature
 

cmake/Modules/Geant4DatasetDefinitions.cmake

@@ -18,41 +18,41 @@ geant4_add_dataset(
 # - Low energy electromagnetics
 geant4_add_dataset(
   NAME      G4EMLOW
-  VERSION   7.4
+  VERSION   7.7
   FILENAME  G4EMLOW
   EXTENSION tar.gz
   ENVVAR    G4LEDATA
-  MD5SUM    a4443411b1a8782640b6eec691e7c25f
+  MD5SUM    0f650ea65c028e862a05293c10ec1089
   )
 
 # - Photon evaporation
 geant4_add_dataset(
   NAME      PhotonEvaporation
-  VERSION   5.2
+  VERSION   5.3
   FILENAME  G4PhotonEvaporation
   EXTENSION tar.gz
   ENVVAR    G4LEVELGAMMADATA
-  MD5SUM    37c5dea9614a07885050350d071a6973
+  MD5SUM    8991682af997e71bdd87f72ee3b3e9ee
   )
 
 # - Radioisotopes
 geant4_add_dataset(
   NAME      RadioactiveDecay
-  VERSION   5.2
+  VERSION   5.3
   FILENAME  G4RadioactiveDecay
   EXTENSION tar.gz
   ENVVAR    G4RADIOACTIVEDATA
-  MD5SUM    e035ed77e12be3a69c2d32806d1b5cde
+  MD5SUM    ce1fe5e4d82d1a2ce89380e5e7e16cc8
   )
 
-# - Neutron XS
+# - Particle XS - replaces Neutron XS
 geant4_add_dataset(
-  NAME      G4NEUTRONXS
+  NAME      G4PARTICLEXS
-  VERSION   2.0
+  VERSION   1.1
-  FILENAME  G4NEUTRONXS
+  FILENAME  G4PARTICLEXS
   EXTENSION tar.gz
-  ENVVAR    G4NEUTRONXSDATA
+  ENVVAR    G4PARTICLEXSDATA
-  MD5SUM    c3af588c26522f289ec60dcb7c847ade
+  MD5SUM    17dc6c6f11db7ca81dea1c2c2b3707d2
   )
 
 # - PII
@@ -78,11 +78,11 @@ geant4_add_dataset(
 # - SAID
 geant4_add_dataset(
   NAME      G4SAIDDATA
-  VERSION   1.1
+  VERSION   2.0
   FILENAME  G4SAIDDATA
   EXTENSION tar.gz
   ENVVAR    G4SAIDXSDATA
-  MD5SUM    d88a31218fdf28455e5c5a3609f7216f
+  MD5SUM    d5d4e9541120c274aeed038c621d39da
   )
 
 # - ABLA
@@ -95,6 +95,17 @@ geant4_add_dataset(
   MD5SUM    180f1f5d937733b207f8d5677f76296e
   )
 
+
+# - INCL
+geant4_add_dataset(
+  NAME      G4INCL
+  VERSION   1.0
+  FILENAME  G4INCL
+  EXTENSION tar.gz
+  ENVVAR    G4INCLDATA
+  MD5SUM    85fe937b6df46d41814f07175d3f5b51
+  )
+
 # - ENSDFSTATE
 geant4_add_dataset(
   NAME      G4ENSDFSTATE

cmake/Modules/Geant4InstallData.cmake

@@ -99,7 +99,7 @@
 # retrieving them globally
 #-----------------------------------------------------------------------
 # Geant4 Data Repository
-set(GEANT4_DATASETS_URL "http://cern.ch/geant4-data/datasets")
+set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
 
 # Where to install data in the build tree
 set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)

cmake/Modules/Geant4InterfaceOptions.cmake

@@ -52,6 +52,11 @@ if(GEANT4_USE_INVENTOR)
     if(NOT INVENTOR_SOXT_LIBRARY OR NOT INVENTOR_SOXT_INCLUDE_DIR)
       message(FATAL_ERROR "Could not find SoXt library and/or headers")
     endif()
+    if (GEANT4_USE_INVENTOR_QT)
+      if (NOT INVENTOR_SOQT_LIBRARY OR NOT INVENTOR_SOQT_INCLUDE_DIR)
+        message(FATAL_ERROR "Could not find SoQt library and/or headers")
+      endif()
+    endif()
     set(INVENTOR_INCLUDE_DIR "${INVENTOR_INCLUDE_DIR}" "${INVENTOR_SOXT_INCLUDE_DIR}")
     find_package(Motif REQUIRED)
     find_package(X11 REQUIRED)

cmake/Modules/Geant4MakeRules_cxx.cmake

@@ -41,9 +41,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
   set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
 
-  # Remove superfluous "unused argument" "warnings" from Clang
+  # Remove superfluous "unused argument" and "GL deprecation" "warnings" from Clang
   if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
-    set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -Qunused-arguments")
+    set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -Qunused-arguments -DGL_SILENCE_DEPRECATION")
   endif()
 
   # Though it should be the default, always use libc++ with AppleClang

cmake/Modules/genwindef/genwindef.cpp

@@ -1,81 +1,80 @@
-//$Id: genconf.cpp,v 1.35 2008/10/15 21:51:24 marcocle Exp $	//
+
-
+#ifdef _WIN32
-#ifdef _WIN32
+  // Disable a warning in Boost program_options headers:
-  // Disable a warning in Boost program_options headers:
+  // inconsistent linkage in program_options/variables_map.hpp
-  // inconsistent linkage in program_options/variables_map.hpp
+  #pragma warning ( disable : 4273 )
-  #pragma warning ( disable : 4273 )
+  #define popen _popen
-  #define popen _popen
+  #define pclose _pclose 
-  #define pclose _pclose 
+  #define fileno _fileno 
-  #define fileno _fileno 
+  #include <stdlib.h>
-  #include <stdlib.h>
+#endif
-#endif
+
-
+// Include files----------------------------------------------------------------
-// Include files----------------------------------------------------------------
+#include <vector>
-#include <vector>
+#include <string>
-#include <string>
+#include <iostream>
-#include <iostream>
+#include <fstream>
-#include <fstream>
+#include "LibSymbolInfo.h"
-#include "LibSymbolInfo.h"
+
-
+using namespace std;
-using namespace std;
+
-
+namespace windef {
-namespace windef {
+  void usage(){
-  void usage(){
+    cerr << "Usage: genwindef [-l <dllname>] [-o <output-file> | exports.def]  <obj or lib filenames>" << endl;
-    cerr << "Usage: genwindef [-l <dllname>] [-o <output-file> | exports.def]  <obj or lib filenames>" << endl;
+    exit(1);
-    exit(1);
+  }
-  }
+}
-}
+
-
+//--- Command main program-----------------------------------------------------
-//--- Command main program-----------------------------------------------------
+int main ( int argc, char** argv )
-int main ( int argc, char** argv )
+//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+{
-{
+  string outfile("exports.def");
-  string outfile("exports.def");
+  string library("UnknownLib");
-  string library("UnknownLib");
+  string objfiles;
-  string objfiles;
+  bool debug(false);
-  bool debug(false);
+
-
+  int arg;
-  int arg;
+  if (argc < 3) windef::usage();
-  if (argc < 3) windef::usage();
+  arg = 1;
-  arg = 1;
+  while (argv[arg][0] == '-') {
-  while (argv[arg][0] == '-') {
+    if (strcmp(argv[arg], "--") == 0) {
-    if (strcmp(argv[arg], "--") == 0) {
+      windef::usage();
-      windef::usage();
+    } 
-    } 
+    else if (strcmp(argv[arg], "-l") == 0) {
-    else if (strcmp(argv[arg], "-l") == 0) {
+      arg++; 
-      arg++; 
+      if (arg == argc) windef::usage();
-      if (arg == argc) windef::usage();
+      library = argv[arg];
-      library = argv[arg];
+    } 
-    } 
+    else if (strcmp(argv[arg], "-o") == 0) {
-    else if (strcmp(argv[arg], "-o") == 0) {
+      arg++; 
-      arg++; 
+      if (arg == argc) windef::usage();
-      if (arg == argc) windef::usage();
+      outfile = argv[arg];
-      outfile = argv[arg];
+    } 
-    } 
+    arg++;
-    arg++;
+  }
-  }
+  if (arg == argc) windef::usage();
-  if (arg == argc) windef::usage();
+  for (arg; arg < argc; arg++) {
-  for (arg; arg < argc; arg++) {
+     objfiles += argv[arg];
-     objfiles += argv[arg];
+     if( arg+1 < argc) objfiles += " ";
-     if( arg+1 < argc) objfiles += " ";
+  }
-  }
+
-
+  CLibSymbolInfo libsymbols;
-  CLibSymbolInfo libsymbols;
+  ofstream out(outfile.c_str());
-  ofstream out(outfile.c_str());
+  if(out.fail()) {
-  if(out.fail()) {
+    cerr << "windef: Error opening file " << outfile << endl;
-    cerr << "windef: Error opening file " << outfile << endl;
+    return 1;
-    return 1;
+  }
-  }
+  out << "LIBRARY " << library << endl;
-  out << "LIBRARY " << library << endl;
+  out << "EXPORTS" << endl;
-  out << "EXPORTS" << endl;
+
-
+  libsymbols.DumpSymbols(const_cast<char*>(objfiles.c_str()), out);
-  libsymbols.DumpSymbols(const_cast<char*>(objfiles.c_str()), out);
+
-
+  out.close();
-  out.close();
+
-
+
-
+  return 0;
-  return 0;
+}
-}
+
-
+
-
+
-

cmake/Templates/geant4-config.in

@@ -373,7 +373,7 @@ install_datasets()
       # - Download bundle to cache
       dataset_file=$(echo $ds | cut -d "|" -f4)
       echo "+ downloading ${dataset_file}"
-      ${G4CURL} -f -m ${dataset_timeout} -o ${g4downloaddir}/${dataset_file} ${dataset_url}/${dataset_file}
+      ${G4CURL} -L -f -m ${dataset_timeout} -o ${g4downloaddir}/${dataset_file} ${dataset_url}/${dataset_file}
       curl_status="$?"
       if [ "$curl_status" != "0" ] ; then
         echo "- download of '${dataset_file}' failed : CURL error $?"

config/G4UI_BUILD.gmk

@@ -1,4 +1,3 @@
-# $Id: G4UI_BUILD.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 # -------------------------------------------------------------
 # Interfaces-specific CPPFLAGS for BUILD phase.
 #   John Allison, 6th July 1998.

config/G4UI_USE.gmk

@@ -1,4 +1,3 @@
-# $Id: G4UI_USE.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for interfaces USE phase.
 #   John Allison, 6th July 1998.

config/G4VIS_BUILD.gmk

@@ -1,4 +1,3 @@
-# $Id: G4VIS_BUILD.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 # -------------------------------------------------------------
 # Visualization-specific CPPFLAGS for BUILD phase.
 #   John Allison, 24th January 1998.

config/G4VIS_USE.gmk

@@ -1,4 +1,3 @@
-# $Id: G4VIS_USE.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for visualization USE phase.
 #   John Allison, 24th January 1998.

config/History

@@ -1,4 +1,3 @@
-svn log $Id: History 109363 2018-04-12 15:17:01Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +15,21 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+28th September 2018 Gabriele Cosmo  (config-V10-04-09)
+- Added -DGL_SILENCE_DEPRECATION to CPPFLAGS to Darwin setups to silence
+  deprecation compilation warnings on MacOS 10.14 Mojave.
+
+18th September 2018 Gabriele Cosmo  (config-V10-04-08)
+- Cleanup settings for GL in Darwin-clang.gmk and Darwin-g++.gmk.
+
+12th September 2018 Gabriele Cosmo  (config-V10-04-07)
+- Withdraw changes of last tag for Linux-g++ and corrected use of
+  G4RUNPATHOPTION in binmake.gmk for installed kernel libraries.
+
+7th September 2018 Gabriele Cosmo  (config-V10-04-06)
+- Fixed setting of G4RUNPATHOPTION in Darwin/Linux-clang/g++ and binmake.cmk.
+  Addressing problem report #2086.
+
 12th April 2018 Gabriele Cosmo  (config-V10-04-05)
 - WIN32-VC.gmk: updated obsolete configuration for Qt5.
 

config/analysis.gmk

@@ -1,4 +1,3 @@
-# $Id: analysis.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 #   Guy Barrand, 20th Mai 2000
 #
 # Analysis variables...

config/architecture.gmk

@@ -1,4 +1,3 @@
-# $Id: architecture.gmk 108986 2018-03-20 14:45:18Z gcosmo $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #

config/binmake.gmk

@@ -1,4 +1,3 @@
-# $Id: binmake.gmk 106467 2017-10-11 08:09:08Z gcosmo $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
 #    First implementation: Gabriele Cosmo, 25/06/1998.
@@ -194,6 +193,7 @@ ifdef G4EXLIB
 #     For the example dependent directory, keep the 
 #     path to the shared lib in the executable.
       LDFLAGS += $(G4RUNPATHOPTION)$(G4TMPDIR)
+      LDFLAGS += $(G4RUNPATHOPTION)$(G4LIB)/$(G4SYSTEM)
     endif
   endif
   include $(G4INSTALL)/config/common.gmk

config/common.gmk

@@ -1,4 +1,3 @@
-# $Id: common.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
 # ----------------------------------------------------------------

config/genwindef.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-//$Id: genconf.cpp,v 1.35 2008/10/15 21:51:24 marcocle Exp $	//
 
 #ifdef _WIN32
   // Disable a warning in Boost program_options headers:

config/geomconf.gmk

@@ -1,4 +1,3 @@
-# $Id:$
 # ----------------------------------------------------------------------------
 # Gabriele Cosmo, 11th October 2013
 #

config/globlib.gmk

@@ -1,4 +1,3 @@
-# $Id: globlib.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 # --------------------------------------------------------------
 # Script for compound libraries.  Gabriele Cosmo, 25/6/98.
 # --------------------------------------------------------------

config/interactivity.gmk

@@ -1,4 +1,3 @@
-# $Id: interactivity.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 #  GNUmakefile for CPPFLAGS, LDFLAGS for interactivy, 
 # ie interfaces and visualization.
 #

config/liblist.c

@@ -1,4 +1,3 @@
-/* $Id: liblist.c 66368 2012-12-18 09:20:17Z gcosmo $ */
 
 /*
 Given a "libname.map" file on standard input and a list or directory

config/moc.gmk

@@ -1,4 +1,3 @@
-# $Id: moc.gmk 66368 2012-12-18 09:20:17Z gcosmo $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
 # ----------------------------------------------------------------

config/sys/Darwin-clang.gmk

@@ -10,6 +10,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
   CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
   CXXFLAGS  += -Wno-variadic-macros -Wshadow -pipe
   CXXFLAGS  += -fno-trapping-math -ftree-vectorize -fno-math-errno
+  CPPFLAGS  += -DGL_SILENCE_DEPRECATION
   G4USE_STD11 := 1
   ifdef G4USE_STD14
     CPPFLAGS  += -std=c++14
@@ -47,7 +48,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
     FCFLAGS   += -O2 -g
     CCFLAGS   += -O2 -g
   endif
-  G4RUNPATHOPTION := -Wl,-rpath 
+  G4RUNPATHOPTION := -Wl,-rpath, 
 #  G4STATIC_MODE += -Wl,-force_load
   FC := gfortran
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
@@ -84,12 +85,12 @@ ifeq ($(G4SYSTEM),Darwin-clang)
     OGLFLAGS  := -I$(OGLHOME)/include 
   endif
   ifndef OGLLIBS
-    QTGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
+    OGLPATH  := $(shell test -f /Library/Frameworks/OpenGL.framework/OpenGL && echo "/Library/Frameworks/OpenGL.framework")
-    ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
+    ifneq ($(OGLPATH),/Library/Frameworks/OpenGL.framework)
-      OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL 
+      OGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
-      ifeq ($(G4VIS_USE_OPENGLX),1)
+    endif
-        OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
+    ifneq ($(OGLPATH),)
-      endif
+      OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL 
     else
       OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
     endif

config/sys/Darwin-g++.gmk

@@ -13,6 +13,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
   CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
   CXXFLAGS  += -Wno-variadic-macros -Wshadow -pipe
   CXXFLAGS  += -fno-trapping-math -ftree-vectorize -fno-math-errno
+  CPPFLAGS  += -DGL_SILENCE_DEPRECATION
   G4USE_STD11 := 1
   ifdef G4USE_STD14
     CPPFLAGS  += -std=c++14
@@ -53,8 +54,8 @@ ifeq ($(G4SYSTEM),Darwin-g++)
     FCFLAGS   += -fPIC
     CCFLAGS   += -fPIC
   endif
-  G4RUNPATHOPTION := -Wl,-rpath 
+  G4RUNPATHOPTION := -Wl,-rpath, 
-  G4STATIC_MODE += -Wl,-force_load
+#  G4STATIC_MODE += -Wl,-force_load
   FC := gfortran
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   LDFLAGS += -bind_at_load
@@ -92,18 +93,29 @@ ifeq ($(G4SYSTEM),Darwin-g++)
 #   OGLFLAGS := -I$(OGLHOME)/Headers 
   endif
   ifndef OGLLIBS
-    QTGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
+    OGLPATH  := $(shell test -f /Library/Frameworks/OpenGL.framework/OpenGL && echo "/Library/Frameworks/OpenGL.framework")
-    ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
+    ifneq ($(OGLPATH),/Library/Frameworks/OpenGL.framework)
+      OGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
+    endif
+    ifneq ($(OGLPATH),)
+      OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL 
+    else
+      OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
+    endif
+  endif
+  ifndef OGLLIBS
+    OGLPATH  := $(shell test -f /Library/Frameworks/OpenGL.framework/OpenGL && echo "/Library/Frameworks/OpenGL.framework")
+    ifneq ($(OGLPATH),/Library/Frameworks/OpenGL.framework)
+      OGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
+    endif
+    ifneq ($(OGLPATH),)
       DARWIN_VERSION = $(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/')
       ifeq ($(DARWIN_VERSION),9)
         # the following lines are for building on MacOSX 10.5 "Leopard"
-        OGLLIBS := -Wl,$(QTGLPATH)/Versions/A/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
+        OGLLIBS := -Wl,$(OGLPATH)/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
       else
         # the following lines are for building on MacOSX > 10.5
-        OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL 
+        OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL 
-        ifeq ($(G4VIS_USE_OPENGLX),1)
-          OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
-        endif
       endif
     else
       OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL

config/sys/Linux-clang.gmk

@@ -51,7 +51,7 @@ ifeq ($(G4SYSTEM),Linux-clang)
     FCFLAGS   += -fPIC
     CCFLAGS   += -fPIC
   endif
-  G4RUNPATHOPTION := -Wl,-rpath 
+  G4RUNPATHOPTION := -Wl,-rpath, 
   G4STATIC_MODE += -Wl,--whole-archive
   G4NOSTATIC_MODE += -Wl,--no-whole-archive
   CC := clang

environments/History

@@ -1,4 +1,3 @@
-$Id: History 107590 2017-11-24 11:59:22Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -18,7 +17,11 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-envs-V10-03-01 / Nov. 24 K.Murakami
+envs-V10-04-01 / Nov. 30, 2018 K.Murakami
+ - g4py, updated for 10.5 release
+ - g4py, fix CMAKE_INSTALL_PREFIX does not work (id 1924) 
+
+envs-V10-03-01 / Nov. 24, 2017 K.Murakami
  - g4py, updated for 10.4 release
  - zmq, new ZeroMQ interface (experimental)
 

environments/MOMO/History

@@ -1,4 +1,3 @@
-$Id: History 76884 2013-11-18 12:54:03Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================

environments/g4py/CMakeLists.txt

@@ -6,7 +6,10 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 project(Geant4Py)
 #------------------------------------------------------------------------------
 # installation prefixes for libraries
-set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR})
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX  ${PROJECT_SOURCE_DIR} CACHE
+      STRING "Install prefix" FORCE)
+endif()
 
 # debug mode
 set(DEBUG FALSE CACHE BOOL "Debug Mode (Debug On)")

environments/g4py/History

@@ -11,6 +11,10 @@ Geant4Py is a Geant4-Python bridge.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+30 Nov. 2017 K. Murakami
+ - update for 10.5 release
+ - fix CMAKE_INSTALL_PREFIX does not work (id 1924)
+
 24 Nov. 2017 K. Murakami
  - update for 10.4 release
 

environments/g4py/examples/History

@@ -1,4 +1,3 @@
-$Id: History 66892 2013-01-17 10:57:59Z gunter $
 -------------------------------------------------------------------
 
      =========================================================

environments/g4py/examples/README

@@ -1,4 +1,3 @@
-$Id: README 66892 2013-01-17 10:57:59Z gunter $
 -------------------------------------------------------------------
 
 This directory contains a set of examples for Geant4Py.

environments/g4py/examples/demos/TestEm0/module/DetectorConstruction.cc

@@ -25,7 +25,6 @@
 //
 
 //
-// $Id: DetectorConstruction.cc 66241 2012-12-13 18:34:42Z gunter $
 //
 // 
 

environments/g4py/examples/demos/TestEm0/module/DetectorConstruction.hh

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: DetectorConstruction.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 // 
 

environments/g4py/examples/demos/TestEm0/module/DetectorMessenger.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: DetectorMessenger.cc 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/DetectorMessenger.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: DetectorMessenger.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/PhysListEmStandard.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: PhysListEmStandard.cc 86705 2014-11-15 19:21:53Z kmura $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

environments/g4py/examples/demos/TestEm0/module/PhysListEmStandard.hh

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: PhysListEmStandard.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/PhysicsList.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 // 
-// $Id: PhysicsList.cc 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/PhysicsList.hh

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: PhysicsList.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //

environments/g4py/examples/demos/TestEm0/module/PhysicsListMessenger.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: PhysicsListMessenger.cc 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/PhysicsListMessenger.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: PhysicsListMessenger.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/PrimaryGeneratorAction.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: PrimaryGeneratorAction.cc 66241 2012-12-13 18:34:42Z gunter $
 //
 // 
 

environments/g4py/examples/demos/TestEm0/module/PrimaryGeneratorAction.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: PrimaryGeneratorAction.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/RunAction.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: RunAction.cc 66241 2012-12-13 18:34:42Z gunter $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/RunAction.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: RunAction.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

environments/g4py/examples/demos/TestEm0/module/pytestem0.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyTestEm0.cc 66241 2012-12-13 18:34:42Z gunter $
 // ====================================================================
 //   pyTestEm0.cc
 //

environments/g4py/examples/demos/water_phantom/module/MyDetectorConstruction.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: MyDetectorConstruction.cc 66241 2012-12-13 18:34:42Z gunter $
 // ====================================================================
 //   MyDetectorConstruction.cc
 //

environments/g4py/examples/demos/water_phantom/module/MyDetectorConstruction.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: MyDetectorConstruction.hh 66241 2012-12-13 18:34:42Z gunter $
 // ====================================================================
 //   MyDetectorConstruction.hh
 //

environments/g4py/examples/demos/water_phantom/module/MyMaterials.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: MyMaterials.cc 66241 2012-12-13 18:34:42Z gunter $
 // ====================================================================
 //   MyMaterials.cc
 //

environments/g4py/examples/demos/water_phantom/module/MyMaterials.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: MyMaterials.hh 66241 2012-12-13 18:34:42Z gunter $
 // ====================================================================
 //   MyMaterials.hh
 //

environments/g4py/examples/demos/water_phantom/module/pydemo_wp.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pydemo_wp.cc 66241 2012-12-13 18:34:42Z gunter $
 // ====================================================================
 //   pydemo_wp.cc
 //

environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: ExN01DetectorConstruction.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   ExN01DetectorConstruction.cc
 //

environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: ExN01DetectorConstruction.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   ExN01DetectorConstruction.hh
 //

environments/g4py/site-modules/geometries/ExN01geom/pyExN01geom.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyExN01geom.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyExN01geom.cc
 //

environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03DetectorConstruction.cc 101905 2016-12-07 11:34:39Z gunter $
 //
 // 
 

environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.hh

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03DetectorConstruction.hh 66892 2013-01-17 10:57:59Z gunter $
 //
 // 
 

environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03DetectorMessenger.cc 66892 2013-01-17 10:57:59Z gunter $
 //
 // 
 

environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.hh

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03DetectorMessenger.hh 66892 2013-01-17 10:57:59Z gunter $
 //
 // 
 

environments/g4py/site-modules/geometries/ExN03geom/pyExN03geom.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyExN03geom.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyExN03geom.cc
 //

environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: QDetectorConstruction.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   QDetectorConstruction.cc
 //

environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: QDetectorConstruction.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   QDetectorConstruction.hh
 //

environments/g4py/site-modules/geometries/Qgeom/pyQgeom.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyQgeom.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyQgeom.cc
 //

environments/g4py/site-modules/geometries/ezgeom/EzDetectorConstruction.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: EzDetectorConstruction.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   EzDetectorConstruction.cc
 //

environments/g4py/site-modules/geometries/ezgeom/EzDetectorConstruction.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: EzDetectorConstruction.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   EzDetectorConstruction.hh
 //

environments/g4py/site-modules/geometries/ezgeom/G4EzVolume.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4EzVolume.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   G4EzVolume.cc
 //

environments/g4py/site-modules/geometries/ezgeom/G4EzVolume.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4EzVolume.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   G4EzVolume.hh
 //

environments/g4py/site-modules/geometries/ezgeom/G4EzVoxelParameterization.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4EzVoxelParameterization.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   G4EzVoxelParameterization.cc
 //

environments/g4py/site-modules/geometries/ezgeom/G4EzVoxelParameterization.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4EzVoxelParameterization.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   G4EzVoxelParameterization.hh
 //

environments/g4py/site-modules/geometries/ezgeom/G4EzWorld.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4EzWorld.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   G4EzWorld.cc
 //

environments/g4py/site-modules/geometries/ezgeom/G4EzWorld.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4EzWorld.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   G4EzWorld.hh
 //

environments/g4py/site-modules/geometries/ezgeom/pyEzgeom.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyEzgeom.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyEZgeom.cc
 //

environments/g4py/site-modules/materials/NISTmaterials/NISTmaterials.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: NISTmaterials.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   NISTmaterials.cc
 //

environments/g4py/site-modules/materials/NISTmaterials/pyNISTmaterials.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyNISTmaterials.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyNISTmaterials.cc
 //

environments/g4py/site-modules/materials/Qmaterials/Qmaterials.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: Qmaterials.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   Qmaterials.cc
 //

environments/g4py/site-modules/materials/Qmaterials/pyQmaterials.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyQmaterials.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyQmaterials.cc
 //

environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: PhysicsListEMstd.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   PhysicsListEMstd.cc
 //

environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: PhysicsListEMstd.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   PhysicsListEMstd.hh
 //

environments/g4py/site-modules/physics_lists/EMSTDpl/pyEMSTDpl.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyEMSTDpl.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyEMSTDpl.cc
 //

environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: ExN01PhysicsList.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   ExN01PhysicsList.cc
 //

environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: ExN01PhysicsList.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   ExN01PhysicsList.hh
 //

environments/g4py/site-modules/physics_lists/ExN01pl/pyExN01pl.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyExN01pl.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyExN01pl.cc
 //

environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: MedicalBeam.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   MedicalBeam.cc
 //

environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: MedicalBeam.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   MedicalBeam.hh
 //

environments/g4py/site-modules/primaries/MedicalBeam/pyMedicalBeam.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyMedicalBeam.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyMedicalBeam.cc
 //

environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: ParticleGunAction.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   ParticleGunAction.cc
 //

environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: ParticleGunAction.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   ParticleGunAction.hh
 //

environments/g4py/site-modules/primaries/ParticleGun/pyParticleGun.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyParticleGun.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyParticleGun.cc
 //

environments/g4py/site-modules/processes/emcalculator/emcalculator.py

@@ -1,4 +1,3 @@
-#$Id: emcalculator.py 66892 2013-01-17 10:57:59Z gunter $
 """
 # ==================================================================
 #   Python module

environments/g4py/site-modules/processes/emcalculator/python3/emcalculator.py

@@ -1,4 +1,3 @@
-#$Id: emcalculator.py 66892 2013-01-17 10:57:59Z gunter $
 """
 # ==================================================================
 #   Python module (Python3)

environments/g4py/site-modules/python/__init__.py

@@ -1,4 +1,3 @@
-# $Id: __init__.py 66892 2013-01-17 10:57:59Z gunter $
 
 # Geant4Py site-modules
 

environments/g4py/source/boost/pyG4indexing.hh

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4indexing.hh 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4indexing.hh
 //

environments/g4py/source/digits_hits/pyG4VSensitiveDetector.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4VSensitiveDetector.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4VSensitiveDetector.cc
 //

environments/g4py/source/digits_hits/pymodG4digits_hits.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pymodG4digits_hits.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pymodG4digits_hits.cc [Geant4Py module]
 //

environments/g4py/source/event/pyG4ClassificationOfNewTrack.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4ClassificationOfNewTrack.cc 66892 2013-01-17 10:57:59Z gunter $
 // ====================================================================
 //   pyG4ClassificationOfNewTrack.cc
 //

environments/g4py/source/event/pyG4Event.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Event.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4Event.cc
 //