Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 107258 2017-11-07 09:58:16Z gcosmo $
|
||||
$Id: History 110378 2018-05-22 07:43:50Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,11 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
May 20, 2018 J.Allison (ReverseMC01-V10-04-00)
|
||||
- Add #include "G4Types.hh"
|
||||
- Remove G4UI_USE and G4VIS_USE.
|
||||
- Move instantiation of G4UIExecutive nearer to start of main.
|
||||
|
||||
Nov 6, 2017 V.Ivanchenko (ReverseMC01-V10-03-01)
|
||||
- G4AdjointPhysicsList - use SetEmModel(..) instead of AddEmModel
|
||||
where possible in order to remove initialisation warning
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
/// \brief Main program of the biasing/ReverseMC01 example
|
||||
//
|
||||
//
|
||||
// $Id: exampleRMC01.cc 101303 2016-11-14 11:21:18Z gcosmo $
|
||||
// $Id: exampleRMC01.cc 110378 2018-05-22 07:43:50Z gcosmo $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -43,18 +43,15 @@
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
#include "G4Types.hh"
|
||||
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
#include "Randomize.hh"
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
#include "G4VisExecutive.hh"
|
||||
#endif
|
||||
|
||||
#ifdef G4UI_USE
|
||||
#include "G4UIExecutive.hh"
|
||||
#endif
|
||||
|
||||
#include "G4AdjointSimManager.hh"
|
||||
#include "RMC01DetectorConstruction.hh"
|
||||
@@ -70,8 +67,12 @@
|
||||
|
||||
int main(int argc,char** argv) {
|
||||
|
||||
|
||||
|
||||
// Instantiate G4UIExecutive if interactive mode
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if ( argc == 1 ) {
|
||||
ui = new G4UIExecutive(argc, argv);
|
||||
}
|
||||
|
||||
// Construct the default run manager
|
||||
G4RunManager * theRunManager = new G4RunManager;
|
||||
|
||||
@@ -101,17 +102,14 @@ int main(int argc,char** argv) {
|
||||
//theAdjointSimManager->SetAdjointEventAction(new RMC01AdjointEventAction);
|
||||
theAdjointSimManager->SetAdjointEventAction(new RMC01EventAction);
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
// visualization manager
|
||||
G4VisManager* visManager = new G4VisExecutive;
|
||||
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];
|
||||
@@ -119,17 +117,12 @@ int main(int argc,char** argv) {
|
||||
}
|
||||
else
|
||||
{ // interactive mode : define UI session
|
||||
#ifdef G4UI_USE
|
||||
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
#endif
|
||||
}
|
||||
|
||||
// job termination
|
||||
#ifdef G4VIS_USE
|
||||
delete visManager;
|
||||
#endif
|
||||
delete theRunManager;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -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
|
||||
@@ -321,11 +321,11 @@ nb event 175000
|
||||
1% Precision reached!
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Run Aborted after 176814 events processed.
|
||||
User=118.73s Real=125.33s Sys=0.1s
|
||||
Run Aborted after 175384 events processed.
|
||||
User=89.130000s Real=89.553164s Sys=0.070000s
|
||||
Results of reverse/adjoint simulation!
|
||||
normalised edep [MeV] = 0.00168653
|
||||
error[MeV] = 1.68652e-05
|
||||
normalised edep [MeV] = 0.00162731
|
||||
error[MeV] = 1.62731e-05
|
||||
|
||||
----> Histogram Tree is saved in adjoint_sim.root
|
||||
Graphics systems deleted.
|
||||
@@ -333,6 +333,6 @@ Visualization Manager deleting...
|
||||
G4 kernel has come to Quit state.
|
||||
================== Deleting memory pools ===================
|
||||
Number of memory pools allocated: 12 of which, static: 1
|
||||
Dynamic pools deleted: 11 / Total memory freed: 29 MB
|
||||
Dynamic pools deleted: 11 / Total memory freed: 28 MB
|
||||
============================================================
|
||||
RunManagerKernel is deleted. Good bye :)
|
||||
|
||||
Reference in New Issue
Block a user