Import Geant4 8.0.0 source tree
This commit is contained in:
@@ -18,9 +18,9 @@
|
||||
# you may fetch it yourself from your nearest archive site.)
|
||||
#
|
||||
|
||||
# $Id: Configure,v 1.72 2005/06/20 17:34:18 stesting Exp $
|
||||
# $Id: Configure,v 1.76 2005/12/13 10:02:37 stesting Exp $
|
||||
#
|
||||
# Generated on Mon Jun 20 19:30:06 CEST 2005 [metaconfig 3.0 PL70]
|
||||
# Generated on Tue Dec 13 11:01:04 CET 2005 [metaconfig 3.0 PL70]
|
||||
|
||||
cat >/tmp/c1$$ <<EOF
|
||||
WARNING!!!!!
|
||||
@@ -201,6 +201,7 @@ g4vis_build_openglwin32_driver=''
|
||||
g4vis_build_openglx_driver=''
|
||||
g4vis_build_openglxm_driver=''
|
||||
g4vis_build_raytracer_driver=''
|
||||
g4vis_build_raytracerx_driver=''
|
||||
g4vis_build_vrml_driver=''
|
||||
g4vis_build_vrmlfile_driver=''
|
||||
g4vis_oglhome=''
|
||||
@@ -213,6 +214,7 @@ g4vis_use_openglwin32=''
|
||||
g4vis_use_openglx=''
|
||||
g4vis_use_openglxm=''
|
||||
g4vis_use_raytracer=''
|
||||
g4vis_use_raytracerx=''
|
||||
g4vis_use_vrml=''
|
||||
g4vis_use_vrmlfile=''
|
||||
g4wanalysis_build=''
|
||||
@@ -1898,25 +1900,66 @@ fi
|
||||
|
||||
fi #end of cxxflags
|
||||
|
||||
|
||||
|
||||
g4install_lib_AAA=`echo $g4install/lib|sed -e "s/\//AAA/g"`
|
||||
g4final_install_lib_AAA=`echo $g4final_install/lib/geant4|sed -e "s/\//AAA/g"`
|
||||
|
||||
|
||||
#############################################################################
|
||||
if [ X$g4incflags = Xyes ] ; then
|
||||
|
||||
. $src/.config/bin/$g4system/env.sh
|
||||
|
||||
INCFLAGS=`grep 'INCFLAGS_FINAL :=' $G4LIB/$G4SYSTEM/GNUmakefile.db | $sed -e 's/^\(.*\):=//'`
|
||||
### Getting G4FIRST_INSTALL
|
||||
G4FIRST_INSTALL_AAA=`grep 'G4INSTALL =' $G4LIB/$G4SYSTEM/GNUmakefile.db | $sed -e 's/^\(.*\)= //'|$sed -e 's/\//AAA/g'`
|
||||
G4INSTALL_AAA=`echo $G4INSTALL|sed -e "s/\//AAA/g"`
|
||||
###
|
||||
INCFLAGS_AAA=`grep 'INCFLAGS_FINAL :=' $G4LIB/$G4SYSTEM/GNUmakefile.db | $sed -e 's/^\(.*\):=//'|$sed -e 's/\//AAA/g'`
|
||||
|
||||
# echo INCFLAGS_AAA=$INCFLAGS_AAA
|
||||
# echo G4INSTALL_AAA=$G4INSTALL_AAA
|
||||
# echo G4FIRST_INSTALL_AAA=$G4FIRST_INSTALL_AAA
|
||||
|
||||
INCFLAGS_AAA_NEW=`echo $INCFLAGS_AAA| $sed -e "s/$G4FIRST_INSTALL_AAA/$G4INSTALL_AAA/g"`
|
||||
|
||||
# echo INCFLAGS_AAA_NEW=$INCFLAGS_AAA_NEW
|
||||
|
||||
INCFLAGS=`echo $INCFLAGS_AAA_NEW| $sed -e "s/AAA/\//g"`
|
||||
|
||||
# echo INCFLAGS=$INCFLAGS
|
||||
|
||||
if [ X$G4INCLUDE = X ] ; then
|
||||
echo $INCFLAGS
|
||||
else
|
||||
echo -I$G4INCLUDE
|
||||
fi
|
||||
|
||||
$rm -rf .config/UU
|
||||
exit 1
|
||||
|
||||
fi #end of incflags
|
||||
#############################################################################
|
||||
|
||||
|
||||
#############################################################################
|
||||
if [ X$g4ldflags = Xyes ] ; then
|
||||
|
||||
. $src/.config/bin/$g4system/env.sh
|
||||
|
||||
LDFLAGS=`grep 'LDFLAGS_FINAL :=' $G4LIB/$G4SYSTEM/GNUmakefile.db | $sed -e 's/^\(.*\):=//'`
|
||||
### Getting G4FIRST_INSTALL
|
||||
G4FIRST_LIB_AAA=`grep 'G4LIB =' $G4LIB/$G4SYSTEM/GNUmakefile.db | $sed -e 's/^\(.*\)= //'|$sed -e 's/\//AAA/g'`
|
||||
G4LIB_AAA=`echo $G4LIB|sed -e "s/\//AAA/g"`
|
||||
###
|
||||
# G4FIRST_INSTALL_LIB_AAA=${G4FIRST_INSTALL_AAA}AAAlib
|
||||
# G4INSTALL_LIB_AAA=${G4INSTALL_AAA}AAAlibAAAgeant4
|
||||
|
||||
# echo G4FIRST_INSTALL_LIB_AAA=$G4FIRST_INSTALL_LIB_AAA
|
||||
# echo G4INSTALL_LIB_AAA=$G4INSTALL_LIB_AAA
|
||||
|
||||
LDFLAGS_AAA=`grep 'LDFLAGS_FINAL :=' $G4LIB/$G4SYSTEM/GNUmakefile.db | $sed -e 's/^\(.*\):=//'|$sed -e 's/\//AAA/g'`
|
||||
LDFLAGS_AAA_NEW=`echo $LDFLAGS_AAA| $sed -e "s/$G4FIRST_LIB_AAA/$G4LIB_AAA/g"`
|
||||
LDFLAGS=`echo $LDFLAGS_AAA_NEW| $sed -e "s/AAA/\//g"`
|
||||
|
||||
# echo LDFLAGS=$LDFLAGS
|
||||
echo $LDFLAGS
|
||||
@@ -1925,6 +1968,7 @@ fi
|
||||
exit 1
|
||||
|
||||
fi #end of ldflags
|
||||
#############################################################################
|
||||
|
||||
if [ X$g4ldlibs = Xyes ] ; then
|
||||
|
||||
@@ -2656,13 +2700,13 @@ esac
|
||||
|
||||
case "$g4levelgammadata" in
|
||||
'')
|
||||
g4levelgammadata=$g4data/PhotonEvaporation
|
||||
g4levelgammadata=$g4data/PhotonEvaporation2.0
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$g4radioactivedata" in
|
||||
'')
|
||||
g4radioactivedata=$g4data/RadiativeDecay
|
||||
g4radioactivedata=$g4data/RadiativeDecay3.0
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -3964,6 +4008,18 @@ case "$g4vis_use_oix" in
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$g4vis_build_raytracerx_driver" in
|
||||
'')
|
||||
g4vis_build_raytracerx_driver=n
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$g4vis_use_raytracerx" in
|
||||
'')
|
||||
g4vis_use_raytracerx=n
|
||||
;;
|
||||
esac
|
||||
|
||||
# Set by default!
|
||||
case "$g4vis_build_raytracer_driver" in
|
||||
'')
|
||||
@@ -4172,6 +4228,8 @@ gans=$ans
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
#######################################
|
||||
g4message=`cat << EOM
|
||||
|
||||
G4VIS_BUILD_OIX_DRIVER
|
||||
@@ -4199,7 +4257,36 @@ gans=$ans
|
||||
g4vis_use_oix=y
|
||||
;;
|
||||
esac
|
||||
###############################################
|
||||
|
||||
g4message=`cat << EOM
|
||||
|
||||
G4VIS_BUILD_RAYTRACERXX_DRIVER
|
||||
G4VIS_USE_RAYTRACERX
|
||||
|
||||
Allows for interactive ray-tracing graphics through X11.
|
||||
The X11 package is required.
|
||||
|
||||
EOM`
|
||||
|
||||
dflt=$g4vis_use_raytracerx
|
||||
rp=$g4message
|
||||
. ./myread
|
||||
gans=$ans
|
||||
|
||||
case $gans in
|
||||
|
||||
n*|N*)
|
||||
g4vis_build_raytracerx_driver=n
|
||||
g4vis_use_raytracerx=n
|
||||
;;
|
||||
y*|Y*)
|
||||
g4vis_build_raytracerx_driver=y
|
||||
g4vis_use_raytracerx=y
|
||||
;;
|
||||
esac
|
||||
|
||||
########################################################
|
||||
fi # if !WIN
|
||||
|
||||
if test "X$g4system" = "XWIN32-VC" -o "X$g4system" = "XWIN32-VC7"; then
|
||||
@@ -4733,6 +4820,7 @@ g4vis_build_openglwin32_driver='$g4vis_build_openglwin32_driver'
|
||||
g4vis_build_openglx_driver='$g4vis_build_openglx_driver'
|
||||
g4vis_build_openglxm_driver='$g4vis_build_openglxm_driver'
|
||||
g4vis_build_raytracer_driver='$g4vis_build_raytracer_driver'
|
||||
g4vis_build_raytracerx_driver='$g4vis_build_raytracerx_driver'
|
||||
g4vis_build_vrml_driver='$g4vis_build_vrml_driver'
|
||||
g4vis_build_vrmlfile_driver='$g4vis_build_vrmlfile_driver'
|
||||
g4vis_oglhome='$g4vis_oglhome'
|
||||
@@ -4745,6 +4833,7 @@ g4vis_use_openglwin32='$g4vis_use_openglwin32'
|
||||
g4vis_use_openglx='$g4vis_use_openglx'
|
||||
g4vis_use_openglxm='$g4vis_use_openglxm'
|
||||
g4vis_use_raytracer='$g4vis_use_raytracer'
|
||||
g4vis_use_raytracerx='$g4vis_use_raytracerx'
|
||||
g4vis_use_vrml='$g4vis_use_vrml'
|
||||
g4vis_use_vrmlfile='$g4vis_use_vrmlfile'
|
||||
g4w_use_g3tog4='$g4w_use_g3tog4'
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
|
||||
Geant4 7.1 - patch-01 Release Notes
|
||||
-----------------------------------
|
||||
|
||||
25 October 2005
|
||||
|
||||
List of fixes included in this public patch since the public release 7.1:
|
||||
|
||||
o Configuration:
|
||||
-------------
|
||||
+ Excluded usage of unnecessary 'ranlib' at creation of the libraries
|
||||
for WIN32-VC system. Fixes an observed problem of debug-symbols
|
||||
corruption.
|
||||
+ Synchronized CXXFLAGS warning options of WIN32-g++ with Linux-g++.
|
||||
+ Fixed Configure script for --incflags and --ldflags options.
|
||||
|
||||
o Event:
|
||||
-----
|
||||
+ Corrected typo in printout in G4GeneralParticleMessenger.
|
||||
Addresses problem report #786.
|
||||
|
||||
o Geometry:
|
||||
--------
|
||||
+ navigation
|
||||
o G4DrawVoxels: removed unnecessary 'panic' message in
|
||||
ComputeVoxelPolyhedra() and some code cleanup.
|
||||
+ solids/BREPS
|
||||
o Fixed problem of double-deletion in G4BREPSolidPolyhedra and
|
||||
G4BREPSolidPCone destructors.
|
||||
+ solids/CSG
|
||||
o Fixed bug in G4Sphere::DistanceToOut(p,v): added check for
|
||||
intersection with double cone.
|
||||
o Fixed bug in G4Para::DistanceToOut(p,v) for the case v.x()<0.
|
||||
Following problem report from user posted on Hypernews (#452).
|
||||
o Improved implementation for DistanceToIn/Out() in G4Torus to make use
|
||||
of G4JTPolynomialSolver for precise calculation of the intersections.
|
||||
+ solids/specific:
|
||||
o Fixed compilation warning on WIN32-VC for G4VSurface.cc.
|
||||
|
||||
o Global:
|
||||
------
|
||||
+ G4Allocator: initialise esplicitely data in copy-ctor.
|
||||
+ G4AllocatorPool: added default dummy argument to ctor to allow for
|
||||
default-ctor
|
||||
|
||||
o Parameterisations:
|
||||
-----------------
|
||||
+ Added overflow protection in method GenerateRadius() for
|
||||
GFlashHomoShowerParamterisation in the 'gflash' module.
|
||||
|
||||
o Particles:
|
||||
---------
|
||||
+ Fix to prohibit creation of ions in 'PreInit' state to make sure
|
||||
that proper processes will be attached to the ions.
|
||||
|
||||
o Electromagnetic processes:
|
||||
-------------------------
|
||||
+ high-energy:
|
||||
o Fix a misprint in G4BetheBlochNoDeltaModel and minor cleanup.
|
||||
+ muons:
|
||||
o In all energy loss models return protection against the case
|
||||
tmin>tmax (fixes bug report).
|
||||
o Fix angular distributions of secondaries and 4-momentum balance
|
||||
in G4MuBremsstrahlungModel and G4MuPairProductionModel.
|
||||
o Added protection in G4MuPairProductionModel needed for sampling
|
||||
of pair energy in the case of low cuts.
|
||||
+ standard:
|
||||
o In all energy loss models return protection against the case
|
||||
tmin>tmax (fixes bug report).
|
||||
o Fix for initialisation of G4eBremsstrahlungModel.
|
||||
o Fix a bug in calculation of chemical correction in G4BraggIonModel
|
||||
and fix in G4BraggModel for problem observed when increasing
|
||||
precision using standard model and chemical effect.
|
||||
+ utils:
|
||||
o G4VEnergyLossProcess: return number protections against numerical
|
||||
imprecision, which were used in version 7.0 and removed in 7.1
|
||||
(fixes bug report)
|
||||
o Set default lambdaFactor to 0.8 for integral mode (improvement in
|
||||
CPU performance for low cuts).
|
||||
o G4VEmProcess: use integral mode only for charged particles.
|
||||
o G4EmModelManager: fix a cut calculation for the e+e- pair
|
||||
production physics process.
|
||||
o G4VMultipleScattering: fixed error in a protection in
|
||||
GetContinuousStepLimit().
|
||||
+ xrays:
|
||||
o Changed variable name 'MeanNumPhotons' to 'MeanNumberOfPhotons' in
|
||||
G4Scintillation and G4Cerenkov to conform with the documentation in
|
||||
the Application Developers Guide.
|
||||
o Added G4ProcessType identifier to all processes constructors.
|
||||
|
||||
o Hadronic Processes:
|
||||
------------------
|
||||
+ management:
|
||||
o Correctly set the type of a hadronic process.
|
||||
Fixes problem report #744.
|
||||
+ models/chiral_inv_phase_space/body:
|
||||
o Memory leak fix for nuclear mass management in G4QPDGCode to use
|
||||
G4 masses of nuclear fragments.
|
||||
+ models/low_energy:
|
||||
o Fix in elastic scattering for the case of target hydrogen: use
|
||||
relativistic kinematic for the generation of the final state.
|
||||
Fix tested in HARP.
|
||||
+ stopping:
|
||||
o Fixed bug in time of e- produced in bound decay of mu-.
|
||||
|
||||
o Management of processes:
|
||||
-----------------------
|
||||
+ Added forward declaration of G4UImessenger in G4ProcessTable header.
|
||||
Fixes problem report #768.
|
||||
|
||||
o Optical Processes:
|
||||
-----------------
|
||||
+ Added G4ProcessType identifier to all processes constructors.
|
||||
|
||||
o Run:
|
||||
---
|
||||
+ Removed unnecessary usage of G4Allocator for allocation of a run.
|
||||
|
||||
o Tracking:
|
||||
--------
|
||||
+ Fix in G4SteppingManager::InvokeAlongStepDoItProcs() for problem
|
||||
report #761.
|
||||
+ Fix in G4SteppingManager::DefinePhysicalStepLength() for the order
|
||||
of execution of 'ExclusivelyForced' processes like Fast-Simulation.
|
||||
Problem reported and fixed in CMS and ATLAS.
|
||||
|
||||
o Physics lists:
|
||||
-------------
|
||||
+ hadronic: corrected text for the installation in README.
|
||||
|
||||
o Examples:
|
||||
--------
|
||||
+ Updated reference outputs.
|
||||
+ extended/electromagnetic/TestEm9
|
||||
o Fixed problem for changing cuts between runs.
|
||||
+ extendedeventgenerator/exgps
|
||||
o Fixed GNUMakefile for linking with AIDA on WIN32-VC.
|
||||
Fixes problem report #767.
|
||||
+ extended/medical/GammaTherapy
|
||||
o Added vis.mac and histogram type (aida, root, hbook).
|
||||
o Use standard angular distribution for low-energy PhotoElectric.
|
||||
+ extended/persistency
|
||||
o Added missing EXTRALIBS to link list for specialised setup.
|
||||
+ extended/radioactivedecay/exrdm
|
||||
o Fixed GNUMakefile for linking with AIDA on WIN32-VC.
|
||||
Fixes problem report #767.
|
||||
+ novice/N03
|
||||
o RunAction: compute and print statistic at the end of the run.
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
|
||||
Technical Notes
|
||||
---------------
|
||||
|
||||
o This patch should be applied on top of release 7.1.
|
||||
o Technical notes distributed for release 7.1 are also applicable and
|
||||
valid for this patch.
|
||||
|
||||
The code and rebuilt binary libraries for release 7.1 are available through
|
||||
our "Source Code" Web page: http://cern.ch/geant4
|
||||
|
||||
Please refer to the Geant4 User Documentation:
|
||||
http://cern.ch/geant4/G4UsersDocuments/Overview/html
|
||||
for further information about using Geant4.
|
||||
File diff suppressed because it is too large
Load Diff
+10
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.17 2005/05/10 08:46:32 allison Exp $
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.19 2005/10/05 17:35:40 allison Exp $
|
||||
# -------------------------------------------------------------
|
||||
# Visualization-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -59,6 +59,11 @@ ifdef G4VIS_BUILD_OI_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_OI_DRIVER
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
INC_X11 = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_VRML_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_VRML_DRIVER
|
||||
endif
|
||||
@@ -97,6 +102,10 @@ ifdef G4LIB_BUILD_SHARED
|
||||
G4VIS_USE_OI = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
G4VIS_USE_RAYTRACERX = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_VRML_DRIVER
|
||||
G4VIS_USE_VRML = 1
|
||||
endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_USE.gmk,v 1.20 2003/11/13 09:54:41 gcosmo Exp $
|
||||
# $Id: G4VIS_USE.gmk,v 1.22 2005/10/05 17:35:40 allison Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for visualization USE phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -90,6 +90,13 @@ ifdef G4VIS_USE_OI
|
||||
LOAD_IV = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_RAYTRACERX
|
||||
CPPFLAGS += -DG4VIS_USE_RAYTRACERX
|
||||
# CPPFLAGS += -I... and VISLIBS += set above.
|
||||
INC_X11 = 1
|
||||
LOAD_X11 = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_VRML
|
||||
CPPFLAGS += -DG4VIS_USE_VRML
|
||||
# CPPFLAGS += -I... and VISLIBS += set above.
|
||||
|
||||
+30
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.267 2005/06/17 06:59:37 gcosmo Exp $
|
||||
$Id: History,v 1.275 2005/12/12 09:15:17 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,6 +16,35 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
12th December 2005 Gabriele Cosmo (config-V07-01-07)
|
||||
- binmake.gmk: added workaround to allow for physics-lists to link
|
||||
with DLLs on Windows.
|
||||
|
||||
7th December 2005 Gabriele Cosmo (config-V07-01-06)
|
||||
- Added G4LIB_NO_SHARED protection for cases where installation of
|
||||
shared libs are not allowed.
|
||||
|
||||
2nd December 2005 Gabriele Cosmo (config-V07-01-05)
|
||||
- Replaced -GX with -EHsc compilation option in WIN32-VC setup for
|
||||
porting on VC++8 compiler.
|
||||
|
||||
29th November 2005 Gabriele Cosmo (config-V07-01-04)
|
||||
- Added -D_CRT_SECURE_NO_DEPRECATE to WIN32-VC setup to allow for
|
||||
porting on VC++8 compiler.
|
||||
|
||||
21st November 2005 Makoto Asai (config-V07-01-03)
|
||||
- binmake.gmk: added 'digits_hits/utils' module to INCFLAGS.
|
||||
|
||||
5th October 2005 John Allison (config-V07-01-02)
|
||||
- G4VIS*.gmk: added G4VIS_BUILD_RAYTRACERX_DRIVER and G4VIS_USE_RAYTRACERX.
|
||||
|
||||
29th July 2005 Mark Donszelmann (config-V07-01-01)
|
||||
- Synchronized CXXFLAGS warning options of WIN32-g++ with Linux-g++.
|
||||
|
||||
18th July 2005 Gabriele Cosmo (config-V07-01-00)
|
||||
- Excluded usage of unnecessary 'ranlib' at creation of the libraries for
|
||||
WIN32-VC system. Fixes an observed problem of debug-symbols corruption.
|
||||
|
||||
16th June 2005 Sergey Sadilov (config-V07-00-05)
|
||||
- Updated Configure script and support files:
|
||||
o Added new data sets for low-energy-EM and elastic data.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.103 2005/05/17 08:08:13 gcosmo Exp $
|
||||
# $Id: architecture.gmk,v 1.104 2005/12/07 09:41:54 gcosmo Exp $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -72,7 +72,9 @@ G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4INCLUDE) ] && mkdir -p $(G4INCLUDE) )
|
||||
# Backwards compatibility
|
||||
#
|
||||
ifneq ($(G4MAKESHLIB),)
|
||||
G4LIB_BUILD_SHARED = 1
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
G4LIB_BUILD_SHARED = 1
|
||||
endif
|
||||
endif
|
||||
|
||||
# Defaults for library BUILD. No default for USE, ie. take what is found.
|
||||
|
||||
+12
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.107 2005/06/15 13:59:59 gunter Exp $
|
||||
# $Id: binmake.gmk,v 1.109 2005/12/12 09:08:21 gcosmo Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -133,6 +133,7 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/digits_hits/detector/include \
|
||||
-I$(G4BASE)/digits_hits/hits/include \
|
||||
-I$(G4BASE)/digits_hits/digits/include \
|
||||
-I$(G4BASE)/digits_hits/utils/include \
|
||||
-I$(G4BASE)/persistency/include \
|
||||
-I$(G4BASE)/readout/include \
|
||||
-I$(G4BASE)/event/include \
|
||||
@@ -258,18 +259,28 @@ LDLIBS4 += $(LOADLIBS)
|
||||
#
|
||||
ifdef USER_DEFINED_LDLIBS
|
||||
LDLIBS_PREFINAL := $(LDLIBS)
|
||||
LDLIBS_KERNEL := $(LDLIBS)
|
||||
else
|
||||
# Again, do not use := or +=. See note on LDLIBS2 above.
|
||||
LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
|
||||
# Version leaving out EXTRALIBS
|
||||
LDLIBS_KERNEL = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
|
||||
endif
|
||||
LDLIBS_PREFINAL += $(LDLIBS4)
|
||||
LDLIBS_KERNEL += $(LDLIBS4)
|
||||
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
|
||||
LDFLAGS = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
|
||||
WIN32TMP2 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_PREFINAL))
|
||||
WIN32TMP3 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS1))
|
||||
WIN32TMP4 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_KERNEL))
|
||||
ifdef SHAREDLIBS
|
||||
ifdef G4LIB_USE_DLL
|
||||
LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP3)) $(patsubst -l%,lib%.lib,$(WIN32TMP4))
|
||||
else
|
||||
LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
|
||||
endif
|
||||
else
|
||||
LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
|
||||
endif
|
||||
|
||||
+8
-2
@@ -1,4 +1,4 @@
|
||||
# $Id: common.gmk,v 1.39 2005/06/15 13:59:59 gunter Exp $
|
||||
# $Id: common.gmk,v 1.41 2005/12/07 09:41:54 gcosmo Exp $
|
||||
# ----------------------------------------------------------------
|
||||
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
|
||||
# ----------------------------------------------------------------
|
||||
@@ -15,9 +15,11 @@ objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
|
||||
dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
|
||||
|
||||
g4libraries_to_build :=
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
g4libraries_to_build += $(G4LIBDIR)/lib$(name).$(SHEXT)
|
||||
endif
|
||||
endif
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
|
||||
endif
|
||||
@@ -33,6 +35,7 @@ GPPFLAGS := "-M"
|
||||
|
||||
lib: $(g4libraries_to_build)
|
||||
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
# Make shared library.
|
||||
$(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last
|
||||
@@ -42,6 +45,7 @@ $(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last
|
||||
# use architecture specific macro defined in sys/$(G4SYSTEM).gmk
|
||||
$(build-granular-shared-lib)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
# Make static (archive) library.
|
||||
@@ -50,7 +54,9 @@ $(G4LIBDIR)/lib$(name).a: $(G4TMPDIR)/obj.last
|
||||
@echo Creating/replacing object files in $(G4LIBDIR)/lib$(name).a ...
|
||||
@rm -f $(G4LIBDIR)/lib$(name).a
|
||||
@$(AR) $(OUT_LIB)$(G4LIBDIR)/lib$(name).a $(G4TMPDIR)/*.o
|
||||
@if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then ranlib $(G4LIBDIR)/lib$(name).a ;fi
|
||||
@if [ X$(G4SYSTEM) != XWIN32-VC ] ; then \
|
||||
if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4LIBDIR)/lib$(name).a ; fi ; fi
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
|
||||
+8
-3
@@ -1,4 +1,4 @@
|
||||
# $Id: globlib.gmk,v 1.26 2005/06/15 13:59:59 gunter Exp $
|
||||
# $Id: globlib.gmk,v 1.28 2005/12/07 09:53:46 gcosmo Exp $
|
||||
# --------------------------------------------------------------
|
||||
# Script for compound libraries. Gabriele Cosmo, 25/6/98.
|
||||
# --------------------------------------------------------------
|
||||
@@ -20,12 +20,14 @@ makesub:
|
||||
|
||||
g4libraries_to_build:=
|
||||
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
SHARED_LIB=$(G4LIBDIR)/lib$(name).$(SHEXT)
|
||||
g4libraries_to_build += $(SHARED_LIB)
|
||||
else
|
||||
SHARED_LIB=
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
|
||||
@@ -68,14 +70,16 @@ $(G4LIBDIR)/lib$(name).a: \
|
||||
#
|
||||
#
|
||||
#
|
||||
@if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4LIBDIR)/lib$(name).a ; fi
|
||||
@if [ X$(G4SYSTEM) != XWIN32-VC ] ; then \
|
||||
if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4LIBDIR)/lib$(name).a ; fi ; fi
|
||||
endif
|
||||
|
||||
|
||||
##
|
||||
## make shared libraries
|
||||
##
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
$(SHARED_LIB): $(foreach dir,$(SUBLIBS),$(G4TMP)/$(G4SYSTEM)/$(dir)/obj.last)
|
||||
@if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ; fi
|
||||
@@ -84,6 +88,7 @@ $(SHARED_LIB): $(foreach dir,$(SUBLIBS),$(G4TMP)/$(G4SYSTEM)/$(dir)/obj.last)
|
||||
# use system specific commands to build the library
|
||||
$(build-global-shared-lib)
|
||||
endif
|
||||
endif
|
||||
|
||||
objs:
|
||||
@for dir in $(SUBDIRS); \
|
||||
|
||||
@@ -211,6 +211,12 @@ setenv G4VIS_BUILD_OIX_DRIVER 1
|
||||
echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_build_raytracerx_driver == Xy ) then
|
||||
setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
|
||||
echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_build_oiwin32_driver == Xy ) then
|
||||
setenv G4VIS_BUILD_OIWIN32_DRIVER 1
|
||||
@@ -253,6 +259,12 @@ setenv G4VIS_USE_OIX 1
|
||||
echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_use_raytracerx == Xy ) then
|
||||
setenv G4VIS_USE_RAYTRACERX 1
|
||||
echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_use_oiwin32 == Xy ) then
|
||||
setenv G4VIS_USE_OIWIN32 1
|
||||
|
||||
@@ -291,6 +291,15 @@ echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_raytracerx_driver = Xy ] ; then
|
||||
G4VIS_BUILD_RAYTRACERX_DRIVER=1
|
||||
export G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
|
||||
G4VIS_BUILD_OIWIN32_DRIVER=1
|
||||
@@ -354,6 +363,15 @@ echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_raytracerx = Xy ] ; then
|
||||
G4VIS_USE_RAYTRACERX=1
|
||||
export G4VIS_USE_RAYTRACERX
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_oiwin32 = Xy ] ; then
|
||||
G4VIS_USE_OIWIN32=1
|
||||
|
||||
@@ -240,6 +240,13 @@ export G4VIS_BUILD_OIX_DRIVER
|
||||
echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_raytracerx_driver = Xy ] ; then
|
||||
G4VIS_BUILD_RAYTRACERX_DRIVER=1
|
||||
export G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
|
||||
G4VIS_BUILD_OIWIN32_DRIVER=1
|
||||
@@ -289,6 +296,13 @@ export G4VIS_USE_OIX
|
||||
echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_raytracerx = Xy ] ; then
|
||||
G4VIS_USE_RAYTRACERX=1
|
||||
export G4VIS_USE_RAYTRACERX
|
||||
echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_oiwin32 = Xy ] ; then
|
||||
G4VIS_USE_OIWIN32=1
|
||||
|
||||
@@ -10,9 +10,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32
|
||||
CXXFLAGS += -MD -GR -EHsc -Zm200 -nologo
|
||||
CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
|
||||
CPPFLAGS += -DWIN32 -DXPNET
|
||||
CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll
|
||||
|
||||
SHEXT := dll
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe
|
||||
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken from
|
||||
// $Id: MomoEventAction.hh,v 1.1 2003/11/04 09:02:26 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#ifndef MomoEventAction_h
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken after
|
||||
// $Id: MomoRunAction.hh,v 1.1 2003/11/04 09:02:27 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#ifndef MomoRunAction_h
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken from
|
||||
// $Id: MomoEventAction.cc,v 1.1 2003/11/04 09:02:27 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken from
|
||||
// $Id: MomoRunAction.cc,v 1.1 2003/11/04 09:02:27 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
|
||||
|
||||
+48
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.99 2005/06/30 06:48:07 gcosmo Exp $
|
||||
$Id: History,v 1.105 2005/12/15 19:07:53 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,53 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
15th December 2005 Gabriele Cosmo (examples-V08-00-00)
|
||||
- Updated reference outputs according to reference tag geant4-08-00-ref-00.
|
||||
- Includes tags: air_shower-V07-01-02, brachy-V07-01-00, ccal-V07-01-01,
|
||||
cosmicray_charging-V07-01-02, gammaraytel-V07-01-00,
|
||||
hadrontherapy-V07-01-06, lAr_calorimeter-V07-01-00,
|
||||
medical_linac-V07-01-05, purtag-V07-01-00, radmon-V07-01-14,
|
||||
radioprotection-V07-01-04, Rich-V07-01-00, Tiara-V07-01-05,
|
||||
DMX-V07-01-03, XrayFluo-V07-01-03, xraytel-V07-01-03,
|
||||
AnaEx01-V07-01-01, exampleB01-V07-01-02, exampleB02-V07-01-03,
|
||||
muonprocesses-V07-01-01, photonprocesses-V07-01-01,
|
||||
testem1-V07-01-02, testem2-V07-01-01, testem3-V07-01-04,
|
||||
testem4-V07-01-00, testem5-V07-01-03, testem6-V07-01-02,
|
||||
testem7-V07-01-02, testem9-V07-01-05, testem10-V07-01-01,
|
||||
testem11-V07-01-03, testem12-V07-01-04, exHepMC-V07-01-01,
|
||||
DICOM-V07-01-00, ExDiane-V07-01-00, extended_exampleRE-V07-01-00,
|
||||
exampleN03-V07-01-04, exampleN07-V07-01-00.
|
||||
|
||||
18th November 2005 Gabriele Cosmo (examples-V07-01-05)
|
||||
- Updated reference outputs according to reference tag geant4-07-01-ref-05.
|
||||
- Includes tags: air_shower-V07-01-00, ccal-V07-01-00, Tiara-V07-01-00,
|
||||
cosmicray_charging-V07-01-00, XrayFluo-V07-01-00,
|
||||
DMX-V07-01-00, exbiasing-V07-01-00, testem1-V07-01-01,
|
||||
testem3-V07-01-03, testem5-V07-01-01, testem9-V07-01-03,
|
||||
testem11-V07-01-02, testem12-V07-01-03, exHepMC-V07-01-00,
|
||||
olapex-V07-01-00, ParN02-V07-01-00, ParN04-V07-01-00,
|
||||
exparam-V07-01-01, exrdm-V07-01-01, exampleN05-V07-01-01.
|
||||
|
||||
31st October 2005 Gabriele Cosmo (examples-V07-01-04)
|
||||
- Updated reference outputs according to reference tag geant4-07-01-ref-04.
|
||||
- Includes tags: testem1-V07-01-00, testem2-V07-01-00, testem3-V07-01-01,
|
||||
testem5-V07-01-00, testem7-V07-01-00, testem9-V07-01-01,
|
||||
testem10-V07-01-00, testem11-V07-01-01, testem12-V07-01-02,
|
||||
fieldex02-V07-01-00, fieldex03-V07-01-00, gtherapy-V07-01-01,
|
||||
exam-ext-vix-V07-01-00, exampleN03-V07-01-01.
|
||||
|
||||
30th September 2005 Gabriele Cosmo (examples-V07-01-03)
|
||||
- Updated reference outputs according to reference tag geant4-07-01-ref-03.
|
||||
- Includes tag testem9-V07-01-00.
|
||||
|
||||
2nd September 2005 Gabriele Cosmo (examples-V07-01-02)
|
||||
- Updated reference outputs according to reference tag geant4-07-01-ref-02.
|
||||
- Includes tag gtherapy-V07-01-00.
|
||||
|
||||
27th July 2005 Gabriele Cosmo (examples-V07-01-01)
|
||||
- Includes tags: testem11-V07-01-00, testem12-V07-01-01, exgps-V07-01-00,
|
||||
persistencyEx-V07-01-00, exrdm-V07-01-00, exampleN03-V07-01-00.
|
||||
|
||||
30th June 2005 Gabriele Cosmo (examples-V07-01-00)
|
||||
- Updated reference outputs according to reference tag geant4-07-01-ref-00.
|
||||
- Includes tags: air_shower-V07-00-01, brachy-V07-00-01, gammaraytel-V07-00-01,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-------------------------------------------------------------------
|
||||
$Id: History,v 1.8 2005/05/30 09:01:05 ribon Exp $
|
||||
$Id: History,v 1.9 2005/12/08 16:42:38 ribon Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -9,6 +9,9 @@ $Id: History,v 1.8 2005/05/30 09:01:05 ribon Exp $
|
||||
Category History file
|
||||
---------------------
|
||||
|
||||
08.12.2005 - A.Ribon (Rich-V07-01-00)
|
||||
Migration to CLHEP namespace.
|
||||
|
||||
30.03.2005 - A.Ribon (Rich-V07-00-01)
|
||||
Replaced <iostream.h> with <iostream> and
|
||||
cout with G4cout .
|
||||
|
||||
@@ -59,7 +59,7 @@ int main(int argc,char** argv) {
|
||||
|
||||
G4long myseed = 345354;
|
||||
|
||||
HepRandom::setTheSeed(myseed);
|
||||
CLHEP::HepRandom::setTheSeed(myseed);
|
||||
|
||||
// Run manager
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: GNUmakefile,v 1.7 2004/12/08 15:37:13 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# --------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: History,v 1.27 2005/05/03 10:05:48 allison Exp $
|
||||
# $Id: History,v 1.29 2005/12/16 08:30:21 ahoward Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -19,14 +19,21 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
3rd May 2005 John Allison (examples-V07-00-03)
|
||||
December 15th, 2005 A.Howard
|
||||
- Migration to CLHEP namespace - requires cloning of class in python
|
||||
- Migrated to non-static particles
|
||||
|
||||
November 15th, 2005 G.Cosmo - Tiara-V07-01-00
|
||||
- Migration to <sstream> from deprecated <strstream>.
|
||||
|
||||
May 3rd, 2005 J.Allison
|
||||
- Replaced vis manager with G4VisExecutive.
|
||||
|
||||
March 17th, 2005 G.Daquino - Tiara-V07-00-00
|
||||
- migration of Tiara (working with PI) from rh73 to slc3
|
||||
- Migration of Tiara (working with PI) from rh73 to slc3
|
||||
|
||||
Dec 14th, 2004 G.Daquino - Tiara-V06-02-02
|
||||
- update of GNUmakefiles to the new phys_lists structure
|
||||
- Update of GNUmakefiles to the new phys_lists structure
|
||||
|
||||
Dec 13th, 2004 G.Cosmo - Tiara-V06-02-01
|
||||
- Use new phys-lists structure.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: README,v 1.21 2005/03/17 19:48:27 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
Simulation of the TIARA experiment using importance sampling
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: envCommon.csh,v 1.13 2005/03/17 19:48:27 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
# Before sourcing this script make sure you have set the
|
||||
# environment variables according to the description in README.
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
#!/bin/bash
|
||||
echo have to set PI_DIR and PYTHON_LIB_DIR and SWIG_BASE_DIR
|
||||
if [ -n $SWIG_BASE_DIR ]; then
|
||||
echo SWIG_BASE_DIR is $SWIG_BASE_DIR
|
||||
else
|
||||
echo SWIG_BASE_DIR default is /usr/local
|
||||
export SWIG_BASE_DIR=/usr/local
|
||||
fi
|
||||
if [ -n $PYTHON_INCLUDE_DIR ]; then
|
||||
echo PYTHON_INCLUDE_DIR is $PYTHON_INCLUDE_DIR
|
||||
else
|
||||
export PYTHON_INCLUDE_DIR=/usr/include/python2.3
|
||||
echo PYTHON_INCLUDE_DIR default is $PYTHON_INCLUDE_DIR
|
||||
fi
|
||||
if [ -n $PYTHON_LIB_DIR ]; then
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PYTHON_LIB_DIR}
|
||||
else
|
||||
echo Please set PYTHON_LIB_DIR
|
||||
fi
|
||||
export PYTHONVERSION=2.3
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4WORKDIR}/tmp/${G4SYSTEM}/TiaraWrapper:${G4WORKDIR}/tmp/${G4SYSTEM}/G4KernelWrapper:${G4WORKDIR}/tmp/${G4SYSTEM}/CLHEPWrapper
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4WORKDIR}/tmp/${G4SYSTEM}/tiara
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4WORKDIR}/lib/${G4SYSTEM}
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PYTHON_LIB_DIR}
|
||||
export TIARA_BASE=`pwd`
|
||||
export TIARASCRIPTS=${TIARA_BASE}/source/py_modules
|
||||
export PYTHONPATH=${PYTHONPATH}:${LD_LIBRARY_PATH}
|
||||
export PYTHONPATH=${PYTHONPATH}:${TIARA_BASE}/run:${TIARASCRIPTS}
|
||||
export PYTHONPATH=${PYTHONPATH}:${TIARA_BASE}/source/TiaraWrapper
|
||||
export PYTHONPATH=${PYTHONPATH}:${TIARA_BASE}/source/G4KernelWrapper
|
||||
export PYTHONPATH=${PYTHONPATH}:${TIARA_BASE}/source/CLHEPWrapper
|
||||
if [ -n $SWIG_VERSION ]; then
|
||||
echo SWIG_VERSION is $SWIG_VERSION
|
||||
else
|
||||
export SWIG_VERSION=1.3.15
|
||||
echo setting SWIG_VERSION to default $SWIG_VERSION
|
||||
fi
|
||||
export SWIG_INCDIRS="-I${SWIG_BASE_DIR}/lib/swig_lib -I${SWIG_BASE_DIR}/lib/swig_lib/python"
|
||||
if [ -n $SWIG ]; then
|
||||
echo SWIG executable is $SWIG
|
||||
endif
|
||||
export SWIG=${SWIG_BASE_DIR}/bin/swig
|
||||
echo setting SWIG executable to $SWIG
|
||||
fi
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4WORKDIR}/tmp/${G4SYSTEM}/CLHEPWrapper
|
||||
export PYTHONPATH=${PYTHONPATH}:${TIARA_BASE}/source/CLHEPWrapper
|
||||
echo if python2.3 is not picked up then execute following command
|
||||
echo "'cp $PI_DIR/libpython2.3.so $G4LIB/$G4SYSTEM/.'"
|
||||
echo finished envCommon.sh
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# $Id: runSim.py,v 1.11 2005/03/17 19:48:27 daquinog Exp $
|
||||
# $Id: runSim.py,v 1.12 2005/12/15 16:23:11 ahoward Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
# importing python libraries
|
||||
@@ -155,6 +155,9 @@ tApp.specifyPhysicsList(physList, particleCut)
|
||||
tApp.setScoreDetectorCreator(scoreDetectorCreator)
|
||||
tApp.buildGeometry()
|
||||
tiara_dir = os.environ["TIARA_BASE"]
|
||||
|
||||
tApp.setPhysics()
|
||||
|
||||
primGenBuilder = tiaraGenerators.\
|
||||
TiaraDPSEnergyGenerator(tiaraSpecs,
|
||||
tiara_dir +
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# $Id: runSimNoAnalysis.py,v 1.6 2005/03/17 19:48:27 daquinog Exp $
|
||||
# $Id: runSimNoAnalysis.py,v 1.7 2005/12/15 16:23:06 ahoward Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -124,11 +124,14 @@ tApp.buildGeometry()
|
||||
|
||||
tiara_dir = os.environ["TIARA_BASE"]
|
||||
|
||||
tApp.setPhysics()
|
||||
|
||||
#primGenBuilder = tiaraGenerators.\
|
||||
# TiaraDPSEnergyGenerator(tiaraSpecs,
|
||||
# tiara_dir +
|
||||
# "/data/expDataConverted/dpsSource.xml")
|
||||
#primGenBuilder = tiaraGenerators.TiaraPrimaryGenerator(tiaraSpecs)
|
||||
|
||||
primGenBuilder = tiaraGenerators.FixedEnergyPrimaryGenerator(tiaraSpecs)
|
||||
|
||||
tApp.setPrimaryGenerator(primGenBuilder.primGen)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# $Id: runVisMode.py,v 1.5 2005/03/17 19:48:27 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: vis.mac,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: CLHEP.i,v 1.4 2004/12/08 15:37:14 daquinog Exp $
|
||||
# $Id: CLHEP.i,v 1.5 2005/12/15 14:23:31 ahoward Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
|
||||
%include CLHEP/Units/SystemOfUnits.h
|
||||
|
||||
namespace CLHEP {
|
||||
|
||||
class Hep3Vector {
|
||||
|
||||
public:
|
||||
@@ -139,8 +141,8 @@ public:
|
||||
// Rotates around the axis specified by another Hep3Vector.
|
||||
// (Uses methods of HepRotation, forcing linking in of Rotation.cc.)
|
||||
|
||||
Hep3Vector & operator *= (const HepRotation &);
|
||||
Hep3Vector & transform(const HepRotation &);
|
||||
Hep3Vector & operator *= (const CLHEP::HepRotation &);
|
||||
Hep3Vector & transform(const CLHEP::HepRotation &);
|
||||
// Transformation with a Rotation matrix.
|
||||
|
||||
|
||||
@@ -312,10 +314,10 @@ public:
|
||||
Hep3Vector & rotate (const Hep3Vector & axis, double delta);
|
||||
// Synonym for rotate (delta, axis)
|
||||
|
||||
Hep3Vector & rotate (const HepAxisAngle & ax);
|
||||
Hep3Vector & rotate (const CLHEP::HepAxisAngle & ax);
|
||||
// HepAxisAngle is a struct holding an axis direction and an angle.
|
||||
|
||||
Hep3Vector & rotate (const HepEulerAngles & e);
|
||||
Hep3Vector & rotate (const CLHEP::HepEulerAngles & e);
|
||||
Hep3Vector & rotate (double phi,
|
||||
double theta,
|
||||
double psi);
|
||||
@@ -323,7 +325,11 @@ public:
|
||||
// those of Goldstein Classical Mechanics page 107.
|
||||
|
||||
};
|
||||
|
||||
} // namespace CLHEP
|
||||
|
||||
|
||||
%inline %{
|
||||
typedef Hep3Vector G4ThreeVector;
|
||||
typedef CLHEP::Hep3Vector G4ThreeVector;
|
||||
%}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: G4String.i,v 1.1 2003/06/17 15:25:01 mdressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
// coppied from std_string.i
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: G4Kernel.i,v 1.5 2003/06/20 12:41:06 dressel Exp $
|
||||
# $Id: G4Kernel.i,v 1.7 2005/12/15 14:24:56 ahoward Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
%module G4Kernel
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "G4VIStore.hh"
|
||||
#include "G4IStore.hh"
|
||||
#include "G4UserSteppingAction.hh"
|
||||
#include <strstream>
|
||||
#include <sstream>
|
||||
#include "G4VisManager.hh"
|
||||
#include "G4VUserDetectorConstruction.hh"
|
||||
%}
|
||||
@@ -89,7 +89,7 @@
|
||||
%include G4ScoreTable.hh
|
||||
%extend G4ScoreTable {
|
||||
const char *Write(const G4MapGeometryCellCellScorer &cs){
|
||||
std::ostrstream tmpout;
|
||||
std::ostringstream tmpout;
|
||||
self->Print(cs, &tmpout);
|
||||
std::string *value = new std::string(tmpout.str());
|
||||
return value->c_str();
|
||||
@@ -202,7 +202,7 @@ class G4PVPlacement : public G4VPhysicalVolume
|
||||
{
|
||||
public:
|
||||
G4PVPlacement(G4RotationMatrix *pRot,
|
||||
const Hep3Vector &tlate,
|
||||
const CLHEP::Hep3Vector &tlate,
|
||||
G4LogicalVolume *pCurrentLogical,
|
||||
const G4String &pName,
|
||||
G4LogicalVolume *pMotherLogical = 0,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: Tiara.i,v 1.8 2004/12/08 15:37:14 daquinog Exp $
|
||||
# $Id: Tiara.i,v 1.9 2005/12/14 13:18:40 ahoward Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
%module Tiara
|
||||
@@ -29,7 +29,6 @@
|
||||
#include "TiaraVisEventAction.hh"
|
||||
#include "TiaraTimedEventAction.hh"
|
||||
#include "TiaraMeasure.hh"
|
||||
#include "TiaraVisManager.hh"
|
||||
#include "TiaraTally.hh"
|
||||
#include "TiaraRandom.hh"
|
||||
%}
|
||||
@@ -83,8 +82,6 @@
|
||||
|
||||
%include TiaraTimedEventAction.hh
|
||||
|
||||
%include TiaraVisManager.hh
|
||||
|
||||
%include TiaraRandom.hh
|
||||
|
||||
%include LHEP_BIC_HP.hh
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: dataAcess.py,v 1.3 2003/06/26 11:54:13 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import os
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: detector.py,v 1.3 2003/06/26 11:54:13 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: dpsManip.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import math
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: extractShelve.py,v 1.3 2003/07/04 13:26:31 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import string
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: myPI.py,v 1.1 2004/06/09 15:04:36 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import sys
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: myUtils.py,v 1.6 2004/12/08 15:37:14 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import CLHEP
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: parallelHall.py,v 1.4 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import G4Kernel
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: posLog.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: runSequence.py,v 1.4 2004/06/09 15:04:36 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import Tiara
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: slabGeometry.py,v 1.3 2003/06/20 12:41:07 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import math
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tallyData.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraApplication.py,v 1.5 2004/12/08 15:37:14 daquinog Exp $
|
||||
# $Id: tiaraApplication.py,v 1.6 2005/12/15 16:23:56 ahoward Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import string
|
||||
@@ -205,6 +205,11 @@ class TiaraApplet(object):
|
||||
|
||||
return
|
||||
|
||||
def setPhysics(self):
|
||||
self.tiaraSim.SetPhysicsList(self.physicsList)
|
||||
return
|
||||
|
||||
|
||||
def setPrimaryGenerator(self, primGen):
|
||||
self.primGen = primGen
|
||||
self.tiaraSim.SetPrimaryGenerator(self.primGen)
|
||||
@@ -222,7 +227,6 @@ class TiaraApplet(object):
|
||||
|
||||
def config(self):
|
||||
|
||||
self.tiaraSim.SetPhysicsList(self.physicsList)
|
||||
self.buildDetectors()
|
||||
self.tiaraSim.initialize()
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraDetectors.py,v 1.4 2004/06/09 15:04:36 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import CLHEP
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraGenerators.py,v 1.3 2004/06/09 15:04:36 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import string
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraSpecifications.py,v 1.3 2003/06/20 12:41:07 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import CLHEP
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: variableGeometry.py,v 1.2 2003/06/16 17:06:45 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-07-01 $
|
||||
# GEANT4 tag $Name: geant4-08-00 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import G4Kernel
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorer.hh,v 1.3 2003/06/18 16:40:23 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraCellScorer
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorerStore.hh,v 1.2 2003/06/18 16:40:23 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraCellScorerStore
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraConcreteShieldA.hh,v 1.3 2003/06/25 09:12:35 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraConcreteShieldB.hh,v 1.3 2003/06/25 09:12:36 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDPSSampledEnergy.hh,v 1.6 2004/06/09 15:04:37 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDimensions.hh,v 1.3 2003/06/25 09:12:38 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraEnergyCutProcess.hh,v 1.3 2003/06/25 09:12:39 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraFileAcess.hh,v 1.3 2003/06/25 09:12:40 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraFixedEnergyGenerator.hh,v 1.3 2003/06/25 09:12:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraGeometry.hh,v 1.4 2003/06/25 09:12:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIronShieldA.hh,v 1.3 2003/06/25 09:12:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIronShieldB.hh,v 1.3 2003/06/25 09:12:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIsotropicDirections.hh,v 1.3 2003/06/25 09:12:45 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraMaterials.hh,v 1.4 2003/06/25 09:12:46 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraMeasure.hh,v 1.3 2003/06/25 09:12:47 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraPart.hh,v 1.3 2003/06/25 09:12:48 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraPhysicsList.hh,v 1.1.1.1 2003/06/12 13:08:24 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraPhysicsList
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraPrimaryGeneratorAction.hh,v 1.1.1.1 2003/06/12 13:08:24 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#ifndef TiaraPrimaryGeneratorAction_hh
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraRandom.hh,v 1.3 2003/06/25 09:12:49 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraSampledEnergy.hh,v 1.4 2003/06/25 09:12:50 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraSim.hh,v 1.4 2003/06/25 09:12:51 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraTally.hh,v 1.4 2003/06/25 09:12:52 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraTimedEventAction.hh,v 1.1.1.1 2003/06/12 13:08:24 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraTimedEventAction
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraVComponent.hh,v 1.4 2003/06/25 09:12:53 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraVDirectionGenerator.hh,v 1.3 2003/06/25 09:12:54 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraVSourceEnergyGenerator.hh,v 1.3 2003/06/25 09:12:55 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraVisEventAction.hh,v 1.1.1.1 2003/06/12 13:08:25 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraVisEventAction
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraVisRunAction.hh,v 1.1.1.1 2003/06/12 13:08:25 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraVisRunAction
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorer.cc,v 1.4 2004/06/09 15:04:37 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorerStore.cc,v 1.1.1.1 2003/06/12 13:08:25 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraConcreteShieldA.cc,v 1.3 2003/06/25 09:12:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraConcreteShieldA.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraConcreteShieldB.cc,v 1.3 2003/06/25 09:12:57 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraConcreteShieldB.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDPSSampledEnergy.cc,v 1.8 2004/06/09 15:04:37 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraDPSSampledEnergy.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDimensions.cc,v 1.3 2003/06/25 09:12:59 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraDimensions.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraEnergyCutProcess.cc,v 1.5 2004/12/08 15:37:15 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraEnergyCutProcess.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraFileAcess.cc,v 1.3 2003/06/25 09:13:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraFileAcess.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraFixedEnergyGenerator.cc,v 1.3 2003/06/25 09:13:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraFixedEnergyGenerator.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraGeometry.cc,v 1.4 2004/12/08 17:25:34 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraGeometry.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIronShieldA.cc,v 1.3 2003/06/25 09:13:04 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraIronShieldA.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIronShieldB.cc,v 1.3 2003/06/25 09:13:05 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraIronShieldB.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIsotropicDirections.cc,v 1.4 2003/12/04 11:08:48 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraIsotropicDirections.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraMaterials.cc,v 1.4 2003/06/25 09:13:07 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraMaterials.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraMeasure.cc,v 1.3 2003/06/25 09:13:09 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraMeasure.hh"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraPhysicsList.cc,v 1.5 2004/12/08 15:37:15 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "globals.hh"
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: TiaraPrimaryGeneratorAction.cc,v 1.3 2003/12/09 08:48:05 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// $Id: TiaraPrimaryGeneratorAction.cc,v 1.4 2005/12/15 14:25:33 ahoward Exp $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "globals.hh"
|
||||
@@ -48,7 +48,6 @@ TiaraPrimaryGeneratorAction(const TiaraVSourceEnergyGenerator& eG,
|
||||
particleGun(new G4ParticleGun(1)),
|
||||
fTally(tally)
|
||||
{
|
||||
particleGun->SetParticleDefinition(G4Neutron::NeutronDefinition());
|
||||
particleGun->
|
||||
SetParticlePosition(G4ThreeVector(0.0, 0.0,
|
||||
tiaraDimensions.targetPosZ));
|
||||
@@ -83,6 +82,7 @@ operator=(const TiaraPrimaryGeneratorAction &rhs)
|
||||
|
||||
void TiaraPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
|
||||
{
|
||||
particleGun->SetParticleDefinition(G4Neutron::NeutronDefinition());
|
||||
particleGun->SetParticleMomentumDirection(fDirectionGenerator->
|
||||
GetDirection());
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraRandom.cc,v 1.3 2003/06/25 09:13:10 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// $Id: TiaraRandom.cc,v 1.4 2005/12/15 14:24:10 ahoward Exp $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraRandom.hh"
|
||||
@@ -29,15 +29,15 @@
|
||||
#include "Randomize.hh"
|
||||
|
||||
void setRandomSeed(long seed) {
|
||||
HepRandom::setTheSeed(seed);
|
||||
CLHEP::HepRandom::setTheSeed(seed);
|
||||
}
|
||||
|
||||
void setRandomStatus(const char *filename){
|
||||
HepRandom::restoreEngineStatus(filename);
|
||||
CLHEP::HepRandom::restoreEngineStatus(filename);
|
||||
}
|
||||
|
||||
void saveRandomStatus(const char *filename){
|
||||
HepRandom::saveEngineStatus(filename);
|
||||
CLHEP::HepRandom::saveEngineStatus(filename);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraSampledEnergy.cc,v 1.4 2003/06/25 09:13:11 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraSampledEnergy.hh"
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraSim.cc,v 1.7 2005/05/03 10:21:17 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// $Id: TiaraSim.cc,v 1.8 2005/12/15 16:24:36 ahoward Exp $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraSim.hh"
|
||||
@@ -84,6 +84,7 @@ void TiaraSim::AddTiaraEventAction(G4UserEventAction *eventAction) {
|
||||
void TiaraSim::
|
||||
SetPhysicsList(G4VUserPhysicsList *physicsList) {
|
||||
fPhysics = physicsList;
|
||||
frunMgr->SetUserInitialization(fPhysics);
|
||||
}
|
||||
|
||||
void TiaraSim::
|
||||
@@ -124,13 +125,8 @@ void TiaraSim::initialize(){
|
||||
G4cout << "TiaraSim::initialize: no primary generator set" << G4endl;
|
||||
ready = false;
|
||||
}
|
||||
if (!fPhysics) {
|
||||
G4cout << "TiaraSim::initialize: no physics list set" << G4endl;
|
||||
ready = false;
|
||||
}
|
||||
if (ready) {
|
||||
frunMgr->SetUserInitialization(fGeometry);
|
||||
frunMgr->SetUserInitialization(fPhysics);
|
||||
frunMgr->SetUserAction(fPrimary);
|
||||
if (fUserEventAction) {
|
||||
frunMgr->SetUserAction(fUserEventAction);
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraStackingAction.cc,v 1.4 2003/06/25 09:13:13 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
|
||||
#include "TiaraStackingAction.hh"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user