Import Geant4 9.3.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 16:15:05 +02:00
parent b79225fb37
commit 74cad5e589
3877 changed files with 234205 additions and 167127 deletions
+18 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.37 2008/12/05 07:56:16 kmura Exp $
$Id: History,v 1.40 2009/11/27 07:59:32 kmura Exp $
-------------------------------------------------------------------
=========================================================
@@ -18,6 +18,23 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
envs-V09-02-02 27 Nov. 2009 Koichi Murakami
[g4py]
- linker option is updated.
envs-V09-02-01 20 Nov. 2009 Koichi Murakami
[g4py]
- configuration script is updated for 9.3
- physics list is updated.
[momo]
- documentation is updated.
envs-V09-02-00 15 May 2009 Koichi Murakami
[g4py]
- configuration script is updated.
* some fixes
* modify search paths for inc/lib
envs-V09-01-03 5 Dec. 2008 Koichi Murakami
[g4py]
- clean up codes
+1
View File
@@ -34,6 +34,7 @@ NeutronHPCrossSections:=/home/yoshidah/G4data/G4NDL3.7
G4LEDATA:=/home/yoshidah/G4data/G4EMLOW2.3
G4LEVELGAMMADATA:=/home/yoshidah/G4data/PhotonEvaporation
G4RADIOACTIVEDATA:=/home/yoshidah/G4data/RadiativeDecay
G4REALSURFACEDATA:=/home/yoshidah/G4data/RealSurface1.0
ifndef G4INSTALL
G4INSTALL = ../../..
+1
View File
@@ -1484,6 +1484,7 @@ G4USE_STL:=1
G4LIB_BUILD_STATIC:=1
G4LEDATA:=/home/yoshidah/G4DATA/G4EMLOW2.2
G4LEVELGAMMADATA:=/home/yoshidah/G4DATA/PhotonEvaporation
G4REALSURFACEDATA:=/home/yoshidah/G4DATA/RealSurface1.0
ifndef G4INSTALL
G4INSTALL = ../../..
+8 -8
View File
@@ -1,4 +1,4 @@
$Id: 00README,v 1.11 2008/12/03 07:47:59 kmura Exp $
$Id: 00README,v 1.12 2009/11/20 03:36:51 kmura Exp $
==========================================================================
Geant4Py
@@ -149,18 +149,18 @@ Notes:
All users' libraries should be build in SHARED libaries.
2) Development Environment:
OS: SuSE Linux 11.0 (x86-64)
g++ : 4.3.1
Python: 2.5.2
CLHEP: 1.9.3.2 / 2.0.3.2
OS: SuSE Linux 11.1 (x86-64)
g++ : 4.3.2
Python: 2.6
CLHEP: 2.0.4.4
ROOT: 5.20/00
3) Tested environment:
Linux 32/64-bit
SuSE 11.0 10.3
SL3.4 SL4.5 SL5.1
SuSE 11.2 11.1
SL4.5 SL5.4
Ubuntu 8.0.4
MacOSX 10.5 (Leopard)
MacOSX 10.5 (Leopard) 10.6 (Snow Leopard)
Have A Fun!!
+13 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.45 2008/12/04 10:30:04 kmura Exp $
$Id: History,v 1.48 2009/11/27 07:56:30 kmura Exp $
-------------------------------------------------------------------
=========================================================
@@ -13,6 +13,18 @@ Geant4Py is a Geant4-Python bridge.
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
27 November 2009 K.Murakami
- config/g4py.gmk: add -lz as linker options
19 November 2009 K.Murakami
- add checking gl2ps library in configure script.
- gl2ps is added in config/g4vis.gmk.
- update pyPhysicsList.cc for 9.3 release
14 May 2009 K. Murakami (tagged)
- fixes on configure script and config/module.gmk
- change default search paths for G4/CLHEP include and lib
3 December 2008 K.Murakami (tagged)
- modified for the 9.2 releaase.
* G4Material, G4Isotope, G4Element
+2 -1
View File
@@ -1,4 +1,4 @@
# $Id: g4py.gmk,v 1.6 2008/12/01 10:14:14 kmura Exp $
# $Id: g4py.gmk,v 1.7 2009/11/27 07:47:17 kmura Exp $
# ===========================================================
# Makefile for building Python module with Boost.Python
#
@@ -33,6 +33,7 @@ G4PY_LOPT += $(G4PY_VISLIBS)
G4PY_INCFLAGS += -I$(Q_CLHEP_INCDIR)
G4PY_LOPT += -L$(Q_CLHEP_LIBDIR) -l$(Q_CLHEP_LIB)
G4PY_LOPT += -lm -lz
# geant4 version
G4PY_INCFLAGS += -I$(G4PY_INSTALL)/source/version
+5 -1
View File
@@ -1,4 +1,4 @@
# $Id: g4vis.gmk,v 1.2 2006/04/25 05:53:05 kmura Exp $
# $Id: g4vis.gmk,v 1.3 2009/11/20 03:36:51 kmura Exp $
# ===========================================================
# Makefile for building Python module with Boost.Python
#
@@ -45,6 +45,10 @@ ifeq ($(Q_ENABLE_VRML), 1)
CPPFLAGS += -DG4VIS_USE_VRML
endif
ifeq ($(Q_ENABLE_GL2PS), 1)
G4PY_VISLIBS += -lG4gl2ps
endif
CPPFLAGS += -DG4VIS_USE
G4PY_VISLIBS += -lG4vis_management
G4PY_VISLIBS += -lG4modeling
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: module.gmk,v 1.5 2008/12/01 06:48:57 kmura Exp $
# $Id: module.gmk,v 1.6 2009/05/14 09:10:02 kmura Exp $
# ===========================================================
# Script for building a Boost-Python module
# ===========================================================
@@ -32,7 +32,7 @@ ifneq ($(Q_BOOST_LIBDIR), /usr/lib)
endif
endif
LOPT += -lboost_python
LOPT += -l$(Q_BOOST_PYTHON_LIB)
# Xerces-C ...
ifdef Q_XERCESC_INCDIR
+82 -13
View File
@@ -1,5 +1,5 @@
#! /bin/sh -
#$Id: configure,v 1.15 2008/12/03 07:48:55 kmura Exp $
#$Id: configure,v 1.17 2009/11/20 03:36:51 kmura Exp $
# ======================================================================
# A configure script for Geant4Py
# ======================================================================
@@ -43,10 +43,10 @@ Installation directories:
--libdir=DIR Python modules dir [PREFIX/lib]
Fine tuning of the library path:
--with-g4-incdir=DIR Geant4 header dir [\$G4INCLUDE]
--with-g4-libdir=DIR Geant4 library dir [\$G4LIB/\$G4SYSTEM]
--with-clhep-incdir=DIR CLHEP header dir [\$CLHEP_INCLUDE_DIR]
--with-clhep-libdir=DIR CLHEP library dir [\$CLHEP_LIB_DIR]
--with-g4-incdir=DIR Geant4 header dir [\$G4INSTALL/include]
--with-g4-libdir=DIR Geant4 library dir [\$G4INSTALL/lib/\$G4SYSTEM]
--with-clhep-incdir=DIR CLHEP header dir [\$CLHEP_BASE_DIR/include]
--with-clhep-libdir=DIR CLHEP library dir [\$CLHEP_BASE_DIR/lib]
--with-clhep-lib=LIB library name of libCLHEP.so [CLHEP|\$CLHEP_LIB]
--with-python-incdir=DIR Python header dir [/usr/include/python(2.#)],
@@ -89,12 +89,11 @@ arguments="$@"
prefix=`pwd`
current_dir=`pwd`
g4_incdir=${G4INCLUDE:-/zzz}
g4_libdir=${G4LIB:+$G4LIB/$G4SYSTEM}
g4_libdir=${g4_libdir:-/zzz}
g4_incdir=/zzz
g4_libdir=/zzz
clhep_incdir=${CLHEP_INCLUDE_DIR:-/zzz}
clhep_libdir=${CLHEP_LIB_DIR:-/zzz}
clhep_incdir=/zzz
clhep_libdir=/zzz
clhep_lib=${CLHEP_LIB:-CLHEP}
python_incdir=/zzz
@@ -106,6 +105,7 @@ enable_openglxm=${G4VIS_USE_OPENGLXM:+1}
enable_openglxm=${enable_openglxm:-0}
enable_raytracerx=${G4VIS_USE_RAYTRACERX:+1}
enable_raytracerx=${enable_raytracerx:-0}
enable_gl2ps=0
enable_physicslist=0
@@ -221,6 +221,17 @@ libdir=${libdir:-$prefix/lib}
echo $libdir
echo $ac_n "Checking for G4 include dir ... $ac_c"
g4_incdir1=${G4INSTALL:+$G4INSTALL/include}
g4_incdir2=${G4INCLUDE:+$G4INCLUDE}
set $g4_incdir $g4_incdir1 $g4_incdir2
for adir in $*
do
if [ -d "$adir" ]; then
g4_incdir=$adir
break
fi
done
if [ ! -d "$g4_incdir" ]; then
echo "no"
echo $ac_n "### $g4_incdir (g4-incdir) does not exist. $ac_c"
@@ -229,7 +240,19 @@ if [ ! -d "$g4_incdir" ]; then
fi
echo "$g4_incdir"
# ---
echo $ac_n "Checking for G4 lib dir ... $ac_c"
g4_libdir1=${G4INSTALL:+$G4INSTALL/lib/$G4SYSTEM}
g4_libdir2=${G4LIB:+$G4LIB/$G4SYSTEM}
set $g4_libdir/$G4SYSTEM $g4_libdir $g4_libdir1 $g4_libdir2
for adir in $*
do
if [ -d "$adir" ]; then
g4_libdir=$adir
break
fi
done
if [ ! -d "$g4_libdir" ]; then
echo "no"
echo $ac_n "### $g4_libdir (g4-libdir) does not exist. $ac_c"
@@ -238,7 +261,27 @@ if [ ! -d "$g4_libdir" ]; then
fi
echo "$g4_libdir"
echo $ac_n "Checking for G4 libs are shared libraray ... $ac_c"
if [ ! -f ${g4_libdir}/libG4run.${shlib} ]; then
echo "no"
echo $ac_n "### G4 libray must be global and shared. $ac_c"
echo "Recompile with global and shared mode."
exit -1
fi
echo "ok"
# ---
clhep_incdir1=${CLHEP_INCLUDE_DIR:-/zzz}
clhep_incdir2=${CLHEP_BASE_DIR:+$CLHEP_BASE_DIR/include}
set $clhep_incdir $clhep_incdir1 $clhep_incdir2
for adir in $*
do
if [ -d "$adir" ]; then
clhep_incdir=$adir
break
fi
done
echo $ac_n "Checking for CLHEP include dir ... $ac_c"
if [ ! -d "$clhep_incdir" ]; then
echo "no"
@@ -248,6 +291,18 @@ if [ ! -d "$clhep_incdir" ]; then
fi
echo "$clhep_incdir"
# ---
clhep_libdir1=${CLHEP_LIB_DIR:-/zzz}
clhep_libdir2=${CLHEP_BASE_DIR:+$CLHEP_BASE_DIR/lib}
set $clhep_libdir $clhep_libdir1 $clhep_libdir2
for adir in $*
do
if [ -d "$adir" ]; then
clhep_libdir=$adir
break
fi
done
echo $ac_n "Checking for CLHEP lib dir ... $ac_c"
if [ ! -d "$clhep_libdir" ]; then
echo "no"
@@ -269,10 +324,10 @@ echo "lib${clhep_lib}.${shlib}"
# ---
echo $ac_n "Checking for Python include dir (pyconfig.h) ... $ac_c"
# check version
set python python2.5 python2.4 python2.3 python2.2
set python python2.6 python2.5 python2.4 python2.3 python2.2
for aincdir in $*
do
if [ -d /usr/include/$aincdir ]; then
if [ -d /usr/include/"$aincdir" ]; then
python_incdir=/usr/include/$aincdir
break
fi
@@ -331,7 +386,7 @@ int main() {
return 1;
}
EOF
g++ -o conftest conftest.cc > /dev/null 2>&1
g++ -I$boost_incdir -o conftest conftest.cc > /dev/null 2>&1
./conftest
q_boost_version=$?
rm conftest.cc conftest
@@ -389,6 +444,15 @@ else
enable_openglx=0
fi
# ---
echo $ac_n "Checking for GL2PS support ...$ac_c"
if [ -f "$g4_libdir"/libG4gl2ps.${shlib} ]; then
echo "yes"
enable_gl2ps=1
else
echo "no"
fi
# ---
echo $ac_n "Checking for physics list support ...$ac_c"
if [ -f "$g4_incdir"/QGSP.hh ]; then
@@ -496,6 +560,7 @@ Q_BOOST_PYTHON_LIB := $boost_python_lib
Q_ENABLE_OPENGLX := $enable_openglx
Q_ENABLE_OPENGLXM := $enable_openglxm
Q_ENABLE_RAYTRACERX := $enable_raytracerx
Q_ENABLE_GL2PS := $enable_gl2ps
Q_ENABLE_PHYSICSLIST := $enable_physicslist
@@ -529,6 +594,10 @@ if [ $enable_raytracerx = 1 ]; then
echo $ac_n " raytracerx$ac_c"
fi
if [ $enable_gl2ps = 1 ]; then
echo $ac_n " gl2ps$ac_c"
fi
if [ $enable_physicslist = 1 ]; then
echo $ac_n " physicslist$ac_c"
fi
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: pyG4GDMLParser.cc,v 1.2 2008/12/03 06:54:39 kmura Exp $
// $Name: geant4-09-02 $
// $Id: pyG4GDMLParser.cc,v 1.3 2008/12/12 02:26:34 kmura Exp $
// $Name: geant4-09-03 $
// ====================================================================
// pyG4GDMLParser.cc
//
@@ -34,6 +34,7 @@
#include <boost/python.hpp>
#include "G4GDMLParser.hh"
#include "G4Version.hh"
using namespace boost::python;
@@ -42,10 +43,11 @@ using namespace boost::python;
// ====================================================================
namespace pyG4GDMLParser {
#if G4VERSION_NUMBER >= 920
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_Read, Read, 1, 2);
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_ReadModule, ReadModule, 1, 2);
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_Write, Write, 1, 4);
#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_GetWorldVolume,
GetWorldVolume, 0, 1);
@@ -61,11 +63,15 @@ void export_G4GDMLParser()
class_<G4GDMLParser, boost::noncopyable>
("G4GDMLParser", "GDML parser")
// ---
#if G4VERSION_NUMBNER < 920
.def("Read", &G4GDMLParser::Read)
#else
.def("Read", &G4GDMLParser::Read, f_Read())
.def("ReadModule", &G4GDMLParser::ReadModule, f_ReadModule())
.def("Write", &G4GDMLParser::Write, f_Write())
.def("ParseST", &G4GDMLParser::ParseST,
return_value_policy<reference_existing_object>())
#endif
.def("GetWorldVolume", &G4GDMLParser::GetWorldVolume,
f_GetWorldVolume()
[return_value_policy<reference_existing_object>()])
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: pyG4ElementVector.cc,v 1.1 2008/12/04 10:31:03 kmura Exp $
// $Name: geant4-09-02 $
// $Id: pyG4ElementVector.cc,v 1.2 2008/12/12 03:02:30 kmura Exp $
// $Name: geant4-09-03 $
// ====================================================================
// pyG4ElementVector.cc
//
@@ -32,7 +32,6 @@
// ====================================================================
#include <boost/python.hpp>
#include "pyG4indexing.hh"
#include "G4Element.hh"
#include "G4ElementVector.hh"
using namespace boost::python;
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: pymodG4materials.cc,v 1.7 2008/12/04 08:55:25 kmura Exp $
// $Name: geant4-09-02 $
// $Id: pymodG4materials.cc,v 1.8 2008/12/12 03:03:59 kmura Exp $
// $Name: geant4-09-03 $
// ====================================================================
// pymodG4materials.cc [Geant4Py module]
//
@@ -41,7 +41,7 @@ void export_G4Material();
void export_G4MaterialTable();
void export_G4Element();
void export_G4ElementTable();
void export_G4ElementVector();
//void export_G4ElementVector();
void export_G4Isotope();
void export_G4NistManager();
void export_G4AtomicShells();
@@ -52,7 +52,7 @@ BOOST_PYTHON_MODULE(G4materials)
export_G4MaterialTable();
export_G4Element();
export_G4ElementTable();
export_G4ElementVector();
//export_G4ElementVector();
export_G4Isotope();
export_G4NistManager();
export_G4AtomicShells();
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: pyPhysicsLists.cc,v 1.8 2008/12/04 10:26:40 kmura Exp $
// $Name: geant4-09-02 $
// $Id: pyPhysicsLists.cc,v 1.9 2009/11/20 03:36:51 kmura Exp $
// $Name: geant4-09-03 $
// ====================================================================
// pyPhysicsLists.cc
//
@@ -93,9 +93,23 @@
#include "QGSP_BERT_DIF.hh"
#endif
#if G4VERSION_NUMBER >= 930
#include "CHIPS.hh"
#include "FTFP_BERT_EMV.hh"
#include "FTFP_BERT_EMX.hh"
#include "FTFP_BERT_TRV.hh"
#include "QGSC_CHIPS.hh"
#include "QGSC_QGSC.hh"
#include "QGSP_BERT_EMX.hh"
#include "QGSP_BERT_NOLEP.hh"
#include "QGSP_BIC_EMY.hh"
#include "QGSP_FTFP_BERT.hh"
#include "QGSP_INCL_ABLA.hh"
#endif
// macro for adding physics lists
#define ADD_PHYSICS_LIST(plname) \
class_<plname, plname*, bases<G4VUserPhysicsList> > \
class_<plname, plname*, bases<G4VUserPhysicsList>, boost::noncopyable> \
(#plname, #plname " physics list") \
; \
AddPhysicsList(#plname);
@@ -184,6 +198,20 @@ void export_PhysicsLists()
ADD_PHYSICS_LIST(QGSP_BERT_DIF);
#endif
#if G4VERSION_NUMBER >= 930
ADD_PHYSICS_LIST(CHIPS);
ADD_PHYSICS_LIST(FTFP_BERT_EMV);
ADD_PHYSICS_LIST(FTFP_BERT_EMX);
ADD_PHYSICS_LIST(FTFP_BERT_TRV);
ADD_PHYSICS_LIST(QGSC_CHIPS);
ADD_PHYSICS_LIST(QGSC_QGSC);
ADD_PHYSICS_LIST(QGSP_BERT_EMX);
ADD_PHYSICS_LIST(QGSP_BERT_NOLEP);
ADD_PHYSICS_LIST(QGSP_BIC_EMY);
ADD_PHYSICS_LIST(QGSP_FTFP_BERT);
ADD_PHYSICS_LIST(QGSP_INCL_ABLA);
#endif
// sort PL vector
std::sort(plList.begin(), plList.end());
+5 -5
View File
@@ -8,9 +8,9 @@
# Hava A Fun!
# ==================================================================
"""
# $Id: __init__.py,v 1.19 2008/12/03 07:01:22 kmura Exp $
__version__ ='9.2.0'
__date__ = '1/Dec/2008'
# $Id: __init__.py,v 1.21 2009/11/20 03:36:51 kmura Exp $
__version__ ='9.3.0'
__date__ = '1/Dec/2009'
__author__ = 'K.Murakami (Koichi.Murakami@kek.jp)'
__url__ = 'http://www-geant4.kek.jp/projects/Geant4Py/'
@@ -214,8 +214,8 @@ def _list_material(self):
(j+1, elementVec[j].GetName(), elementVec[j].GetSymbol(),
elementVec[j].GetZ(),
elementVec[j].GetN(),
fractionVec[j]/HEPUnit.perCent,
abundanceVec[j]/totNAtoms/HEPUnit.perCent)
fractionVec[j]/hepunit.perCent,
abundanceVec[j]/totNAtoms/hepunit.perCent)
print " +------------------------------------------------------------------"
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: PhysicsListEMstd.cc,v 1.3 2006/06/29 15:37:08 gunter Exp $
// $Name: geant4-09-02 $
// $Id: PhysicsListEMstd.cc,v 1.4 2009/11/20 03:36:51 kmura Exp $
// $Name: geant4-09-03 $
// ====================================================================
// PhysicsListEMstd.cc
//
@@ -46,7 +46,7 @@
#include "G4ComptonScattering.hh"
#include "G4GammaConversion.hh"
#include "G4PhotoElectricEffect.hh"
#include "G4MultipleScattering.hh"
#include "G4eMultipleScattering.hh"
#include "G4eIonisation.hh"
#include "G4eBremsstrahlung.hh"
#include "G4eplusAnnihilation.hh"
@@ -96,7 +96,7 @@ void PhysicsListEMstd::ConstructProcess()
// ----------------------------------------------------------
// electron physics
// ----------------------------------------------------------
G4MultipleScattering* msc= new G4MultipleScattering;
G4eMultipleScattering* msc= new G4eMultipleScattering;
G4eIonisation* eion= new G4eIonisation;
G4eBremsstrahlung* ebrems= new G4eBremsstrahlung;
@@ -108,7 +108,7 @@ void PhysicsListEMstd::ConstructProcess()
// ----------------------------------------------------------
// positron physics
// ----------------------------------------------------------
msc= new G4MultipleScattering;
msc= new G4eMultipleScattering;
eion= new G4eIonisation;
ebrems= new G4eBremsstrahlung;
G4eplusAnnihilation* annihilation= new G4eplusAnnihilation;
@@ -2,7 +2,7 @@
# ======================================================================
# A script for Geant4 autobuild
#
# Version 2.3 Dec 2008
# Version 2.3.1 Dec 2008
#
# [usage]
# g4autobuild [<options>]
@@ -192,7 +192,7 @@ ui_set=`grep '^u' $config | awk '{print $2}'`
opt_set=`grep '^o' $config | awk '{print $2}'`
if [ $g4sys == Darwin-g++ ]; then
qfic=1
qfpic=1
fi
if [ ! -d $g4base ]; then