Import Geant4 10.7.0 source tree
This commit is contained in:
@@ -2,7 +2,10 @@
|
||||
#---Adding example B2 subdirectories explicitly
|
||||
# and a custom target to for building all example B2 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(gflash1)
|
||||
add_subdirectory(gflash2)
|
||||
|
||||
@@ -16,10 +16,13 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
10-Nov-2020 B. Morgan (exgflash-V10-06-00)
|
||||
- Migration to G4RunManagerFactory.
|
||||
|
||||
28-Nov-2019 I. Hrivnacova (exgflash-V10-05-02)
|
||||
- Updated README files:
|
||||
changed text to correspond to a description of a set of examples;
|
||||
fixed formatting in .README.txt
|
||||
fixed formatting in .README.txt
|
||||
- Fixed Doxygen warnings
|
||||
|
||||
25-Nov-2019 I. Semeniouk (exgflash-V10-05-01)
|
||||
@@ -63,7 +66,7 @@ committal in the CVS repository !
|
||||
|
||||
30-Jul-2013, Peter Gumplinger (exgflash-V09-06-02)
|
||||
- fix MAC/clang32 compilation warnings
|
||||
|
||||
|
||||
16-Jul-2013, Marc Verderi (exgflash-V09-06-01)
|
||||
- Migration to MT
|
||||
|
||||
@@ -82,9 +85,9 @@ committal in the CVS repository !
|
||||
create/new Collection before adding it to HCE
|
||||
|
||||
26-January 2010, Gunter Folger (exgflash-V09-04-00)
|
||||
- Finnish correcting namepsace problems on Windows,
|
||||
- Finnish correcting namepsace problems on Windows,
|
||||
removed using namespace, use G4cout,.. and few std::
|
||||
|
||||
|
||||
03-December 2010, Gunter Folger (exgflash-V09-03-04)
|
||||
- Correct use of "using namespace std", needed for Windows VC
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
#----------------------------------------------------------------------------
|
||||
# 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(gflash1)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -29,19 +29,15 @@
|
||||
//
|
||||
// Created by Joanna Weng 26.11.2004
|
||||
|
||||
// G4 includes
|
||||
// G4 includes
|
||||
#include "G4Types.hh"
|
||||
#include "G4ios.hh"
|
||||
#include "G4Timer.hh"
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
// my project
|
||||
// my project
|
||||
#include "ExGflash1DetectorConstruction.hh"
|
||||
#include "ExGflashActionInitialization.hh"
|
||||
|
||||
@@ -54,7 +50,7 @@
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
{
|
||||
// Instantiate G4UIExecutive if interactive mode
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if ( argc == 1 ) {
|
||||
@@ -64,30 +60,18 @@ int main(int argc,char** argv)
|
||||
// timer to see GFlash performance
|
||||
G4Timer timer;
|
||||
timer.Start();
|
||||
|
||||
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| |"<<G4endl;
|
||||
G4cout<<"| This is an example of Shower |"<<G4endl;
|
||||
G4cout<<"| Parameterization with GFLASH |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
|
||||
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager * runManager = new G4MTRunManager;
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager();
|
||||
runManager->SetNumberOfThreads(1);
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| Constructing MT run manager |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
#else
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| Constructing sequential run manager |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
#endif
|
||||
|
||||
|
||||
// UserInitialization classes (mandatory)
|
||||
G4cout<<"# GFlash Example: Detector Construction"<<G4endl;
|
||||
G4cout<<"# GFlash Example: Detector Construction"<<G4endl;
|
||||
runManager->SetUserInitialization(new ExGflash1DetectorConstruction);
|
||||
|
||||
// G4cout<<"# GFlash Example: Physics "<<G4endl;
|
||||
@@ -121,22 +105,22 @@ int main(int argc,char** argv)
|
||||
UImanager->ApplyCommand("/run/verbose 0");
|
||||
runManager->Initialize();
|
||||
UImanager->ApplyCommand("/Step/Verbose 0");
|
||||
|
||||
|
||||
if (ui) // Define UI terminal for interactive mode
|
||||
{
|
||||
{
|
||||
UImanager->ApplyCommand("/control/execute vis.mac");
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
}
|
||||
else // Batch mode
|
||||
{
|
||||
{
|
||||
G4String s=*(argv+1);
|
||||
UImanager->ApplyCommand("/control/execute "+s);
|
||||
}
|
||||
|
||||
|
||||
delete visManager;
|
||||
delete runManager;
|
||||
|
||||
|
||||
timer.Stop();
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
@@ -149,7 +133,7 @@ int main(int argc,char** argv)
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
G4cout << G4endl;
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
#----------------------------------------------------------------------------
|
||||
# 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(gflash2)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -29,19 +29,15 @@
|
||||
//
|
||||
// Created by Joanna Weng 26.11.2004
|
||||
|
||||
// G4 includes
|
||||
// G4 includes
|
||||
#include "G4Types.hh"
|
||||
#include "G4ios.hh"
|
||||
#include "G4Timer.hh"
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
// my project
|
||||
// my project
|
||||
#include "ExGflash2DetectorConstruction.hh"
|
||||
#include "ExGflash2ParallelWorld.hh"
|
||||
#include "ExGflashActionInitialization.hh"
|
||||
@@ -55,7 +51,7 @@
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
{
|
||||
// Instantiate G4UIExecutive if interactive mode
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if ( argc == 1 ) {
|
||||
@@ -65,30 +61,18 @@ int main(int argc,char** argv)
|
||||
// timer to see GFlash performance
|
||||
G4Timer timer;
|
||||
timer.Start();
|
||||
|
||||
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| |"<<G4endl;
|
||||
G4cout<<"| This is an example of Shower |"<<G4endl;
|
||||
G4cout<<"| Parameterization with GFLASH |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
|
||||
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager * runManager = new G4MTRunManager;
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager();
|
||||
runManager->SetNumberOfThreads(1);
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| Constructing MT run manager |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
#else
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| Constructing sequential run manager |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
#endif
|
||||
|
||||
|
||||
// UserInitialization classes (mandatory)
|
||||
G4cout<<"# GFlash Example: Detector Construction"<<G4endl;
|
||||
G4cout<<"# GFlash Example: Detector Construction"<<G4endl;
|
||||
auto detector = new ExGflash2DetectorConstruction();
|
||||
detector->RegisterParallelWorld(new ExGflash2ParallelWorld("parallelWorld"));
|
||||
runManager->SetUserInitialization(detector);
|
||||
@@ -124,22 +108,22 @@ int main(int argc,char** argv)
|
||||
UImanager->ApplyCommand("/run/verbose 0");
|
||||
runManager->Initialize();
|
||||
UImanager->ApplyCommand("/Step/Verbose 0");
|
||||
|
||||
|
||||
if (ui) // Define UI terminal for interactive mode
|
||||
{
|
||||
{
|
||||
UImanager->ApplyCommand("/control/execute vis.mac");
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
}
|
||||
else // Batch mode
|
||||
{
|
||||
{
|
||||
G4String s=*(argv+1);
|
||||
UImanager->ApplyCommand("/control/execute "+s);
|
||||
}
|
||||
|
||||
|
||||
delete visManager;
|
||||
delete runManager;
|
||||
|
||||
|
||||
timer.Stop();
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
@@ -152,7 +136,7 @@ int main(int argc,char** argv)
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
G4cout << G4endl;
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
#----------------------------------------------------------------------------
|
||||
# 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(gflash3)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -29,19 +29,15 @@
|
||||
//
|
||||
// Created by Joanna Weng 26.11.2004
|
||||
|
||||
// G4 includes
|
||||
// G4 includes
|
||||
#include "G4Types.hh"
|
||||
#include "G4ios.hh"
|
||||
#include "G4Timer.hh"
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
// my project
|
||||
// my project
|
||||
#include "ExGflash3DetectorConstruction.hh"
|
||||
#include "ExGflash3ParallelWorld.hh"
|
||||
#include "ExGflashActionInitialization.hh"
|
||||
@@ -56,7 +52,7 @@
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
{
|
||||
// Instantiate G4UIExecutive if interactive mode
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if ( argc == 1 ) {
|
||||
@@ -66,30 +62,18 @@ int main(int argc,char** argv)
|
||||
// timer to see GFlash performance
|
||||
G4Timer timer;
|
||||
timer.Start();
|
||||
|
||||
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| |"<<G4endl;
|
||||
G4cout<<"| This is an example of Shower |"<<G4endl;
|
||||
G4cout<<"| Parameterization with GFLASH |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
|
||||
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager * runManager = new G4MTRunManager;
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager();
|
||||
runManager->SetNumberOfThreads(1);
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| Constructing MT run manager |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
#else
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| Constructing sequential run manager |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
#endif
|
||||
|
||||
|
||||
// UserInitialization classes (mandatory)
|
||||
G4cout<<"# GFlash Example: Detector Construction"<<G4endl;
|
||||
G4cout<<"# GFlash Example: Detector Construction"<<G4endl;
|
||||
auto detector = new ExGflash3DetectorConstruction();
|
||||
detector->RegisterParallelWorld(new ExGflash3ParallelWorld("parallelWorld"));
|
||||
runManager->SetUserInitialization(detector);
|
||||
@@ -126,22 +110,22 @@ int main(int argc,char** argv)
|
||||
UImanager->ApplyCommand("/run/verbose 0");
|
||||
runManager->Initialize();
|
||||
UImanager->ApplyCommand("/Step/Verbose 0");
|
||||
|
||||
|
||||
if (ui) // Define UI terminal for interactive mode
|
||||
{
|
||||
{
|
||||
UImanager->ApplyCommand("/control/execute vis.mac");
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
}
|
||||
else // Batch mode
|
||||
{
|
||||
{
|
||||
G4String s=*(argv+1);
|
||||
UImanager->ApplyCommand("/control/execute "+s);
|
||||
}
|
||||
|
||||
|
||||
delete visManager;
|
||||
delete runManager;
|
||||
|
||||
|
||||
timer.Stop();
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
@@ -154,7 +138,7 @@ int main(int argc,char** argv)
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
G4cout << G4endl;
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
#----------------------------------------------------------------------------
|
||||
# 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(gflasha)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -29,19 +29,15 @@
|
||||
//
|
||||
// Created by Joanna Weng 26.11.2004
|
||||
|
||||
// G4 includes
|
||||
// G4 includes
|
||||
#include "G4Types.hh"
|
||||
#include "G4ios.hh"
|
||||
#include "G4Timer.hh"
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
// my project
|
||||
// my project
|
||||
#include "ExGflashDetectorConstruction.hh"
|
||||
#include "ExGflashActionInitialization.hh"
|
||||
|
||||
@@ -54,7 +50,7 @@
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
{
|
||||
// Instantiate G4UIExecutive if interactive mode
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if ( argc == 1 ) {
|
||||
@@ -64,21 +60,15 @@ int main(int argc,char** argv)
|
||||
// timer to see GFlash performance
|
||||
G4Timer timer;
|
||||
timer.Start();
|
||||
|
||||
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
G4cout<<"| |"<<G4endl;
|
||||
G4cout<<"| This is an example of Shower |"<<G4endl;
|
||||
G4cout<<"| Parameterization with GFLASH |"<<G4endl;
|
||||
G4cout<<"+-------------------------------------------------------+"<<G4endl;
|
||||
|
||||
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager();
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager * runManager = new G4MTRunManager;
|
||||
#else
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
#endif
|
||||
|
||||
// UserInitialization classes (mandatory)
|
||||
ExGflashDetectorConstruction* detector = new ExGflashDetectorConstruction;
|
||||
runManager->SetUserInitialization(detector);
|
||||
@@ -88,7 +78,7 @@ int main(int argc,char** argv)
|
||||
// -- Create a fast simulation physics constructor, used to augment
|
||||
// -- the above physics list to allow for fast simulation:
|
||||
G4FastSimulationPhysics* fastSimulationPhysics = new G4FastSimulationPhysics();
|
||||
|
||||
|
||||
// -- We now configure the fastSimulationPhysics object.
|
||||
// -- The gflash model (GFlashShowerModel, see ExGflashDetectorConstruction.cc)
|
||||
// -- is applicable to e+ and e- : we augment the physics list for these
|
||||
@@ -114,22 +104,22 @@ int main(int argc,char** argv)
|
||||
UImanager->ApplyCommand("/run/verbose 0");
|
||||
runManager->Initialize();
|
||||
UImanager->ApplyCommand("/Step/Verbose 0");
|
||||
|
||||
|
||||
if (ui) // Define UI terminal for interactive mode
|
||||
{
|
||||
{
|
||||
UImanager->ApplyCommand("/control/execute vis.mac");
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
}
|
||||
else // Batch mode
|
||||
{
|
||||
{
|
||||
G4String s=*(argv+1);
|
||||
UImanager->ApplyCommand("/control/execute "+s);
|
||||
}
|
||||
|
||||
|
||||
delete visManager;
|
||||
delete runManager;
|
||||
|
||||
|
||||
timer.Stop();
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
@@ -142,7 +132,7 @@ int main(int argc,char** argv)
|
||||
G4cout << G4endl;
|
||||
G4cout << "******************************************";
|
||||
G4cout << G4endl;
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,9 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
10-Nov-2020 B. Morgan (exgflasha-V10-06-00)
|
||||
- Migration to G4RunManagerFactory.
|
||||
|
||||
28-Oct-2019 I. Hrivnacova (exgflasha-V10-05-01)
|
||||
- Fixed formatting in .README.txt and Doxygen warnings
|
||||
|
||||
|
||||
Reference in New Issue
Block a user