Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
/// \file hadronic/Hadr02/Hadr02.cc
|
||||
/// \brief Main program of the hadronic/Hadr02 example
|
||||
//
|
||||
// $Id: Hadr02.cc 77519 2013-11-25 10:54:57Z gcosmo $
|
||||
// $Id: Hadr02.cc 109063 2018-03-23 12:56:28Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------
|
||||
// GEANT4 Hadr02
|
||||
@@ -57,19 +57,19 @@
|
||||
#include "StackingAction.hh"
|
||||
#include "HistoManager.hh"
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
#include "G4VisExecutive.hh"
|
||||
#endif
|
||||
|
||||
#ifdef G4UI_USE
|
||||
#include "G4UIExecutive.hh"
|
||||
#endif
|
||||
#include "G4VisExecutive.hh"
|
||||
|
||||
#include "UrQMD.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());
|
||||
|
||||
@@ -110,39 +110,28 @@ int main(int argc,char** argv) {
|
||||
runManager->SetUserAction(new EventAction());
|
||||
runManager->SetUserAction(new StackingAction());
|
||||
|
||||
//initialize visualization
|
||||
G4VisManager* visManager = new G4VisExecutive;
|
||||
visManager->Initialize();
|
||||
|
||||
//get the pointer to the User Interface manager
|
||||
G4UImanager* UImanager = G4UImanager::GetUIpointer();
|
||||
#ifdef G4VIS_USE
|
||||
G4VisManager* visManager = 0;
|
||||
#endif
|
||||
G4UImanager* UImanager = G4UImanager::GetUIpointer();
|
||||
|
||||
if (argc==1) // Define UI terminal for interactive mode
|
||||
{
|
||||
#ifdef G4VIS_USE
|
||||
//visualization manager
|
||||
visManager = new G4VisExecutive;
|
||||
visManager->Initialize();
|
||||
#endif
|
||||
#ifdef G4UI_USE
|
||||
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
#endif
|
||||
}
|
||||
else // Batch mode
|
||||
{
|
||||
G4String command = "/control/execute ";
|
||||
G4String fileName = argv[1];
|
||||
UImanager->ApplyCommand(command+fileName);
|
||||
}
|
||||
if (ui) {
|
||||
//interactive mode
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
}
|
||||
else {
|
||||
//batch mode
|
||||
G4String command = "/control/execute ";
|
||||
G4String fileName = argv[1];
|
||||
UImanager->ApplyCommand(command+fileName);
|
||||
}
|
||||
|
||||
//job termination
|
||||
#ifdef G4VIS_USE
|
||||
delete visManager;
|
||||
#endif
|
||||
//job termination
|
||||
delete visManager;
|
||||
delete runManager;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
$Id: History 100812 2016-11-02 15:06:25Z gcosmo $
|
||||
$Id: History 109656 2018-05-04 09:00:14Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -15,6 +15,17 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
03-05-18 J.Allison (exhadr02-V10-04-01)
|
||||
- RunAction.cc:
|
||||
o Remove G4VIS_USE.
|
||||
o Remove /vis/ commands - not necessary now and causes
|
||||
problem in Qt with in multithreaded mode.
|
||||
- DetectorConstruction.cc: Pass vis attributes as objects, not pointers.
|
||||
- vis.mac: Remove "/testhadr/DrawTracks" (no longer exists).
|
||||
|
||||
22-03-18 M.Maire (exhadr02-V10-04-00)
|
||||
- Hadr02.cc : remove G4UI_USE and G4VIS_USE
|
||||
|
||||
01-11-16 I. Hrivnacova (exhadr02-V10-02-00)
|
||||
- Coding guidelines (class data member names)
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -16,6 +16,53 @@ G4PhysListFactory::GetReferencePhysList <QBBC> EMoption= 0
|
||||
<<< Reference Physics List QBBC
|
||||
<<< Reference Physics List QBBC is built
|
||||
|
||||
Visualization Manager instantiating with verbosity "warnings (3)"...
|
||||
Visualization Manager initialising...
|
||||
Registering graphics systems...
|
||||
|
||||
You have successfully registered the following graphics systems.
|
||||
Current available graphics systems are:
|
||||
ASCIITree (ATree)
|
||||
DAWNFILE (DAWNFILE)
|
||||
G4HepRep (HepRepXML)
|
||||
G4HepRepFile (HepRepFile)
|
||||
RayTracer (RayTracer)
|
||||
VRML1FILE (VRML1FILE)
|
||||
VRML2FILE (VRML2FILE)
|
||||
gMocrenFile (gMocrenFile)
|
||||
OpenGLImmediateQt (OGLIQt, OGLI)
|
||||
OpenGLStoredQt (OGLSQt, OGL, OGLS)
|
||||
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
|
||||
OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
|
||||
OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
|
||||
OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
|
||||
RayTracerX (RayTracerX)
|
||||
|
||||
Registering model factories...
|
||||
|
||||
You have successfully registered the following model factories.
|
||||
Registered model factories:
|
||||
generic
|
||||
drawByAttribute
|
||||
drawByCharge
|
||||
drawByOriginVolume
|
||||
drawByParticleID
|
||||
drawByEncounteredVolume
|
||||
|
||||
Registered filter factories:
|
||||
attributeFilter
|
||||
chargeFilter
|
||||
originVolumeFilter
|
||||
particleFilter
|
||||
encounteredVolumeFilter
|
||||
|
||||
You have successfully registered the following user vis actions.
|
||||
Run Duration User Vis Actions: none
|
||||
End of Event User Vis Actions: none
|
||||
End of Run User Vis Actions: none
|
||||
|
||||
Some /vis commands (optionally) take a string to specify colour.
|
||||
"/vis/list" to see available colours.
|
||||
/run/verbose 1
|
||||
/tracking/verbose 0
|
||||
/testhadr/TargetMat G4_Al
|
||||
@@ -71,8 +118,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
|
||||
@@ -439,8 +486,7 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
|
||||
Model: FTFP: 3 GeV ---> 100 TeV
|
||||
Model: BertiniCascade: 1 GeV ---> 5 GeV
|
||||
Model: Binary Cascade: 0 eV ---> 1.5 GeV
|
||||
Cr_sctns: G4NeutronInelasticXS: 0 eV ---> 100 TeV
|
||||
Cr_sctns: GheishaInelastic: 0 eV ---> 100 TeV
|
||||
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 100 TeV
|
||||
|
||||
Process: nCapture
|
||||
Model: nRadCapture: 0 eV ---> 100 TeV
|
||||
@@ -681,13 +727,11 @@ 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
|
||||
Model: BertiniCascade: 0 eV ---> 5 GeV
|
||||
Cr_sctns: Barashenkov-Glauber-Gribov: 0 eV ---> 100 TeV
|
||||
Cr_sctns: GheishaInelastic: 0 eV ---> 100 TeV
|
||||
|
||||
---------------------------------------------------
|
||||
Hadronic Processes for pi-
|
||||
@@ -696,13 +740,11 @@ 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
|
||||
Model: BertiniCascade: 0 eV ---> 5 GeV
|
||||
Cr_sctns: Barashenkov-Glauber-Gribov: 0 eV ---> 100 TeV
|
||||
Cr_sctns: GheishaInelastic: 0 eV ---> 100 TeV
|
||||
|
||||
Process: hBertiniCaptureAtRest
|
||||
|
||||
@@ -712,15 +754,12 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
|
||||
Process: hadElastic
|
||||
Model: hElasticCHIPS: 0 eV ---> 100 TeV
|
||||
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: ChipsProtonElasticXS: 0 eV ---> 100 TeV
|
||||
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
|
||||
|
||||
Process: protonInelastic
|
||||
Model: FTFP: 3 GeV ---> 100 TeV
|
||||
Model: BertiniCascade: 1 GeV ---> 5 GeV
|
||||
Model: Binary Cascade: 0 eV ---> 1.5 GeV
|
||||
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: GheishaInelastic: 0 eV ---> 100 TeV
|
||||
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 100 TeV
|
||||
|
||||
---------------------------------------------------
|
||||
Hadronic Processes for triton
|
||||
@@ -790,33 +829,35 @@ Index : 1 used in the geometry : Yes
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 100
|
||||
User=0.15s Real=0.23s Sys=0.01s
|
||||
User=0.120000s Real=0.138551s Sys=0.000000s
|
||||
RunAction: End of run action is starting
|
||||
HistoManager: End of run actions are started
|
||||
========================================================
|
||||
Beam particle S32
|
||||
Beam Energy(GeV) 200
|
||||
Number of events 100
|
||||
Average energy deposit (GeV) 5.647 RMS(GeV) 4.256
|
||||
Average number of steps 47.94
|
||||
Average number of gamma 0.82
|
||||
Average energy deposit (GeV) 7.232 RMS(GeV) 4.306
|
||||
Average number of steps 61.44
|
||||
Average number of gamma 0.85
|
||||
Average number of e- 0
|
||||
Average number of e+ 0
|
||||
Average number of neutrons 14.99
|
||||
Average number of protons 14.8
|
||||
Average number of neutrons 10.23
|
||||
Average number of protons 10.25
|
||||
Average number of antiprotons 0
|
||||
Average number of pi+ & pi- 8.4
|
||||
Average number of pi0 4.37
|
||||
Average number of kaons 0.43
|
||||
Average number of pi+ & pi- 5.23
|
||||
Average number of pi0 3.1
|
||||
Average number of kaons 0.15
|
||||
Average number of muons 0
|
||||
Average number of deuterons+tritons 2.2
|
||||
Average number of He3+alpha 1.28
|
||||
Average number of ions 0.4
|
||||
Average number of deuterons+tritons 1.95
|
||||
Average number of He3+alpha 1.36
|
||||
Average number of ions 0.43
|
||||
========================================================
|
||||
|
||||
Graphics systems deleted.
|
||||
Visualization Manager deleting...
|
||||
G4 kernel has come to Quit state.
|
||||
================== Deleting memory pools ===================
|
||||
Number of memory pools allocated: 12 of which, static: 0
|
||||
Dynamic pools deleted: 12 / Total memory freed: 0.089 MB
|
||||
Dynamic pools deleted: 12 / Total memory freed: 0.082 MB
|
||||
============================================================
|
||||
RunManagerKernel is deleted. Good bye :)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/// \file hadronic/Hadr02/src/DetectorConstruction.cc
|
||||
/// \brief Implementation of the DetectorConstruction class
|
||||
//
|
||||
// $Id: DetectorConstruction.cc 101905 2016-12-07 11:34:39Z gunter $
|
||||
// $Id: DetectorConstruction.cc 109656 2018-05-04 09:00:14Z gcosmo $
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -158,13 +158,13 @@ G4VPhysicalVolume* DetectorConstruction::Construct()
|
||||
|
||||
// colors
|
||||
G4VisAttributes zero = G4VisAttributes::GetInvisible();
|
||||
fLogicWorld->SetVisAttributes(&zero);
|
||||
fLogicWorld->SetVisAttributes(zero);
|
||||
|
||||
G4VisAttributes regWcolor(G4Colour(0.3, 0.3, 0.3));
|
||||
logicCheck->SetVisAttributes(®Wcolor);
|
||||
logicCheck->SetVisAttributes(regWcolor);
|
||||
|
||||
G4VisAttributes regCcolor(G4Colour(0., 0.3, 0.7));
|
||||
fLogicTarget->SetVisAttributes(®Ccolor);
|
||||
fLogicTarget->SetVisAttributes(regCcolor);
|
||||
|
||||
G4cout << *(G4Material::GetMaterialTable()) << G4endl;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/// \file hadronic/Hadr02/src/RunAction.cc
|
||||
/// \brief Implementation of the RunAction class
|
||||
//
|
||||
// $Id: RunAction.cc 81932 2014-06-06 15:39:45Z gcosmo $
|
||||
// $Id: RunAction.cc 109656 2018-05-04 09:00:14Z gcosmo $
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -58,13 +58,6 @@ void RunAction::BeginOfRunAction(const G4Run* run)
|
||||
G4int id = run->GetRunID();
|
||||
G4cout << "### Run " << id << " start" << G4endl;
|
||||
HistoManager::GetPointer()->BeginOfRun();
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
if ( G4VVisManager::GetConcreteInstance() ) {
|
||||
G4UImanager::GetUIpointer()->ApplyCommand("/vis/scene/notifyHandlers");
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
@@ -72,12 +65,6 @@ void RunAction::BeginOfRunAction(const G4Run* run)
|
||||
void RunAction::EndOfRunAction(const G4Run*)
|
||||
{
|
||||
G4cout << "RunAction: End of run action is starting" << G4endl;
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
if ( G4VVisManager::GetConcreteInstance() )
|
||||
G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
|
||||
#endif
|
||||
|
||||
HistoManager::GetPointer()->EndOfRun();
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
/testhadr/TargetRadius 1 cm
|
||||
/testhadr/TargetLength 10 cm
|
||||
#/testhadr/NumberDivZ 100
|
||||
/testhadr/DrawTracks all
|
||||
#/testhadr/CutsAll 1 mm
|
||||
#/testhadr/Physics QBBC
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user