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/persistency/P02/History
+9
View File
@@ -14,6 +14,15 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
June 15th 2018 W.Pokorski (exampleP02-V10-04-01)
- updating selection.xml file with new members of G4MaterialPropertiesTable
- fixing the crash on reading due to duplication of materials in .root file
May 19th 2018 J.Allison (exampleP02-V10-04-00)
- Add #include "G4Types.hh"
- Remove G4UI_USE and G4VIS_USE.
- Move instantiation of G4UIExecutive nearer to start of main.
November 29th, 2017 B.Morgan (exampleP02-V10-03-01)
- Use correct case "RootNewMacros"
examples/extended/persistency/P02/exampleP02.cc
+11 -21
View File
@@ -27,29 +27,25 @@
/// \brief Main program of the persistency/P02 example
//
//
// $Id: exampleP02.cc 82291 2014-06-13 15:20:32Z gcosmo $
// $Id: exampleP02.cc 110837 2018-06-15 15:16:45Z gcosmo $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "G4Types.hh"
#include "ExP02DetectorConstruction.hh"
#include "ExP02DetConstrReader.hh"
#include "ExP02PrimaryGeneratorAction.hh"
#include "FTFP_BERT.hh"
#include "G4RunManager.hh"
#include "G4UImanager.hh"
#ifdef G4VIS_USE
#include "G4VisExecutive.hh"
#endif
#ifdef G4UI_USE
#include "G4UIExecutive.hh"
#endif
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -78,6 +74,9 @@ int main(int argc, char** argv)
return 0;
}
// User interface
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
// Run manager
G4RunManager * runManager = new G4RunManager;
@@ -87,12 +86,10 @@ int main(int argc, char** argv)
G4VModularPhysicsList* physicsList = new FTFP_BERT;
runManager->SetUserInitialization(physicsList);
#ifdef G4VIS_USE
// Visualization, if you choose to have it!
// Visualization
G4VisManager* visManager = new G4VisExecutive;
visManager->Initialize();
#endif
// UserAction classes
runManager->SetUserAction(new ExP02PrimaryGeneratorAction());
@@ -102,18 +99,11 @@ int main(int argc, char** argv)
//get the pointer to the User Interface manager
G4UImanager * UImanager = G4UImanager::GetUIpointer();
#ifdef G4UI_USE
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
#ifdef G4VIS_USE
UImanager->ApplyCommand("/control/execute vis.mac");
#endif
ui->SessionStart();
delete ui;
#endif
UImanager->ApplyCommand("/control/execute vis.mac");
ui->SessionStart();
delete ui;
#ifdef G4VIS_USE
delete visManager;
#endif
delete runManager;
return 0;
examples/extended/persistency/P02/include/ExP02GeoTree.hh
+2 -5
View File
@@ -26,7 +26,7 @@
/// \file persistency/P02/include/ExP02GeoTree.hh
/// \brief Definition of the ExP02GeoTree class
//
// $Id: ExP02GeoTree.hh 71727 2013-06-21 07:55:45Z gcosmo $
// $Id: ExP02GeoTree.hh 110837 2018-06-15 15:16:45Z gcosmo $
#ifndef INCLUDE_EXP02GEOTREE_H
#define INCLUDE_EXP02GEOTREE_H 1
@@ -36,7 +36,6 @@
#include "G4Element.hh"
#include "G4ElementTable.hh"
#include "G4Material.hh"
#include "G4MaterialTable.hh"
/// Helper class needed for the ROOT I/O. It contains pointers to geometry tree,
/// element table and material table.
@@ -45,8 +44,7 @@ class ExP02GeoTree {
public:
ExP02GeoTree( );
ExP02GeoTree(G4VPhysicalVolume* vol, const G4ElementTable* et,
const G4MaterialTable* mt);
ExP02GeoTree(G4VPhysicalVolume* vol, const G4ElementTable* et);
virtual ~ExP02GeoTree( );
@@ -56,7 +54,6 @@ private:
G4VPhysicalVolume* fTopV;
const G4ElementTable* fEltab;
const G4MaterialTable* fMattab;
};
#endif // INCLUDE_EXP02GEOTREE_H
examples/extended/persistency/P02/src/ExP02DetectorConstruction.cc
+2 -3
View File
@@ -26,7 +26,7 @@
/// \file persistency/P02/src/ExP02DetectorConstruction.cc
/// \brief Implementation of the ExP02DetectorConstruction class
//
// $Id: ExP02DetectorConstruction.cc 93306 2015-10-16 07:38:07Z gcosmo $
// $Id: ExP02DetectorConstruction.cc 110837 2018-06-15 15:16:45Z gcosmo $
//
//
#include "ExP02DetectorConstruction.hh"
@@ -163,9 +163,8 @@ G4VPhysicalVolume* ExP02DetectorConstruction::Construct()
// gDebug = 1;
const G4ElementTable* eltab = G4Element::GetElementTable();
const G4MaterialTable* mattab = G4Material::GetMaterialTable();
ExP02GeoTree* geotree = new ExP02GeoTree(fExperimentalHall_phys, eltab, mattab);
ExP02GeoTree* geotree = new ExP02GeoTree(fExperimentalHall_phys, eltab);
TFile fo("geo.root","RECREATE");
examples/extended/persistency/P02/src/ExP02GeoTree.cc
+4 -6
View File
@@ -26,7 +26,7 @@
/// \file persistency/P02/src/ExP02GeoTree.cc
/// \brief Implementation of the ExP02GeoTree class
//
// $Id: ExP02GeoTree.cc 71727 2013-06-21 07:55:45Z gcosmo $
// $Id: ExP02GeoTree.cc 110837 2018-06-15 15:16:45Z gcosmo $
// Include files
// local
@@ -42,17 +42,15 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ExP02GeoTree::ExP02GeoTree( )
: fTopV(0), fEltab(0), fMattab(0)
: fTopV(0), fEltab(0)
{
fEltab = G4Element::GetElementTable();
fMattab = G4Material::GetMaterialTable();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ExP02GeoTree::ExP02GeoTree(G4VPhysicalVolume* vol, const G4ElementTable* et,
const G4MaterialTable* mt)
: fTopV(vol), fEltab(et), fMattab(mt)
ExP02GeoTree::ExP02GeoTree(G4VPhysicalVolume* vol, const G4ElementTable* et)
: fTopV(vol), fEltab(et)
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/persistency/P02/xml/selection.xml
+3
View File
@@ -47,6 +47,9 @@
<class name="G4MaterialPropertyVector"/>
<class name="G4MaterialPropertiesTable"/>
<class name="std::map<G4int, G4MaterialPropertyVector*, std::less<G4int> >" />
<class name="std::map< G4int, G4double, std::less<G4int> >" />
<class name="std::map<G4String, G4MaterialPropertyVector*>" />
<class name="std::map<G4String, double>" />