Import Geant4 10.5.0.beta source tree

This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
+13 -1
View File
@@ -1,4 +1,4 @@
$Id: History 104350 2017-05-26 07:20:25Z gcosmo $
$Id: History 110139 2018-05-16 07:33:34Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -14,6 +14,18 @@ track of all tags.
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
May 15, 2018 J.Allison - fieldex01-V10-04-01
- Remove G4UI_USE and G4VIS_USE.
- Move instantiation of G4UIExecutive to start of main.
- vis.mac, gui.mac: Clean up.
- F01RunAction.cc: Remove vis commands.
May 09, 2018 B.Morgan - fieldex01-V10-04-00
- Include G4Types before use of G4MULTITHREADED. For forward
compatibility with move to #defines over -D for G4 preprocessor
symbols.
May 24, 2017 J.Apostolakis - fieldex01-V10-03-00
- Fixed valgrind error in F01FieldSetup CreateStepperAndChordFinder() method.
first delete all dependent objects, then create new ones.
+12 -15
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: field01.cc 100688 2016-10-31 11:21:51Z gcosmo $
// $Id: field01.cc 110139 2018-05-16 07:33:34Z gcosmo $
//
/// \file field/field01/field01.cc
/// \brief Main program of the field/field01 example
@@ -34,6 +34,8 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "G4Types.hh"
#ifdef G4MULTITHREADED
#include "G4MTRunManager.hh"
#else
@@ -49,18 +51,19 @@
#include "G4StepLimiterPhysics.hh"
#include "Randomize.hh"
#ifdef G4VIS_USE
#include "G4VisExecutive.hh"
#endif
#ifdef G4UI_USE
#include "G4UIExecutive.hh"
#endif
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
int main(int argc,char** argv)
{
// Instantiate G4UIExecutive if there are no arguments (interactive mode)
G4UIExecutive* ui = nullptr;
if ( argc == 1 ) {
ui = new G4UIExecutive(argc, argv);
}
// Choose the Random engine
//
G4Random::setTheEngine(new CLHEP::RanecuEngine);
@@ -90,20 +93,18 @@ int main(int argc,char** argv)
//
runManager->Initialize();
#ifdef G4VIS_USE
// Initialize visualization
//
G4VisManager* visManager = new G4VisExecutive;
// G4VisExecutive can take a verbosity argument - see /vis/verbose guidance.
// G4VisManager* visManager = new G4VisExecutive("Quiet");
visManager->Initialize();
#endif
// Get the pointer to the User Interface manager
//
G4UImanager* UImanager = G4UImanager::GetUIpointer();
if (argc!=1) // batch mode
if (!ui) // batch mode
{
G4String command = "/control/execute ";
G4String fileName = argv[1];
@@ -111,13 +112,11 @@ int main(int argc,char** argv)
}
else
{ // interactive mode : define UI session
#ifdef G4UI_USE
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
if (ui->IsGUI())
UImanager->ApplyCommand("/control/execute gui.mac");
UImanager->ApplyCommand("/control/execute gui.mac");
UImanager->ApplyCommand("/control/execute vis.mac");
ui->SessionStart();
delete ui;
#endif
}
// Job termination
@@ -125,9 +124,7 @@ int main(int argc,char** argv)
// owned and deleted by the run manager, so they should not
// be deleted in the main() program !
#ifdef G4VIS_USE
delete visManager;
#endif
delete runManager;
return 0;
+13 -38
View File
@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-04-patch-02 (25-May-2018)
Geant4 version Name: geant4-10-05-beta-01 (29-June-2018)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
@@ -285,8 +285,8 @@ compt: for gamma SubType= 13 BuildTable= 1
conv: for gamma SubType= 14 BuildTable= 1
Lambda table from 1.022 MeV to 100 TeV, 18 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
BetheHeitler : Emin= 0 eV Emax= 80 GeV
BetheHeitlerLPM : Emin= 80 GeV Emax= 100 TeV
BetheHeitler : Emin= 0 eV Emax= 80 GeV AngularGenUrban
BetheHeitlerLPM : Emin= 80 GeV Emax= 100 TeV AngularGenUrban
Rayl: for gamma SubType= 11 BuildTable= 1
Lambda table from 100 eV to 100 keV, 7 bins per decade, spline: 0
@@ -653,7 +653,6 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
Model: BertiniCascade: 0 eV ---> 12 GeV
Cr_sctns: G4NeutronInelasticXS: 0 eV ---> 100 TeV
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
Cr_sctns: GheishaInelastic: 0 eV ---> 100 TeV
Process: nCapture
Model: nRadCapture: 0 eV ---> 100 TeV
@@ -896,7 +895,6 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
Model: hElasticLHEP: 0 eV ---> 1.0001 GeV
Model: hElasticGlauber: 1 GeV ---> 100 TeV
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: pi+Inelastic
Model: FTFP: 3 GeV ---> 100 TeV
@@ -913,7 +911,6 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
Model: hElasticLHEP: 0 eV ---> 1.0001 GeV
Model: hElasticGlauber: 1 GeV ---> 100 TeV
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: pi-Inelastic
Model: FTFP: 3 GeV ---> 100 TeV
@@ -937,7 +934,6 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
Model: FTFP: 3 GeV ---> 100 TeV
Model: BertiniCascade: 0 eV ---> 12 GeV
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
Cr_sctns: GheishaInelastic: 0 eV ---> 100 TeV
---------------------------------------------------
Hadronic Processes for triton
@@ -985,8 +981,6 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 0 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
*********************************************************************************************************
* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0
@@ -1000,8 +994,7 @@ Step# X Y Z Direction x dir y dir
Run terminated.
Run Summary
Number of events processed : 1
User=0s Real=0s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.010000s Real=0.002604s Sys=0.000000s
========= Table of registered couples ==============================
@@ -1015,8 +1008,6 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 1 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
*********************************************************************************************************
* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0
@@ -1030,8 +1021,7 @@ Step# X Y Z Direction x dir y dir
Run terminated.
Run Summary
Number of events processed : 1
User=0s Real=0s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.000000s Real=0.000171s Sys=0.000000s
========= Table of registered couples ==============================
@@ -1045,8 +1035,6 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 2 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
*********************************************************************************************************
* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0
@@ -1060,8 +1048,7 @@ Step# X Y Z Direction x dir y dir
Run terminated.
Run Summary
Number of events processed : 1
User=0s Real=0s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.000000s Real=0.000137s Sys=0.000000s
========= Table of registered couples ==============================
@@ -1075,8 +1062,6 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 3 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
*********************************************************************************************************
* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0
@@ -1086,12 +1071,11 @@ Step# X Y Z Direction x dir y dir
0 0 fm 0 fm 21.9895 m 0 0 -1 100 MeV 0 eV 0 fm 0 fm World initStep
1 0 fm 20.319 cm 21.9895 m 5.03276e-08 3.3909e-08 1 100 MeV0.00067661 eV 31.9171 cm 31.9171 cm World Transportation
2 50328.4 fm 20.3185 cm 21.9905 m 5.03276e-08 -0.00984295 0.999952 100 MeV2.22178e-06 eV 1.04806 mm 32.0219 cm Absorber Transportation
3 5.29388 Ang 20.2645 cm 22 m 5.03276e-08 -0.103352 0.994645 100 MeV2.0179e-05 eV 9.51883 mm 32.9738 cm OutOfWorld Transportation
3 5.29388 Ang 20.2645 cm 22 m 3.6767e-08 -0.103352 0.994645 100 MeV2.0179e-05 eV 9.51883 mm 32.9738 cm OutOfWorld Transportation
Run terminated.
Run Summary
Number of events processed : 1
User=0s Real=0s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.000000s Real=0.000249s Sys=0.000000s
========= Table of registered couples ==============================
@@ -1105,8 +1089,6 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 4 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
*********************************************************************************************************
* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0
@@ -1115,13 +1097,12 @@ WARNING: Scene "none" not found.
Step# X Y Z Direction x dir y dir z KineE dEStep StepLeng TrakLeng Volume Process
0 0 fm 0 fm 21.9895 m 0 0 -1 50 MeV 0 eV 0 fm 0 fm World initStep
1 0 fm 10.2108 cm 21.9895 m 1.27649e-07 1.94226e-07 1 50 MeV0.000318179 eV 16.0395 cm 16.0395 cm World Transportation
2 1.27658 Ang 10.2098 cm 21.9905 m 1.06828e-07 -0.0195869 0.999808 50 MeV2.02662e-06 eV 1.02162 mm 16.1417 cm Absorber Transportation
3 1.15059 nm 10.1016 cm 22 m 1.01351e-07 -0.205667 0.978622 50 MeV1.90326e-05 eV 9.59439 mm 17.1011 cm OutOfWorld Transportation
2 1.27658 Ang 10.2098 cm 21.9905 m 1.40166e-07 -0.019587 0.999808 50 MeV2.02662e-06 eV 1.02162 mm 16.1417 cm Absorber Transportation
3 1.46981 nm 10.1016 cm 22 m 1.40166e-07 -0.205667 0.978622 50 MeV1.90326e-05 eV 9.59439 mm 17.1011 cm OutOfWorld Transportation
Run terminated.
Run Summary
Number of events processed : 1
User=0s Real=0s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.000000s Real=0.000150s Sys=0.000000s
F01FieldSetup::CreateStepperAndChordFinder() called.
1. Creating Stepper.
G4ClassicalRK4 (default) is chosen
@@ -1142,8 +1123,6 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 5 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
*********************************************************************************************************
* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0
@@ -1155,8 +1134,7 @@ Step# X Y Z Direction x dir y dir
Run terminated.
Run Summary
Number of events processed : 1
User=0s Real=0s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.000000s Real=0.000084s Sys=0.000000s
========= Table of registered couples ==============================
@@ -1170,8 +1148,6 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 6 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
--> Event 0 starts.
--> Event 10 starts.
--> Event 20 starts.
@@ -1185,8 +1161,7 @@ WARNING: Scene "none" not found.
Run terminated.
Run Summary
Number of events processed : 100
User=0s Real=0.01s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.000000s Real=0.000911s Sys=0.000000s
Graphics systems deleted.
Visualization Manager deleting...
G4 kernel has come to Quit state.
-4
View File
@@ -3,10 +3,6 @@
# the menu bar of the G4UIXm, G4UIQt, G4UIWin32 sessions.
# It has no effect with G4UIterminal.
#
# Process vis.mac (and draw geometry)
#
/control/execute vis.mac
#
# File menu :
/gui/addMenu file File
/gui/addButton file Quit exit
@@ -27,7 +27,7 @@
/// \brief Implementation of the F01RunAction class
//
//
// $Id: F01RunAction.cc 92496 2015-09-02 07:22:25Z gcosmo $
// $Id: F01RunAction.cc 110139 2018-05-16 07:33:34Z gcosmo $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -69,22 +69,12 @@ void F01RunAction::BeginOfRunAction(const G4Run*)
G4Random::showEngineStatus();
G4Random::saveEngineStatus("beginOfRun.rndm");
}
G4UImanager* ui = G4UImanager::GetUIpointer();
G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
if (visManager) ui->ApplyCommand("/vis/scene/notifyHandlers");
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void F01RunAction::EndOfRunAction(const G4Run*)
{
if (G4VVisManager::GetConcreteInstance())
{
G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
}
// save Rndm status
if (fSaveRndm == 1)
-2
View File
@@ -94,5 +94,3 @@
#
# For file-based drivers, use this to create an empty detector view:
#/vis/viewer/flush
/run/beamOn 1