Import Geant4 10.7.0 source tree
This commit is contained in:
@@ -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(field06)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -14,13 +14,16 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
November 10, 2020 B. Morgan - fieldex06-V10-06-00
|
||||
- Migration to G4RunManagerFactory.
|
||||
|
||||
Nov 1, 2019 J.Apostolakis - fieldex06-V10-05-01
|
||||
- Adjusted for change in G4Transportation (need to inform of use of gravity)
|
||||
and corrected creation of G4ChordFinder.
|
||||
and corrected creation of G4ChordFinder.
|
||||
|
||||
July 27, 2018 I.Hrivnacova - fieldex06-V10-04-01
|
||||
- Macro review and code clean-up:
|
||||
- Separated other than visualization settings from vis.mac in a
|
||||
- Separated other than visualization settings from vis.mac in a
|
||||
new init_vis.mac
|
||||
- Added "beamOn 10" button in gui.mac
|
||||
- Updated README files
|
||||
@@ -39,7 +42,7 @@ July 18, 2016 I. Hrivnacova - fieldex06-V10-02-01
|
||||
by calling the new G4StepLimiterPhysics::SetApplyToAll() function
|
||||
|
||||
July 01, 2016 I. Hrivnacova - fieldex06-V10-02-00
|
||||
- Replaced F06ExtraPhysics with use of G4StepLimiterPhysics,
|
||||
- Replaced F06ExtraPhysics with use of G4StepLimiterPhysics,
|
||||
code clean-up
|
||||
|
||||
June 26, 2015 P. Gumplinger - fieldex06-V10-01-01/02/03
|
||||
@@ -85,7 +88,7 @@ May 06th, 2013 P. Gumplinger - fieldex06-V09-06-02
|
||||
|
||||
April 1st, 2013 Andrea Dotti - fieldex06-V09-06-01
|
||||
------------------------------------
|
||||
- Update to new G4VUserPhysicsList interface
|
||||
- Update to new G4VUserPhysicsList interface
|
||||
|
||||
December 2nd, 2012 John Allison - fieldex06-V09-06-00
|
||||
------------------------------------
|
||||
|
||||
@@ -45,11 +45,7 @@
|
||||
#include "F06DetectorConstruction.hh"
|
||||
#include "F06ActionInitialization.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4UIcommand.hh"
|
||||
@@ -83,20 +79,16 @@ int main(int argc,char** argv)
|
||||
|
||||
G4String macro;
|
||||
G4String session;
|
||||
#ifdef G4MULTITHREADED
|
||||
G4int nThreads = 0;
|
||||
#endif
|
||||
|
||||
G4long randomSeed = 1234;
|
||||
for ( G4int i=1; i<argc; i=i+2 ) {
|
||||
if ( G4String(argv[i]) == "-m" ) macro = argv[i+1];
|
||||
else if ( G4String(argv[i]) == "-u" ) session = argv[i+1];
|
||||
else if ( G4String(argv[i]) == "-r" ) randomSeed = atoi(argv[i+1]);
|
||||
#ifdef G4MULTITHREADED
|
||||
else if ( G4String(argv[i]) == "-t" ) {
|
||||
nThreads = G4UIcommand::ConvertToInt(argv[i+1]);
|
||||
}
|
||||
#endif
|
||||
else {
|
||||
PrintUsage();
|
||||
return 1;
|
||||
@@ -115,12 +107,8 @@ int main(int argc,char** argv)
|
||||
|
||||
// Construct the default run manager
|
||||
//
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager * runManager = new G4MTRunManager;
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager();
|
||||
if ( nThreads > 0 ) runManager->SetNumberOfThreads(nThreads);
|
||||
#else
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
#endif
|
||||
|
||||
// Seed the random number generator manually
|
||||
G4Random::setTheSeed(randomSeed);
|
||||
@@ -148,11 +136,11 @@ int main(int argc,char** argv)
|
||||
// Get the pointer to the User Interface manager
|
||||
//
|
||||
G4UImanager* UImanager = G4UImanager::GetUIpointer();
|
||||
|
||||
|
||||
if ( !ui ) {
|
||||
// batch mode
|
||||
G4String command = "/control/execute ";
|
||||
UImanager->ApplyCommand(command+macro);
|
||||
UImanager->ApplyCommand(command+macro);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -167,7 +155,7 @@ int main(int argc,char** argv)
|
||||
// Free the store: user actions, physics_list and detector_description are
|
||||
// owned and deleted by the run manager, so they should not
|
||||
// be deleted in the main() program !
|
||||
|
||||
|
||||
delete visManager;
|
||||
delete runManager;
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -15,7 +16,7 @@
|
||||
|
||||
***** Table : Nb of materials = 1 *****
|
||||
|
||||
Material: G4_Galactic density: 0.000 kg/m3 RadL: 204310101.835 pc Nucl.Int.Length: 113427275.267 pc
|
||||
Material: G4_Galactic density: 0.000 mg/cm3 RadL: 204310098.490 pc Nucl.Int.Length: 113427284.261 pc
|
||||
Imean: 21.800 eV temperature: 2.73 K pressure: 0.00 atm
|
||||
|
||||
---> Element: H (H) Z = 1.0 N = 1 A = 1.008 g/mole
|
||||
@@ -51,10 +52,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...
|
||||
@@ -2311,7 +2314,10 @@ Terminate current event processing.
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 1
|
||||
User=0.020000s Real=0.025219s Sys=0.000000s
|
||||
User=0.010000s Real=0.018566s Sys=0.000000s
|
||||
0 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.
|
||||
Visualization Manager deleting...
|
||||
G4 kernel has come to Quit state.
|
||||
|
||||
Reference in New Issue
Block a user