Import Geant4 10.7.0 source tree
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Setup the project
|
||||
#
|
||||
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.8...3.18)
|
||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||
endif()
|
||||
project(B4a)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -30,11 +30,7 @@
|
||||
#include "B4DetectorConstruction.hh"
|
||||
#include "B4aActionInitialization.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4UIcommand.hh"
|
||||
@@ -99,13 +95,12 @@ int main(int argc,char** argv)
|
||||
|
||||
// Construct the default run manager
|
||||
//
|
||||
auto* runManager =
|
||||
G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default);
|
||||
#ifdef G4MULTITHREADED
|
||||
auto runManager = new G4MTRunManager;
|
||||
if ( nThreads > 0 ) {
|
||||
runManager->SetNumberOfThreads(nThreads);
|
||||
}
|
||||
#else
|
||||
auto runManager = new G4RunManager;
|
||||
#endif
|
||||
|
||||
// Set mandatory initialization classes
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -34,4 +34,7 @@
|
||||
//#include "g4csv.hh"
|
||||
//#include "g4xml.hh"
|
||||
|
||||
//#include "G4GenericAnalysisManager.hh"
|
||||
//using G4AnalysisManager = G4GenericAnalysisManager;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
# % exampleB4[a,b,c,d] run2.mac
|
||||
#
|
||||
#/run/numberOfThreads 4
|
||||
#/control/cout/ignoreThreadsExcept 0
|
||||
#
|
||||
/run/initialize
|
||||
#
|
||||
# Default kinemtics:
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Setup the project
|
||||
#
|
||||
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.8...3.18)
|
||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||
endif()
|
||||
project(B4b)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -30,11 +30,7 @@
|
||||
#include "B4DetectorConstruction.hh"
|
||||
#include "B4bActionInitialization.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4UIcommand.hh"
|
||||
@@ -99,13 +95,12 @@ int main(int argc,char** argv)
|
||||
|
||||
// Construct the default run manager
|
||||
//
|
||||
auto* runManager =
|
||||
G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default);
|
||||
#ifdef G4MULTITHREADED
|
||||
auto runManager = new G4MTRunManager;
|
||||
if ( nThreads > 0 ) {
|
||||
runManager->SetNumberOfThreads(nThreads);
|
||||
}
|
||||
#else
|
||||
auto runManager = new G4RunManager;
|
||||
#endif
|
||||
|
||||
// Set mandatory initialization classes
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -34,4 +34,7 @@
|
||||
//#include "g4csv.hh"
|
||||
//#include "g4xml.hh"
|
||||
|
||||
//#include "G4GenericAnalysisManager.hh"
|
||||
//using G4AnalysisManager = G4GenericAnalysisManager;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
# % exampleB4[a,b,c,d] run2.mac
|
||||
#
|
||||
#/run/numberOfThreads 4
|
||||
#/control/cout/ignoreThreadsExcept 0
|
||||
#
|
||||
/run/initialize
|
||||
#
|
||||
# Default kinemtics:
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Setup the project
|
||||
#
|
||||
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.8...3.18)
|
||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||
endif()
|
||||
project(B4c)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -30,11 +30,7 @@
|
||||
#include "B4cDetectorConstruction.hh"
|
||||
#include "B4cActionInitialization.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4UIcommand.hh"
|
||||
@@ -99,13 +95,12 @@ int main(int argc,char** argv)
|
||||
|
||||
// Construct the default run manager
|
||||
//
|
||||
auto* runManager =
|
||||
G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default);
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager * runManager = new G4MTRunManager;
|
||||
if ( nThreads > 0 ) {
|
||||
runManager->SetNumberOfThreads(nThreads);
|
||||
}
|
||||
#else
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
#endif
|
||||
|
||||
// Set mandatory initialization classes
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -34,4 +34,7 @@
|
||||
//#include "g4csv.hh"
|
||||
//#include "g4xml.hh"
|
||||
|
||||
//#include "G4GenericAnalysisManager.hh"
|
||||
//using G4AnalysisManager = G4GenericAnalysisManager;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
# % exampleB4[a,b,c,d] run2.mac
|
||||
#
|
||||
#/run/numberOfThreads 4
|
||||
#/control/cout/ignoreThreadsExcept 0
|
||||
#
|
||||
/run/initialize
|
||||
#
|
||||
# Default kinemtics:
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Setup the project
|
||||
#
|
||||
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.8...3.18)
|
||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||
endif()
|
||||
project(B4d)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -31,11 +31,7 @@
|
||||
#include "B4dActionInitialization.hh"
|
||||
#include "B4Analysis.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
#include "G4UImanager.hh"
|
||||
#include "FTFP_BERT.hh"
|
||||
@@ -98,13 +94,13 @@ int main(int argc,char** argv)
|
||||
|
||||
// Construct the MT run manager
|
||||
//
|
||||
|
||||
auto* runManager =
|
||||
G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default);
|
||||
#ifdef G4MULTITHREADED
|
||||
auto runManager = new G4MTRunManager;
|
||||
if ( nThreads > 0 ) {
|
||||
if ( nThreads > 0 ) {
|
||||
runManager->SetNumberOfThreads(nThreads);
|
||||
}
|
||||
#else
|
||||
auto runManager = new G4RunManager;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Set mandatory initialization classes
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -34,4 +34,7 @@
|
||||
//#include "g4csv.hh"
|
||||
//#include "g4xml.hh"
|
||||
|
||||
//#include "G4GenericAnalysisManager.hh"
|
||||
//using G4AnalysisManager = G4GenericAnalysisManager;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
# % exampleB4[a,b,c,d] run2.mac
|
||||
#
|
||||
#/run/numberOfThreads 4
|
||||
#/control/cout/ignoreThreadsExcept 0
|
||||
#
|
||||
/run/initialize
|
||||
#
|
||||
# Default kinemtics:
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
|
||||
#---Adding example N3 subdirectories explicitly
|
||||
#---Adding example N3 subdirectories explicitly
|
||||
# and a custom target to for building all example N3 options ----------
|
||||
|
||||
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.8...3.18)
|
||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||
endif()
|
||||
|
||||
add_subdirectory(B4a)
|
||||
add_subdirectory(B4b)
|
||||
|
||||
+36
-19
@@ -13,7 +13,24 @@ track of all tags.
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
06/11/20 I. Hrivnacova (exampleB4-V10-06-04)
|
||||
- Updated B4Analysis.hh with commented lines for using new generic analysis manager
|
||||
- Added "ignoreThreadsExcept 0" setting in run2.mac (commented)
|
||||
|
||||
02/11/20 B.Morgan (exampleB4-V10-06-03)
|
||||
- Support same CMake version range as core Geant4
|
||||
|
||||
19/07/20 G. Cosmo (exampleB4-V10-06-02)
|
||||
- Removed redundant inclusion of headers in example B4d main().
|
||||
|
||||
17/07/20 I. Hrivnacova (exampleB4-V10-06-01)
|
||||
- Migrated B4d example to use G4RunManagerFactory.
|
||||
|
||||
30/06/20 G. Cosmo (exampleB4-V10-06-00)
|
||||
- Migrated examples (except for B4d) to use G4RunManagerFactory, therefore
|
||||
implicitly enabling tasking by default in MT builds.
|
||||
|
||||
21/11/19 G. Cosmo (exampleB4-V10-05-04)
|
||||
- Use default MixMax random engine.
|
||||
|
||||
@@ -31,14 +48,14 @@ track of all tags.
|
||||
- Corrected name of include file: csv.hh.
|
||||
|
||||
07/11/18 I. Hrivnacova (exampleB4-V10-04-03)
|
||||
- Fixed CMake: added missing plotNtuple.C
|
||||
- Fixed CMake: added missing plotNtuple.C
|
||||
|
||||
30/10/18 I. Hrivnacova (exampleB4-V10-04-02)
|
||||
- Removed usage of G4ScoreNtupleWriter;
|
||||
- Removed usage of G4ScoreNtupleWriter;
|
||||
will be demonstrated in a new extended analysis example
|
||||
|
||||
26/10/18 I. Hrivnacova (exampleB4-V10-04-01)
|
||||
- Activated storing scorers hits in B4d in Root file using
|
||||
- Activated storing scorers hits in B4d in Root file using
|
||||
new G4ScoreNtupleWriter
|
||||
- Updated README
|
||||
|
||||
@@ -73,10 +90,10 @@ track of all tags.
|
||||
|
||||
04/05/15 I. Hrivnacova (exampleB4-V10-01-02)
|
||||
- Coding guidelines: removed empty lines
|
||||
|
||||
|
||||
18/02/15 I. Hrivnacova (exampleB4-V10-01-01)
|
||||
- Fixed accessing gapHit (problem report #1714)
|
||||
|
||||
|
||||
02/02/15 I. Hrivnacova (exampleB4-V10-01-00)
|
||||
- Fixed documentation
|
||||
|
||||
@@ -102,9 +119,9 @@ track of all tags.
|
||||
11/08/14 mma (exampleB4-V10-00-00)
|
||||
- Restaure drawing in README and .README
|
||||
|
||||
02 December 2013 Ivana Hrivnacova
|
||||
02 December 2013 Ivana Hrivnacova
|
||||
- Fixed gui.mac:
|
||||
corrected wireframe parameter, removed run2.mac from gui
|
||||
corrected wireframe parameter, removed run2.mac from gui
|
||||
|
||||
28/11/13 I. Hrivnacova (exampleB4-V09-06-18)
|
||||
- Clean-up macros (fixed obsolete comments)
|
||||
@@ -113,7 +130,7 @@ track of all tags.
|
||||
- Fixed deleting fMagFieldMessenger with use of G4AutoDelete utility
|
||||
|
||||
30/10/13 I. Hrivnacova (exampleB4-V09-06-16)
|
||||
- Added a protection when /run/printProgress value is set to zero
|
||||
- Added a protection when /run/printProgress value is set to zero
|
||||
|
||||
30/10/13 I. Hrivnacova (exampleB4-V09-06-15)
|
||||
- Updated README
|
||||
@@ -128,12 +145,12 @@ track of all tags.
|
||||
- Using Gent4 default number of threads when not set via command line
|
||||
- Updated README
|
||||
|
||||
01/10/13 I. Hrivnacova (exampleB4-V09-06-12)
|
||||
01/10/13 I. Hrivnacova (exampleB4-V09-06-12)
|
||||
- Updated for changes in analysis:
|
||||
removal of G4AnalysisManager::Create(isMaster)
|
||||
|
||||
19/08/13 I. Hrivnacova (exampleB4-V09-06-11)
|
||||
- Fixed B4[b]RunAction::EndOfRunAction() again: to get the printed
|
||||
- Fixed B4[b]RunAction::EndOfRunAction() again: to get the printed
|
||||
histogram statistics correct
|
||||
|
||||
24/07/13 P. Gumplinger (exampleB4-V09-06-10)
|
||||
@@ -156,20 +173,20 @@ track of all tags.
|
||||
|
||||
29/05/13 I. Hrivnacova (exampleB4-V09-06-05)
|
||||
- Fixed detector construction classes:
|
||||
Moving creating setMagField command from the constructor in
|
||||
Moving creating setMagField command from the constructor in
|
||||
ConstructSDandField(), as the command has to be created per thread,
|
||||
and declaring fMagField and fMessenger data members as static
|
||||
and declaring fMagField and fMessenger data members as static
|
||||
G4ThreadLocal
|
||||
|
||||
24/04/13 M. Asai (exampleB4-V09-06-04)
|
||||
- Recover GNUmakefiles.
|
||||
|
||||
23/04/13 I. Hrivnacova (exampleB4-V09-06-03)
|
||||
- Use G4Random::setTheEngine instead of CLHEP::HepRandom in main
|
||||
- Use G4Random::setTheEngine instead of CLHEP::HepRandom in main
|
||||
(needed for MT)
|
||||
- In B4b: merged B4bRunAction and B4RunAction in one class
|
||||
- Removed unnecessary includes in run action files
|
||||
- Minor fixes of coding guidelines
|
||||
- Minor fixes of coding guidelines
|
||||
|
||||
18/04/13 M. Asai (exampleB4-V09-06-02)
|
||||
- Migrated to the new G4VUserActionInitialization class.
|
||||
@@ -182,7 +199,7 @@ track of all tags.
|
||||
|
||||
28/02/13 I. Hrivnacova
|
||||
- When building materials with NistManager
|
||||
do not set fromIsotopes argument (which was set to false),
|
||||
do not set fromIsotopes argument (which was set to false),
|
||||
as since 9.6 all materials have to be built from isotopes.
|
||||
Thanks to V. Ivantchenko for pointing at this.
|
||||
|
||||
@@ -194,7 +211,7 @@ track of all tags.
|
||||
|
||||
18/09/12 I. Hrivnacova
|
||||
- Updated code using analysis:
|
||||
- Now only a selected analysis manager is included
|
||||
- Now only a selected analysis manager is included
|
||||
- Making directories in output file is optional
|
||||
- Adding a line using G4AnalysisManager::GetType()
|
||||
- General changes (see basic/History)
|
||||
@@ -205,7 +222,7 @@ track of all tags.
|
||||
constructors in the constructor body and not in the initialization list
|
||||
(to avoid passing 'this' in the initializer list).
|
||||
|
||||
14/11/11 I. Hrivnacova
|
||||
14/11/11 I. Hrivnacova
|
||||
- The first tagged version of the new B4 example
|
||||
(tagged in basic).
|
||||
(tagged in basic).
|
||||
Started from novice/N03.
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
# % exampleB4[a,b,c,d] run2.mac
|
||||
#
|
||||
#/run/numberOfThreads 4
|
||||
#/control/cout/ignoreThreadsExcept 0
|
||||
#
|
||||
/run/initialize
|
||||
#
|
||||
# Default kinemtics:
|
||||
|
||||
Reference in New Issue
Block a user