Import Geant4 11.1.0.beta source tree
This commit is contained in:
Gabriele Cosmo
@@ -1,9 +1,3 @@
|
||||
# - G4RayTracer category build
|
||||
|
||||
# Add allocation export symbol for the RayTracer module
|
||||
# NB: we don't add this at the category level because RayTracer is
|
||||
# the only vis driver that uses exports at the moment. We can move the
|
||||
# add_definitions higher later if needed.
|
||||
add_definitions(-DG4VIS_ALLOC_EXPORT)
|
||||
|
||||
geant4_global_library_target(COMPONENTS sources.cmake)
|
||||
include(sources.cmake)
|
||||
geant4_add_category(G4RayTracer MODULES G4RayTracer)
|
||||
|
||||
@@ -6,7 +6,7 @@ ifndef G4INSTALL
|
||||
endif
|
||||
|
||||
GLOBLIBS = libG4vis_management.lib libG4modeling.lib
|
||||
GLOBLIBS += libG4tasking.lib libG4run.lib libG4event.lib
|
||||
GLOBLIBS += libG4run.lib libG4event.lib
|
||||
GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
|
||||
GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
|
||||
GLOBLIBS += libG4materials.lib libG4graphics_reps.lib
|
||||
@@ -24,7 +24,7 @@ QTFLAGS =
|
||||
QTLIBS =
|
||||
GLQTLIBS =
|
||||
|
||||
CPPFLAGS += -DG4VIS_ALLOC_EXPORT
|
||||
CPPFLAGS += -DG4RAYTRACER_ALLOC_EXPORT
|
||||
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/management/include
|
||||
@@ -34,6 +34,8 @@ CPPFLAGS += -I$(G4BASE)/global/HEPGeometry/include
|
||||
CPPFLAGS += -I$(G4BASE)/global/HEPRandom/include
|
||||
CPPFLAGS += -I$(G4BASE)/geometry/management/include
|
||||
CPPFLAGS += -I$(G4BASE)/geometry/navigation/include
|
||||
CPPFLAGS += -I$(G4BASE)/geometry/solids/CSG/include
|
||||
CPPFLAGS += -I$(G4BASE)/geometry/solids/specific/include
|
||||
CPPFLAGS += -I$(G4BASE)/geometry/volumes/include
|
||||
CPPFLAGS += -I$(G4BASE)/geometry/magneticfield/include
|
||||
CPPFLAGS += -I$(G4BASE)/digits_hits/detector/include
|
||||
|
||||
@@ -1,27 +1,32 @@
|
||||
-------------------------------------------------------------------
|
||||
# Category raytracer History
|
||||
|
||||
=========================================================
|
||||
Geant4 - an Object-Oriented Toolkit for Simulation in HEP
|
||||
=========================================================
|
||||
See `CONTRIBUTING.rst` for details of **required** info/format for each entry,
|
||||
which **must** added in reverse chronological order (newest at the top).
|
||||
It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
Category History file
|
||||
---------------------
|
||||
This file should be used by G4 developers and category coordinators
|
||||
to briefly summarize all major modifications introduced in the code
|
||||
and keep track of all category-tags.
|
||||
It DOES NOT substitute the CVS log-message one should put at every
|
||||
committal in the CVS repository !
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
*************************************************************
|
||||
* Note that modeling and test have their own History files. *
|
||||
*************************************************************
|
||||
## 2022-04-07 Gabriele Cosmo (raytracer-V11-00-03)
|
||||
- Fixed GNUmakefile and source.cmake to add required granular dependencies on
|
||||
"geometry/solids/CSG" and "geometry/solids/specific" modules, introduced
|
||||
in recent development.
|
||||
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
## 2022-03-22 Ben Morgan (raytracer-V11-00-02)
|
||||
- Use geant4_module_sources to add optional sources
|
||||
|
||||
History file for Ray Tracer category
|
||||
---------------------------------------
|
||||
## 2022-01-28 Ben Morgan (raytracer-V11-00-01)
|
||||
- Replace `geant4_global_library_target` with direct file inclusion and
|
||||
call to `geant4_add_category` to define library build from source modules.
|
||||
- Rename DLL export symbol for locality to this module
|
||||
- Make DLL export symbol a CMake module-level compile definition to aid
|
||||
future modularization
|
||||
|
||||
## 2021-12-10 Ben Morgan (raytracer-V11-00-00)
|
||||
- Change to new Markdown History format
|
||||
|
||||
---
|
||||
|
||||
# History entries prior to 11.0
|
||||
|
||||
18 November 2021 John Allison (raytracer-V10-07-06)
|
||||
- G4RayTracer.cc: Coverity fix: un-initialised data member.
|
||||
|
||||
@@ -94,7 +94,7 @@ class G4RayTrajectory : public G4VTrajectory
|
||||
std::vector<G4RayTrajectoryPoint*>* positionRecord;
|
||||
};
|
||||
|
||||
#if defined G4VIS_ALLOC_EXPORT
|
||||
#if defined G4RAYTRACER_ALLOC_EXPORT
|
||||
extern G4DLLEXPORT G4Allocator<G4RayTrajectory>*& rayTrajectoryAllocator();
|
||||
#else
|
||||
extern G4DLLIMPORT G4Allocator<G4RayTrajectory>*& rayTrajectoryAllocator();
|
||||
|
||||
@@ -78,7 +78,7 @@ class G4RayTrajectoryPoint :public G4VTrajectoryPoint
|
||||
// Dummy function (not used) to satisfy base class pure virtual function.
|
||||
};
|
||||
|
||||
#if defined G4VIS_ALLOC_EXPORT
|
||||
#if defined G4RAYTRACER_ALLOC_EXPORT
|
||||
extern G4DLLEXPORT G4Allocator<G4RayTrajectoryPoint>*& rayTrajectoryPointAllocator();
|
||||
#else
|
||||
extern G4DLLIMPORT G4Allocator<G4RayTrajectoryPoint>*& rayTrajectoryPointAllocator();
|
||||
|
||||
@@ -1,75 +1,53 @@
|
||||
# - G4RayTracer module build definition
|
||||
|
||||
# Module has optional sources
|
||||
# List those always built
|
||||
set(G4VIS_RAYTRACER_MODULE_HEADERS
|
||||
G4RTJpeg.hh
|
||||
G4RTJpegCoder.hh
|
||||
G4RTJpegCoderTables.hh
|
||||
G4RTJpegMaker.hh
|
||||
G4RTMessenger.hh
|
||||
G4RTOutBitStream.hh
|
||||
G4RTPrimaryGeneratorAction.hh
|
||||
G4RTRun.hh
|
||||
G4RTRunAction.hh
|
||||
G4RTSimpleScanner.hh
|
||||
G4RTSteppingAction.hh
|
||||
G4RTTrackingAction.hh
|
||||
G4RTWorkerInitialization.hh
|
||||
G4RayTracer.hh
|
||||
G4RayTracerFeatures.hh
|
||||
G4RayTracerSceneHandler.hh
|
||||
G4RayTracerViewer.hh
|
||||
G4RayTrajectory.hh
|
||||
G4RayTrajectoryPoint.hh
|
||||
G4TheMTRayTracer.hh
|
||||
G4TheRayTracer.hh
|
||||
G4VFigureFileMaker.hh
|
||||
G4VRTScanner.hh)
|
||||
|
||||
set(G4VIS_RAYTRACER_MODULE_SOURCES
|
||||
G4RTJpegCoder.cc
|
||||
G4RTJpegMaker.cc
|
||||
G4RTMessenger.cc
|
||||
G4RTOutBitStream.cc
|
||||
G4RTPrimaryGeneratorAction.cc
|
||||
G4RTRun.cc
|
||||
G4RTRunAction.cc
|
||||
G4RTSimpleScanner.cc
|
||||
G4RTSteppingAction.cc
|
||||
G4RTTrackingAction.cc
|
||||
G4RTWorkerInitialization.cc
|
||||
G4RayTracer.cc
|
||||
G4RayTracerSceneHandler.cc
|
||||
G4RayTracerViewer.cc
|
||||
G4RayTrajectory.cc
|
||||
G4RayTrajectoryPoint.cc
|
||||
G4TheMTRayTracer.cc
|
||||
G4TheRayTracer.cc
|
||||
G4VRTScanner.cc)
|
||||
|
||||
set(G4VIS_RAYTRACER_MODULE_LINK_LIBRARIES )
|
||||
|
||||
# X11 RayTracer only if selected
|
||||
if(GEANT4_USE_RAYTRACER_X11)
|
||||
list(APPEND G4VIS_RAYTRACER_MODULE_HEADERS
|
||||
G4RayTracerX.hh
|
||||
G4RayTracerXViewer.hh
|
||||
G4RTXScanner.hh)
|
||||
|
||||
list(APPEND G4VIS_RAYTRACER_MODULE_SOURCES
|
||||
G4RayTracerX.cc
|
||||
G4RayTracerXViewer.cc
|
||||
G4RTXScanner.cc)
|
||||
|
||||
# The X11 Libraries
|
||||
list(APPEND G4VIS_RAYTRACER_MODULE_LINK_LIBRARIES X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu)
|
||||
endif()
|
||||
|
||||
# Define the Geant4 Module.
|
||||
geant4_add_module(G4RayTracer
|
||||
PUBLIC_HEADERS ${G4VIS_RAYTRACER_MODULE_HEADERS}
|
||||
SOURCES ${G4VIS_RAYTRACER_MODULE_SOURCES})
|
||||
PUBLIC_HEADERS
|
||||
G4RTJpeg.hh
|
||||
G4RTJpegCoder.hh
|
||||
G4RTJpegCoderTables.hh
|
||||
G4RTJpegMaker.hh
|
||||
G4RTMessenger.hh
|
||||
G4RTOutBitStream.hh
|
||||
G4RTPrimaryGeneratorAction.hh
|
||||
G4RTRun.hh
|
||||
G4RTRunAction.hh
|
||||
G4RTSimpleScanner.hh
|
||||
G4RTSteppingAction.hh
|
||||
G4RTTrackingAction.hh
|
||||
G4RTWorkerInitialization.hh
|
||||
G4RayTracer.hh
|
||||
G4RayTracerFeatures.hh
|
||||
G4RayTracerSceneHandler.hh
|
||||
G4RayTracerViewer.hh
|
||||
G4RayTrajectory.hh
|
||||
G4RayTrajectoryPoint.hh
|
||||
G4TheMTRayTracer.hh
|
||||
G4TheRayTracer.hh
|
||||
G4VFigureFileMaker.hh
|
||||
G4VRTScanner.hh
|
||||
SOURCES
|
||||
G4RTJpegCoder.cc
|
||||
G4RTJpegMaker.cc
|
||||
G4RTMessenger.cc
|
||||
G4RTOutBitStream.cc
|
||||
G4RTPrimaryGeneratorAction.cc
|
||||
G4RTRun.cc
|
||||
G4RTRunAction.cc
|
||||
G4RTSimpleScanner.cc
|
||||
G4RTSteppingAction.cc
|
||||
G4RTTrackingAction.cc
|
||||
G4RTWorkerInitialization.cc
|
||||
G4RayTracer.cc
|
||||
G4RayTracerSceneHandler.cc
|
||||
G4RayTracerViewer.cc
|
||||
G4RayTrajectory.cc
|
||||
G4RayTrajectoryPoint.cc
|
||||
G4TheMTRayTracer.cc
|
||||
G4TheRayTracer.cc
|
||||
G4VRTScanner.cc)
|
||||
|
||||
geant4_module_compile_definitions(G4RayTracer PRIVATE G4RAYTRACER_ALLOC_EXPORT)
|
||||
|
||||
geant4_module_link_libraries(G4RayTracer
|
||||
PUBLIC
|
||||
@@ -83,7 +61,6 @@ geant4_module_link_libraries(G4RayTracer
|
||||
G4tracking
|
||||
G4vis_management
|
||||
G4hepgeometry
|
||||
${G4VIS_RAYTRACER_MODULE_LINK_LIBRARIES}
|
||||
PRIVATE
|
||||
G4event
|
||||
G4bosons
|
||||
@@ -91,6 +68,22 @@ geant4_module_link_libraries(G4RayTracer
|
||||
G4partman
|
||||
G4procman
|
||||
G4cuts
|
||||
G4tasking
|
||||
G4detector
|
||||
G4csg
|
||||
G4specsolids
|
||||
G4navigation)
|
||||
|
||||
# X11 RayTracer only if selected
|
||||
if(GEANT4_USE_RAYTRACER_X11)
|
||||
geant4_module_sources(G4RayTracer
|
||||
PUBLIC_HEADERS
|
||||
G4RayTracerX.hh
|
||||
G4RayTracerXViewer.hh
|
||||
G4RTXScanner.hh
|
||||
SOURCES
|
||||
G4RayTracerX.cc
|
||||
G4RayTracerXViewer.cc
|
||||
G4RTXScanner.cc)
|
||||
|
||||
geant4_module_link_libraries(G4RayTracer PUBLIC X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user