Import Geant4 10.7.0 source tree
This commit is contained in:
Gabriele Cosmo
@@ -1,6 +1,9 @@
|
||||
#----------------------------------------------------------------------------
|
||||
# Setup the project
|
||||
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.8...3.18)
|
||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||
endif()
|
||||
project(P03)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -14,38 +14,42 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
November 10th, 2020 Ben Morgan (exampleP03-V10-06-00)
|
||||
--------------------------
|
||||
- Migration to G4RunManagerFactory.
|
||||
|
||||
March 25th 2019 G.Cosmo (exampleP03-V10-05-00)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Fixed compilation warnings on unused local iterators.
|
||||
|
||||
May 19th 2018 J.Allison (exampleP03-V10-04-00)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Add #include "G4Types.hh"
|
||||
- Remove G4UI_USE and G4VIS_USE.
|
||||
- Move instantiation of G4UIExecutive to start of main.
|
||||
|
||||
19 November 2016 A. Dotti (exampleP03-V10-02-00)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Explicit set of SD to manager
|
||||
|
||||
17 September 2015 P. Arce (exampleP03-V10-01-01)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Remove ExTGPhysicsList
|
||||
|
||||
29 July 2014 P. Arce (exampleP03-V10-00-03)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Remove ExTGPhysicsList
|
||||
|
||||
25 July 2014 P. Arce (exampleP03-V10-00-02)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Using G4GenericPhysicsList
|
||||
|
||||
18 November 2013 I. Hrivnacova (exampleP03-V09-06-01)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Fixed files description (only comment lines modified)
|
||||
|
||||
8 November 2013 P. Arce (exampleP03-V09-06-00)
|
||||
--------------------------
|
||||
--------------------------
|
||||
- Porting to MT
|
||||
|
||||
17 July 2012 I. Hrivnacova (exampleP03-V09-05-02)
|
||||
@@ -104,7 +108,7 @@ May 19th 2018 J.Allison (exampleP03-V10-04-00)
|
||||
9 December 2008 - P Arce (exampleP03-V09-01-04)
|
||||
--------------------------
|
||||
- SUBS -> SUBTRACTION, INTERS -> INTERSECTION
|
||||
|
||||
|
||||
21 November 2008 - G.Cosmo (exampleP03-V09-01-03)
|
||||
--------------------------
|
||||
- Replaced VRML with OGLIX as default visualization.
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Forcing G4RunManager type...
|
||||
|
||||
############################################
|
||||
!!! WARNING - FPE detection is activated !!!
|
||||
############################################
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-10-06-ref-06 (26-June-2020)
|
||||
Geant4 version Name: geant4-10-07-ref-00 (4-December-2020)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -28,10 +29,12 @@ Registered graphics systems are:
|
||||
VRML1FILE (VRML1FILE)
|
||||
VRML2FILE (VRML2FILE)
|
||||
gMocrenFile (gMocrenFile)
|
||||
OpenGLImmediateXm (OGLIXm, OGLI)
|
||||
OpenGLStoredXm (OGLSXm, OGL, OGLS)
|
||||
OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
|
||||
OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
|
||||
OpenGLImmediateQt (OGLIQt, OGLI)
|
||||
OpenGLStoredQt (OGLSQt, OGL, OGLS)
|
||||
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
|
||||
OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
|
||||
OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
|
||||
OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
|
||||
RayTracerX (RayTracerX)
|
||||
|
||||
Registering model factories...
|
||||
@@ -139,7 +142,7 @@ Index : 0 used in the geometry : Yes
|
||||
Index : 1 used in the geometry : Yes
|
||||
Material : G4_WATER
|
||||
Range cuts : gamma 700 um e- 700 um e+ 700 um proton 700 um
|
||||
Energy thresholds : gamma 2.52852 keV e- 278.507 keV e+ 271.144 keV proton 70 keV
|
||||
Energy thresholds : gamma 2.51944 keV e- 276.265 keV e+ 270.751 keV proton 70 keV
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
@@ -162,9 +165,8 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 10
|
||||
User=0.010000s Real=0.001558s Sys=0.000000s
|
||||
User=0.000000s Real=0.001004s Sys=0.000000s
|
||||
10 events have been kept for refreshing and/or reviewing.
|
||||
|
||||
"/vis/reviewKeptEvents" to review them one by one.
|
||||
"/vis/enable", then "/vis/viewer/flush" or "/vis/viewer/rebuild" to see them accumulated.
|
||||
Graphics systems deleted.
|
||||
|
||||
Regular → Executable
@@ -39,11 +39,7 @@
|
||||
#include "ExTGPrimaryGeneratorAction.hh"
|
||||
#include "ExTGActionInitialization.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
@@ -62,12 +58,8 @@ int main(int argc,char** argv)
|
||||
|
||||
// Run manager
|
||||
//
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager* runManager = new G4MTRunManager;
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager();
|
||||
runManager->SetNumberOfThreads(1);
|
||||
#else
|
||||
G4RunManager* runManager = new G4RunManager;
|
||||
#endif
|
||||
|
||||
// User Initialization classes (mandatory)
|
||||
//
|
||||
@@ -84,17 +76,17 @@ int main(int argc,char** argv)
|
||||
//MT runManager->SetUserAction(new ExTGPrimaryGeneratorAction);
|
||||
|
||||
runManager->SetUserInitialization(new ExTGActionInitialization);
|
||||
|
||||
|
||||
// Run action that dumps GEANT4 in-memory geometry to text file
|
||||
//MT runManager->SetUserAction(new ExTGRunAction);
|
||||
|
||||
// Initialize G4 kernel
|
||||
//
|
||||
// runManager->Initialize();
|
||||
|
||||
|
||||
// Get the pointer to the User Interface manager
|
||||
//
|
||||
G4UImanager * UImanager = G4UImanager::GetUIpointer();
|
||||
G4UImanager * UImanager = G4UImanager::GetUIpointer();
|
||||
|
||||
G4VisManager* visManager = new G4VisExecutive;
|
||||
visManager->Initialize();
|
||||
@@ -106,7 +98,7 @@ int main(int argc,char** argv)
|
||||
UImanager->ApplyCommand(command+fileName);
|
||||
}
|
||||
else // interactive mode : define visualization and UI terminal
|
||||
{
|
||||
{
|
||||
UImanager->ApplyCommand("/control/execute run.mac");
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
|
||||
Reference in New Issue
Block a user