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

Import Geant4 10.5.0.beta source tree

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
examples/extended/electromagnetic/TestEm9/History
+16
View File
@@ -15,6 +15,22 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
16-05-18 J.Allison (testem9-V10-04-04)
- RunAction.cc: Removed vis commands.
01-05-18 J.Allison (testem9-V10-04-03)
- RunAction.cc: Removed G4VIS_USE and G4UI_USE.
08-04-18 mma (testem9-V10-04-02)
- TestEm9.cc - correct visualisation
04-04-18 V.Ivant (testem9-V10-04-01)
- TestEm9.cc - use default random engine, do not use visualisation
in the batch mode
18-03-18 mma (testem9-V10-04-00)
- testem9.cc : remove G4UI_USE and G4VIS_USE
01-11-16 I. Hrivnacova (testem9-V10-02-03)
- Coding guidelines (class member names)
examples/extended/electromagnetic/TestEm9/TestEm9.cc
+25 -41
View File
@@ -27,7 +27,7 @@
/// \brief Main program of the electromagnetic/TestEm9 example
//
//
// $Id: TestEm9.cc 66241 2012-12-13 18:34:42Z gunter $
// $Id: TestEm9.cc 109278 2018-04-09 08:51:05Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -45,23 +45,18 @@
#include "SteppingAction.hh"
#include "TrackingAction.hh"
#ifdef G4VIS_USE
#include "G4VisExecutive.hh"
#endif
#ifdef G4UI_USE
#include "G4UIExecutive.hh"
#endif
#include "G4VisExecutive.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
int main(int argc,char** argv) {
//choose the Random engine
CLHEP::HepRandom::setTheEngine(new CLHEP::Ranlux64Engine);
//CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine);
//detect interactive mode (if no arguments) and define UI session
G4UIExecutive* ui = nullptr;
if (argc == 1) { ui = new G4UIExecutive(argc,argv); }
//Construct the default run manager
//construct the default run manager
G4RunManager * runManager = new G4RunManager;
//set mandatory initialization classes
@@ -78,39 +73,28 @@ int main(int argc,char** argv) {
runManager->SetUserAction(new TrackingAction());
runManager->SetUserAction(new SteppingAction());
//initialize visualization
G4VisManager* visManager = nullptr;
//get the pointer to the User Interface manager
G4UImanager* UI = G4UImanager::GetUIpointer();
if (argc!=1) // batch mode
{
G4String command = "/control/execute ";
G4String fileName = argv[1];
UI->ApplyCommand(command+fileName);
}
else //define visualization and UI terminal for interactive mode
{
#ifdef G4VIS_USE
G4VisManager* visManager = new G4VisExecutive;
visManager->Initialize();
#endif
#ifdef G4UI_USE
G4UIExecutive * ui = new G4UIExecutive(argc,argv);
ui->SessionStart();
delete ui;
#endif
#ifdef G4VIS_USE
delete visManager;
#endif
}
G4UImanager* UImanager = G4UImanager::GetUIpointer();
//job termination
//
if (ui) {
//interactive mode
visManager = new G4VisExecutive;
visManager->Initialize();
ui->SessionStart();
delete ui;
} else {
//batch mode
G4String command = "/control/execute ";
G4String fileName = argv[1];
UImanager->ApplyCommand(command+fileName);
}
//job termination
delete visManager;
delete runManager;
return 0;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/electromagnetic/TestEm9/TestEm9.out
+63 -63
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
@@ -51,7 +51,7 @@ Vertex is 3 cm of 3 layers of Si of 100 um npads= 601
phot: for gamma, applyCuts: 1 SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 100 TeV in 61 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
PhotoElectric : Emin= 0 eV Emax= 100 TeV AngularGenSauterGavrila FluoActive
LivermorePhElectric : Emin= 0 eV Emax= 100 TeV AngularGenSauterGavrila FluoActive
compt: for gamma, applyCuts: 1 SubType= 13 BuildTable= 1
Lambda table from 100 eV to 1 MeV, 7 bins per decade, spline: 1
@@ -65,8 +65,8 @@ compt: for gamma, applyCuts: 1 SubType= 13 BuildTable= 1
conv: for gamma, applyCuts: 1 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, applyCuts: 1 SubType= 11 BuildTable= 1
Lambda table from 100 eV to 100 keV, 7 bins per decade, spline: 0
@@ -507,39 +507,39 @@ Index : 7 used in the geometry : Yes
Run terminated.
Run Summary
Number of events processed : 100
User=1.77s Real=1.79s Sys=0s
User=0.800000s Real=0.808633s Sys=0.000000s
RunAction: End of run actions are started
HistoManager: End of run actions are started RunID# 0
=================================================================
Number of events 100
Average number of e- 401.9
Average number of gamma 639
Average number of e+ 48.31
Average number of steps 2935
Edep 1x1 = 0.8319 +- 0.003156 res= 3.794 % 100
Edep 3x3 = 0.9579 +- 0.001528 res= 1.595 % 100
Edep 5x5 = 0.9793 +- 0.001252 res= 1.278 % 100
Average number of e- 405.3
Average number of gamma 638.2
Average number of e+ 48.91
Average number of steps 2967
Edep 1x1 = 0.8305 +- 0.002931 res= 3.53 % 100
Edep 3x3 = 0.957 +- 0.001342 res= 1.402 % 100
Edep 5x5 = 0.9785 +- 0.001053 res= 1.076 % 100
=========== Ratios without trancating ===========================
E1/E9 = 0.8684 +- 0.002692
E1/E25 = 0.8494 +- 0.002756
E9/E25 = 0.9781 +- 0.0009556
E1/E9 = 0.8677 +- 0.002699
E1/E25 = 0.8487 +- 0.002705
E9/E25 = 0.978 +- 0.0008316
Beam Energy 1 GeV
==================================================================
<<<<<ACCEPTANCE>>>>> 100 events for Crystal Calorimeter
Edep1x1: 0.8319 delEdep1x1= -0.1681 nrms= -1.681
Erms1x1: 0.03156 delErms1x1= -0.9684 nrms= -9.684
Edep3x3: 0.9579 delEdep3x3= -0.04213 nrms= -0.4213
Erms3x3: 0.01528 delErms3x3= -0.9847 nrms= -9.847
Edep5x5: 0.9793 delEdep5x5= -0.02072 nrms= -0.2072
Erms5x5: 0.01252 delErms5x5= -0.9875 nrms= -9.875
Edep1x1: 0.8305 delEdep1x1= -0.1695 nrms= -1.695
Erms1x1: 0.02931 delErms1x1= -0.9707 nrms= -9.707
Edep3x3: 0.957 delEdep3x3= -0.043 nrms= -0.43
Erms3x3: 0.01342 delErms3x3= -0.9866 nrms= -9.866
Edep5x5: 0.9785 delEdep5x5= -0.02152 nrms= -0.2152
Erms5x5: 0.01053 delErms5x5= -0.9895 nrms= -9.895
<<<<<END>>>>> IS ACCEPTED
Z bremsstrahlung photoeffect compton conversion
13 0 0 155 0
53 261 41 0 45
55 280 48 0 49
13 0 0 157 0
53 258 43 0 46
55 280 49 0 49
#
/testem/det/acceptance1 0.0136 0.0001 500
/testem/det/acceptance9 0.0139 0.0001 500
@@ -617,22 +617,22 @@ Index : 7 used in the geometry : Yes
Run terminated.
Run Summary
Number of events processed : 1000
User=2.47s Real=2.49s Sys=0s
User=1.230000s Real=1.241824s Sys=0.000000s
RunAction: End of run actions are started
HistoManager: End of run actions are started RunID# 1
=================================================================
Number of events 1000
Average number of e- 75.1
Average number of gamma 73.3
Average number of e+ 4.238
Average number of steps 474.2
Edep 1x1 = 0.01475 +- 0.0004408
Edep 3x3 = 0.01518 +- 0.0004927
Edep 5x5 = 0.01526 +- 0.0005008
Average number of e- 72.64
Average number of gamma 65.25
Average number of e+ 3.568
Average number of steps 437.9
Edep 1x1 = 0.01443 +- 0.0003722
Edep 3x3 = 0.01483 +- 0.0004176
Edep 5x5 = 0.0149 +- 0.0004243
=========== Ratios without trancating ===========================
E1/E9 = 0.983 +- 0.0007771
E1/E25 = 0.98 +- 0.0008873
E9/E25 = 0.9968 +- 0.0002145
E1/E9 = 0.9822 +- 0.0008048
E1/E25 = 0.9793 +- 0.0009037
E9/E25 = 0.997 +- 0.0001914
Beam Energy 20 GeV
==================================================================
@@ -675,7 +675,7 @@ Beam Energy 20 GeV
phot: for gamma, applyCuts: 1 SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 100 TeV in 61 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
PhotoElectric : Emin= 0 eV Emax= 100 TeV AngularGenSauterGavrila FluoActive
LivermorePhElectric : Emin= 0 eV Emax= 100 TeV AngularGenSauterGavrila FluoActive
compt: for gamma, applyCuts: 1 SubType= 13 BuildTable= 1
Lambda table from 100 eV to 1 MeV, 7 bins per decade, spline: 1
@@ -689,8 +689,8 @@ compt: for gamma, applyCuts: 1 SubType= 13 BuildTable= 1
conv: for gamma, applyCuts: 1 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, applyCuts: 1 SubType= 11 BuildTable= 1
Lambda table from 100 eV to 100 keV, 7 bins per decade, spline: 0
@@ -1131,22 +1131,22 @@ Index : 7 used in the geometry : Yes
Run terminated.
Run Summary
Number of events processed : 100
User=1.2s Real=1.22s Sys=0s
User=0.540000s Real=0.545498s Sys=0.000000s
RunAction: End of run actions are started
HistoManager: End of run actions are started RunID# 2
=================================================================
Number of events 100
Average number of e- 172.6
Average number of gamma 221.5
Average number of e+ 47.17
Average number of steps 1832
Edep 1x1 = 0.8369 +- 0.003966 res= 4.739 % 100
Edep 3x3 = 0.9612 +- 0.003515 res= 3.657 % 100
Edep 5x5 = 0.9811 +- 0.003431 res= 3.497 % 100
Average number of e- 171.7
Average number of gamma 220.5
Average number of e+ 46.99
Average number of steps 1836
Edep 1x1 = 0.8302 +- 0.003595 res= 4.331 % 100
Edep 3x3 = 0.959 +- 0.003154 res= 3.289 % 100
Edep 5x5 = 0.9809 +- 0.003267 res= 3.331 % 100
=========== Ratios without trancating ===========================
E1/E9 = 0.8708 +- 0.002784
E1/E25 = 0.8531 +- 0.002962
E9/E25 = 0.9797 +- 0.0008941
E1/E9 = 0.8659 +- 0.003162
E1/E25 = 0.8466 +- 0.003273
E9/E25 = 0.9777 +- 0.001111
Beam Energy 1 GeV
==================================================================
@@ -1189,7 +1189,7 @@ Beam Energy 1 GeV
phot: for gamma, applyCuts: 1 SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 100 TeV in 61 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
PhotoElectric : Emin= 0 eV Emax= 100 TeV AngularGenSauterGavrila FluoActive
LivermorePhElectric : Emin= 0 eV Emax= 100 TeV AngularGenSauterGavrila FluoActive
compt: for gamma, applyCuts: 1 SubType= 13 BuildTable= 1
Lambda table from 100 eV to 1 MeV, 7 bins per decade, spline: 1
@@ -1203,8 +1203,8 @@ compt: for gamma, applyCuts: 1 SubType= 13 BuildTable= 1
conv: for gamma, applyCuts: 1 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, applyCuts: 1 SubType= 11 BuildTable= 1
Lambda table from 100 eV to 100 keV, 7 bins per decade, spline: 0
@@ -1645,22 +1645,22 @@ Index : 7 used in the geometry : Yes
Run terminated.
Run Summary
Number of events processed : 100
User=1.71s Real=1.77s Sys=0s
User=0.800000s Real=0.805339s Sys=0.000000s
RunAction: End of run actions are started
HistoManager: End of run actions are started RunID# 3
=================================================================
Number of events 100
Average number of e- 171.9
Average number of gamma 359.1
Average number of e+ 47
Average number of e- 171
Average number of gamma 361.4
Average number of e+ 47.43
Average number of steps 1980
Edep 1x1 = 0.8298 +- 0.003736 res= 4.502 % 100
Edep 3x3 = 0.9597 +- 0.003305 res= 3.444 % 100
Edep 5x5 = 0.9807 +- 0.003426 res= 3.493 % 100
Edep 1x1 = 0.8329 +- 0.003546 res= 4.257 % 100
Edep 3x3 = 0.955 +- 0.00314 res= 3.288 % 100
Edep 5x5 = 0.9775 +- 0.003159 res= 3.232 % 100
=========== Ratios without trancating ===========================
E1/E9 = 0.8648 +- 0.002977
E1/E25 = 0.8463 +- 0.003196
E9/E25 = 0.9786 +- 0.001021
E1/E9 = 0.8724 +- 0.002937
E1/E25 = 0.8524 +- 0.003202
E9/E25 = 0.977 +- 0.001145
Beam Energy 1 GeV
==================================================================
@@ -1668,6 +1668,6 @@ Beam Energy 1 GeV
G4 kernel has come to Quit state.
================== Deleting memory pools ===================
Number of memory pools allocated: 9 of which, static: 0
Dynamic pools deleted: 9 / Total memory freed: 0.082 MB
Dynamic pools deleted: 9 / Total memory freed: 0.078 MB
============================================================
RunManagerKernel is deleted. Good bye :)
examples/extended/electromagnetic/TestEm9/src/RunAction.cc
+1 -21
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm9/src/RunAction.cc
/// \brief Implementation of the RunAction class
//
// $Id: RunAction.cc 67268 2013-02-13 11:38:40Z ihrivnac $
// $Id: RunAction.cc 110167 2018-05-16 15:55:05Z gcosmo $
//
//
// -------------------------------------------------------------
@@ -41,8 +41,6 @@
#include "RunAction.hh"
#include "HistoManager.hh"
#include "G4UImanager.hh"
#include "G4VVisManager.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -62,18 +60,6 @@ void RunAction::BeginOfRunAction(const G4Run* aRun)
G4int id = aRun->GetRunID();
G4cout << "### Run " << id << " start" << G4endl;
(HistoManager::GetPointer())->BeginOfRun();
#ifdef G4VIS_USE
G4UImanager* UI = G4UImanager::GetUIpointer();
G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
if(pVVisManager)
{
UI->ApplyCommand("/vis/scene/notifyHandlers");
}
#endif
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -83,12 +69,6 @@ void RunAction::EndOfRunAction(const G4Run* run)
G4cout << "RunAction: End of run actions are started" << G4endl;
(HistoManager::GetPointer())->EndOfRun(run->GetRunID());
#ifdef G4VIS_USE
if (G4VVisManager::GetConcreteInstance())
G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
#endif
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....