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

Import Geant4 10.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/History
+23 -1
View File
@@ -1,4 +1,4 @@
svn log $Id: History 103646 2017-04-20 09:30:24Z gcosmo $
svn log $Id: History 107491 2017-11-16 09:38:59Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -16,6 +16,28 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
16th November 2017 Gabriele Cosmo (config-V10-03-07)
- architecture.gmk: removed references to old USolids library; just use VecGeom.
16th October 2017 Gabriele Cosmo (config-V10-03-06)
- geomconf.gmk: added G4GEOM_USE_UHYPE flag to enable VecGeom wrapper for G4Hype.
10th October 2017 Gabriele Cosmo (config-V10-03-05)
- binmake.gmk: added hadronic/models/gamma_nuclear module to include paths.
11th July 2017 Gabriele Cosmo (config-V10-03-04)
- geomconf.gmk: updated flags for Scalar build of VecGeom.
11th July 2017 Gabriele Cosmo (config-V10-03-03)
- geomconf.gmk: added selector for G4GEOM_USE_UPARA flag, to enable
wrapping of G4Para for USolids/VecGeom.
Coworks with tag geom-csg-V10-03-29.
10th July 2017 Gabriele Cosmo (config-V10-03-02)
- geomconf.gmk: added selector for G4GEOM_USE_UCTUBS flag, to enable
wrapping of G4CutTubs for USolids/VecGeom.
Coworks with tag geom-csg-V10-03-28.
20th April 2017 Gabriele Cosmo (config-V10-03-01)
- binmake-gmk: added 'processses/solidstate' module include path.
config/architecture.gmk
+6 -8
View File
@@ -1,4 +1,4 @@
# $Id: architecture.gmk 96443 2016-04-14 14:19:28Z gcosmo $
# $Id: architecture.gmk 107491 2017-11-16 09:38:59Z gcosmo $
# ------------------------------------------------------------------------
# GEANT 4 - Architecture configuration script for GNU Make
#
@@ -188,15 +188,13 @@ endif
ifdef G4USOLIDS
G4LIB_USE_USOLIDS := 1
ifndef USOLIDS_BASE_DIR
$(error ERROR - Define path USOLIDS_BASE_DIR to USolids/VecGeom installation!)
$(error ERROR - Define path USOLIDS_BASE_DIR to VecGeom installation!)
else
ifndef USOLIDS_LIB
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
USOLIDS_LIB := usolids.lib
VECGEOM_LIB := vecgeom.lib
USOLIDS_LIB := vecgeom.lib
else
USOLIDS_LIB := usolids
VECGEOM_LIB := vecgeom
USOLIDS_LIB := vecgeom
endif
endif
ifndef USOLIDS_INCLUDE_DIR
@@ -281,10 +279,10 @@ endif
ifdef G4LIB_USE_USOLIDS
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
LDFLAGS += -link $(LIB_PATH)$(USOLIDS_LIB_DIR)
LOADLIBS += $(USOLIDS_LIB) $(VECGEOM_LIB)
LOADLIBS += $(USOLIDS_LIB)
else
LDFLAGS += -L$(USOLIDS_LIB_DIR)
LOADLIBS += -l$(USOLIDS_LIB) -l$(VECGEOM_LIB)
LOADLIBS += -l$(USOLIDS_LIB)
endif
endif
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
config/binmake.gmk
+2 -1
View File
@@ -1,4 +1,4 @@
# $Id: binmake.gmk 103646 2017-04-20 09:30:24Z gcosmo $
# $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.
@@ -126,6 +126,7 @@ ifndef INCFLAGS
-I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \
-I$(G4BASE)/processes/hadronic/models/em_dissociation/include \
-I$(G4BASE)/processes/hadronic/models/fission/include \
-I$(G4BASE)/processes/hadronic/models/gamma_nuclear/include \
-I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
-I$(G4BASE)/processes/hadronic/models/inclxx/interface/include \
-I$(G4BASE)/processes/hadronic/models/inclxx/utils/include \
config/geomconf.gmk
+10 -1
View File
@@ -21,9 +21,15 @@ endif
ifdef G4GEOM_USE_UCONS
CPPFLAGS += -DG4GEOM_USE_UCONS
endif
ifdef G4GEOM_USE_UCTUBS
CPPFLAGS += -DG4GEOM_USE_UCTUBS
endif
ifdef G4GEOM_USE_UEXTRUDEDSOLID
CPPFLAGS += -DG4GEOM_USE_UEXTRUDEDSOLID
endif
ifdef G4GEOM_USE_UHYPE
CPPFLAGS += -DG4GEOM_USE_UHYPE
endif
ifdef G4GEOM_USE_UGENERICPOLYCONE
CPPFLAGS += -DG4GEOM_USE_UGENERICPOLYCONE
endif
@@ -33,6 +39,9 @@ endif
ifdef G4GEOM_USE_UORB
CPPFLAGS += -DG4GEOM_USE_UORB
endif
ifdef G4GEOM_USE_UPARA
CPPFLAGS += -DG4GEOM_USE_UPARA
endif
ifdef G4GEOM_USE_UPARABOLOID
CPPFLAGS += -DG4GEOM_USE_UPARABOLOID
endif
@@ -62,5 +71,5 @@ ifdef G4GEOM_USE_UTUBS
endif
ifdef UEXTRAFLAGS
CPPFLAGS += -DVECGEOM_SCALAR -DVECGEOM_REPLACE_USOLIDS -DVECGEOM_NO_SPECIALIZATION -DVECGEOM_USOLIDS
CPPFLAGS += -DVECGEOM_SCALAR -DVECGEOM_REPLACE_USOLIDS -DVECGEOM_QUADRILATERALS_VC -DVECGEOM_NO_SPECIALIZATION -DVECGEOM_USOLIDS -DVECGEOM_INPLACE_TRANSFORMATIONS -DVECGEOM_USE_INDEXEDNAVSTATES
endif