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/field/field03/History
+16 -1
View File
@@ -1,4 +1,4 @@
$Id: History 104351 2017-05-26 07:23:04Z gcosmo $
$Id: History 110100 2018-05-15 11:30:23Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -14,6 +14,21 @@ track of all tags.
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
May 15, 2018 J.Allison - fieldex03-V10-04-01
- Remove G4UI_USE and G4VIS_USE.
- Move instantiation of G4UIExecutive to start of main.
- vis.mac, gui.mac: Clean up.
- F03RunAction.cc: Remove vis commands.
May 09, 2018 B.Morgan - fieldex03-V10-04-00
- Include G4Types before use of G4MULTITHREADED. For forward
compatibility with move to #defines over -D for G4 preprocessor
symbols.
Jun 2, 2017 - J.Apostolakis - fieldex03-V10-03-01
- renamed SetStepper() method to CreateSteppers()
May 24, 2017 - J.Apostolakis - fieldex03-V10-03-00
- fixed valgrind issues in field setup's update method: first
delete all dependent objects, then create new ones.
examples/extended/field/field03/field03.cc
+13 -16
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: field03.cc 98065 2016-07-01 16:30:19Z gcosmo $
// $Id: field03.cc 110100 2018-05-15 11:30:23Z gcosmo $
//
/// \file field/field03/field03.cc
/// \brief Main program of the field/field03 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,34 +93,30 @@ 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];
UImanager->ApplyCommand(command+fileName);
}
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;
examples/extended/field/field03/field03.out
+6 -19
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
@@ -1006,8 +1000,7 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng
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.002200s Sys=0.000000s
========= Table of registered couples ==============================
@@ -1021,15 +1014,12 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 1 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
--> Event 0 starts.
--> Event 50 starts.
Run terminated.
Run Summary
Number of events processed : 100
User=0.01s Real=0.01s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.010000s Real=0.010248s Sys=0.000000s
Set field value to (0,0,1000) Gauss
========= Table of registered couples ==============================
@@ -1044,14 +1034,11 @@ Index : 0 used in the geometry : Yes
====================================================================
### Run 2 starts.
WARNING: Scene "none" not found.
/vis/scene/list to see scenes.
--> Event 0 starts.
Run terminated.
Run Summary
Number of events processed : 10
User=0s Real=0s Sys=0s
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
User=0.000000s Real=0.001442s Sys=0.000000s
Graphics systems deleted.
Visualization Manager deleting...
G4 kernel has come to Quit state.
examples/extended/field/field03/gui.mac
-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
examples/extended/field/field03/include/F03FieldSetup.hh
+2 -2
View File
@@ -27,7 +27,7 @@
/// \brief Definition of the F03FieldSetup class
//
//
// $Id: F03FieldSetup.hh 77294 2013-11-22 11:01:00Z gcosmo $
// $Id: F03FieldSetup.hh 109870 2018-05-09 12:39:45Z gcosmo $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -61,7 +61,7 @@ public:
void SetStepperType( G4int i ) { fStepperType = i; }
void SetStepper();
void CreateSteppers();
void SetMinStep(G4double s) { fMinStep = s; }
examples/extended/field/field03/src/F03FieldSetup.cc
+4 -3
View File
@@ -27,7 +27,7 @@
/// \brief Implementation of the F03FieldSetup class
//
//
// $Id: F03FieldSetup.cc 104351 2017-05-26 07:23:04Z gcosmo $
// $Id: F03FieldSetup.cc 109870 2018-05-09 12:39:45Z gcosmo $
//
//
// Field Setup class implementation.
@@ -126,7 +126,8 @@ void F03FieldSetup::UpdateField()
<< G4endl;
// 2. Create the steppers ( Note: this also deletes the previous ones. )
SetStepper();
CreateSteppers();
// 3. Create the chord finder(s)
fChordFinder = new G4ChordFinder(fMagneticField, fMinStep, fStepper);
@@ -143,7 +144,7 @@ void F03FieldSetup::UpdateField()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void F03FieldSetup::SetStepper()
void F03FieldSetup::CreateSteppers()
{
delete fStepper;
fStepper= nullptr;
examples/extended/field/field03/src/F03RunAction.cc
+1 -12
View File
@@ -27,7 +27,7 @@
/// \brief Implementation of the F03RunAction class
//
//
// $Id: F03RunAction.cc 92498 2015-09-02 07:24:12Z gcosmo $
// $Id: F03RunAction.cc 110100 2018-05-15 11:30:23Z gcosmo $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -38,7 +38,6 @@
#include "G4Run.hh"
#include "G4UImanager.hh"
#include "G4VVisManager.hh"
#include "Randomize.hh"
@@ -69,22 +68,12 @@ void F03RunAction::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 F03RunAction::EndOfRunAction(const G4Run*)
{
if (G4VVisManager::GetConcreteInstance())
{
G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
}
// save Rndm status
if (fSaveRndm == 1)
examples/extended/field/field03/vis.mac
+1 -3
View File
@@ -87,6 +87,4 @@
/vis/verbose warnings
#
# For file-based drivers, use this to create an empty detector view:
#/vis/viewer/flush
/run/beamOn 1
#/vis/viewer/flush