Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 107321 2017-11-08 16:31:08Z gcosmo $
|
||||
$Id: History 109314 2018-04-11 06:42:23Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -15,6 +15,13 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
10-04-18 mma (testem17-V10-04-01)
|
||||
- testem17.cc : set visualisation only in interactive mode
|
||||
|
||||
21-03-18 mma (testem17-V10-04-00)
|
||||
- testem17.cc : remove G4UI_USE and G4VIS_USE
|
||||
|
||||
07-11-17 D.Sawkey (testem17-V10-03-00)
|
||||
- PhysicsList: fix setting emstandard; add emstandard_opt4
|
||||
|
||||
|
||||
@@ -27,10 +27,10 @@
|
||||
/// \brief Main program of the electromagnetic/TestEm17 example
|
||||
//
|
||||
//
|
||||
// $Id: TestEm17.cc 99017 2016-08-31 08:24:29Z gcosmo $
|
||||
// $Id: TestEm17.cc 109314 2018-04-11 06:42:23Z gcosmo $
|
||||
//
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4UImanager.hh"
|
||||
@@ -46,72 +46,64 @@
|
||||
#include "StackingAction.hh"
|
||||
#include "HistoManager.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) {
|
||||
|
||||
|
||||
//detect interactive mode (if no arguments) and define UI session
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if (argc == 1) ui = new G4UIExecutive(argc,argv);
|
||||
|
||||
//choose the Random engine
|
||||
CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine);
|
||||
|
||||
|
||||
//my Verbose output class
|
||||
G4VSteppingVerbose::SetInstance(new SteppingVerbose);
|
||||
|
||||
// Construct the default run manager
|
||||
|
||||
//construct the default run manager
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
|
||||
// set mandatory initialization classes
|
||||
//set mandatory initialization classes
|
||||
DetectorConstruction* det;
|
||||
PrimaryGeneratorAction* prim;
|
||||
runManager->SetUserInitialization(det = new DetectorConstruction);
|
||||
runManager->SetUserInitialization(new PhysicsList);
|
||||
runManager->SetUserAction(prim = new PrimaryGeneratorAction(det));
|
||||
|
||||
|
||||
HistoManager* histo = new HistoManager();
|
||||
|
||||
// set user action classes
|
||||
|
||||
//set user action classes
|
||||
RunAction* run;
|
||||
runManager->SetUserAction(run = new RunAction(det,prim,histo));
|
||||
runManager->SetUserAction(new SteppingAction(run,histo));
|
||||
runManager->SetUserAction(new StackingAction);
|
||||
|
||||
// Start execution
|
||||
//
|
||||
if (argc > 1) { // execute an argument macro file if exist
|
||||
G4String command = "/control/execute ";
|
||||
G4String fileName = argv[1];
|
||||
G4UImanager::GetUIpointer()->ApplyCommand(command+fileName);
|
||||
|
||||
} else { // start interactive session
|
||||
#ifdef G4VIS_USE
|
||||
G4VisManager* visManager = new G4VisExecutive;
|
||||
|
||||
//initialize visualization
|
||||
G4VisManager* visManager = nullptr;
|
||||
|
||||
//get the pointer to the User Interface manager
|
||||
G4UImanager* UImanager = G4UImanager::GetUIpointer();
|
||||
|
||||
if (ui) {
|
||||
//interactive mode
|
||||
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
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
}
|
||||
else {
|
||||
//batch mode
|
||||
G4String command = "/control/execute ";
|
||||
G4String fileName = argv[1];
|
||||
UImanager->ApplyCommand(command+fileName);
|
||||
}
|
||||
|
||||
// job termination
|
||||
//
|
||||
delete histo;
|
||||
//job termination
|
||||
delete visManager;
|
||||
delete runManager;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -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
|
||||
@@ -188,7 +188,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 10000
|
||||
User=2.18s Real=2.19s Sys=0s
|
||||
User=1.650000s Real=1.657219s Sys=0.000000s
|
||||
|
||||
The run consists of 10000 mu+ of 10 TeV through 1 m of Iron (density: 7.9 g/cm3 )
|
||||
|
||||
@@ -249,17 +249,17 @@ Index : 0 used in the geometry : Yes
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 10000
|
||||
User=2.15s Real=2.23s Sys=0s
|
||||
User=1.550000s Real=1.555161s Sys=0.000000s
|
||||
|
||||
The run consists of 10000 pi+ of 10 TeV through 1 m of Iron (density: 7.9 g/cm3 )
|
||||
|
||||
Number of process calls ---> hIoni : 433927 hPairProd : 59359 CoulombScat : 5595 hBrems : 378
|
||||
Number of process calls ---> hIoni : 428400 hPairProd : 59849 CoulombScat : 5576 hBrems : 393
|
||||
|
||||
Simulation: total CrossSection = 0.49926 /cm MeanFreePath = 2.003 cm massicCrossSection = 0.063438 cm2/g
|
||||
Simulation: total CrossSection = 0.49422 /cm MeanFreePath = 2.0234 cm massicCrossSection = 0.062798 cm2/g
|
||||
|
||||
--------- Ranecu engine status ---------
|
||||
Initial seed (index) = 0
|
||||
Current couple of seeds = 757017482, 302436013
|
||||
Current couple of seeds = 1354223454, 397206515
|
||||
----------------------------------------
|
||||
#
|
||||
/gun/particle proton
|
||||
@@ -294,7 +294,7 @@ Index : 0 used in the geometry : Yes
|
||||
|
||||
--------- Ranecu engine status ---------
|
||||
Initial seed (index) = 0
|
||||
Current couple of seeds = 757017482, 302436013
|
||||
Current couple of seeds = 1354223454, 397206515
|
||||
----------------------------------------
|
||||
--> Event 0 starts.
|
||||
--> Event 1000 starts.
|
||||
@@ -309,17 +309,17 @@ Index : 0 used in the geometry : Yes
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 10000
|
||||
User=2.45s Real=2.79s Sys=0s
|
||||
User=1.470000s Real=1.473132s Sys=0.000000s
|
||||
|
||||
The run consists of 10000 proton of 10 TeV through 1 m of Iron (density: 7.9 g/cm3 )
|
||||
|
||||
Number of process calls ---> hPairProd : 34564 hIoni : 434788 CoulombScat : 5656 hBrems : 3
|
||||
Number of process calls ---> hIoni : 426541 hPairProd : 34140 CoulombScat : 5639 hBrems : 4
|
||||
|
||||
Simulation: total CrossSection = 0.47501 /cm MeanFreePath = 2.1052 cm massicCrossSection = 0.060357 cm2/g
|
||||
Simulation: total CrossSection = 0.46632 /cm MeanFreePath = 2.1444 cm massicCrossSection = 0.059253 cm2/g
|
||||
|
||||
--------- Ranecu engine status ---------
|
||||
Initial seed (index) = 0
|
||||
Current couple of seeds = 110692364, 989821367
|
||||
Current couple of seeds = 224704523, 1105271165
|
||||
----------------------------------------
|
||||
#
|
||||
G4 kernel has come to Quit state.
|
||||
|
||||
Reference in New Issue
Block a user