Import Geant4 10.7.0 source tree
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4RunManagerFactory.hh"
|
||||
#include "G4UImanager.hh"
|
||||
#include "FTFP_BERT.hh"
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
{
|
||||
// Detect interactive mode (if no arguments) and define UI session
|
||||
//
|
||||
G4UIExecutive* ui = 0;
|
||||
@@ -59,7 +59,7 @@ int main(int argc,char** argv)
|
||||
|
||||
// Construct the default run manager
|
||||
//
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager(G4RunManagerType::SerialOnly);
|
||||
|
||||
// Set mandatory initialization classes
|
||||
//
|
||||
@@ -67,18 +67,18 @@ int main(int argc,char** argv)
|
||||
runManager->SetUserInitialization(detector);
|
||||
//
|
||||
runManager->SetUserInitialization(new FTFP_BERT);
|
||||
|
||||
|
||||
// set an HistoManager
|
||||
//
|
||||
HistoManager* histo = new HistoManager();
|
||||
|
||||
|
||||
// Set user action classes
|
||||
//
|
||||
PrimaryGeneratorAction* gen_action =
|
||||
PrimaryGeneratorAction* gen_action =
|
||||
new PrimaryGeneratorAction(detector);
|
||||
runManager->SetUserAction(gen_action);
|
||||
//
|
||||
RunAction* run_action = new RunAction(histo);
|
||||
RunAction* run_action = new RunAction(histo);
|
||||
runManager->SetUserAction(run_action);
|
||||
//
|
||||
EventAction* event_action = new EventAction(run_action,histo);
|
||||
@@ -87,11 +87,11 @@ int main(int argc,char** argv)
|
||||
SteppingAction* stepping_action =
|
||||
new SteppingAction(detector, event_action);
|
||||
runManager->SetUserAction(stepping_action);
|
||||
|
||||
|
||||
// Initialize G4 kernel
|
||||
//
|
||||
runManager->Initialize();
|
||||
|
||||
|
||||
// Initialize visualization
|
||||
//
|
||||
G4VisManager* visManager = new G4VisExecutive;
|
||||
@@ -105,18 +105,18 @@ int main(int argc,char** argv)
|
||||
// batch mode
|
||||
G4String command = "/control/execute ";
|
||||
G4String fileName = argv[1];
|
||||
UImanager->ApplyCommand(command+fileName);
|
||||
UImanager->ApplyCommand(command+fileName);
|
||||
}
|
||||
else {
|
||||
else {
|
||||
// interactive mode
|
||||
UImanager->ApplyCommand("/control/execute init_vis.mac");
|
||||
UImanager->ApplyCommand("/control/execute init_vis.mac");
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
||||
// Job termination
|
||||
delete visManager;
|
||||
delete histo;
|
||||
delete histo;
|
||||
delete runManager;
|
||||
|
||||
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(AnaEx03)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -14,6 +14,12 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
13-11-20 B. Morgan (AnaEx03-V10-06-01)
|
||||
- Enforce use of Serial RunManager.
|
||||
|
||||
10-11-20 B. Morgan (AnaEx03-V10-06-00)
|
||||
- Migration to G4RunManagerFactory.
|
||||
|
||||
26-11-19 I. Hrivnacova (AnaEx03-V10-05-00)
|
||||
- Fixed Doxygen warning
|
||||
|
||||
@@ -23,7 +29,7 @@ track of all tags.
|
||||
05-07-18 I. Hrivnacova (AnaEx03-V10-04-00)
|
||||
- Macro & commands review:
|
||||
- Removed obsolete /N03 top command directory
|
||||
- Added protection against warnings issued from ReinitializeGeometry() if
|
||||
- Added protection against warnings issued from ReinitializeGeometry() if
|
||||
called in PreInit phase
|
||||
- Added test for all commands defined in this example in AnaEx01.in
|
||||
- Updated README files
|
||||
@@ -45,11 +51,11 @@ track of all tags.
|
||||
|
||||
28-08-15 I. Hrivnacova (AnaEx03-V10-01-01)
|
||||
- Fixed compilation on Windows
|
||||
|
||||
|
||||
27-08-15 I. Hrivnacova (AnaEx03-V10-01-00)
|
||||
- Introduced meaningful histograms and ntuple names instead of numbers
|
||||
in all AnaEx0N examples and use histogram ids starting from 0
|
||||
- Simplified HistoManager classes and fixed function names to follow
|
||||
in all AnaEx0N examples and use histogram ids starting from 0
|
||||
- Simplified HistoManager classes and fixed function names to follow
|
||||
coding guidelines
|
||||
- Removed G4ANALYSIS_USE ifdefs from AnaEx03, as this example is now build
|
||||
only with AIDA
|
||||
@@ -61,16 +67,16 @@ track of all tags.
|
||||
05-11-14 I. Hrivnacova (AnaEx03-V10-00-03)
|
||||
- Including shared directory directly in the example
|
||||
to avoid out-of-project sources
|
||||
- based on analysisShared-V10-00-00
|
||||
- based on analysisShared-V10-00-00
|
||||
- Adding utility scripts for GNUmake build (much simpler replacement
|
||||
for scripts from common) \
|
||||
- based on analysisScripts-V10-00-00
|
||||
- based on analysisScripts-V10-00-00
|
||||
|
||||
13-08-14 mma (AnaEx03-V10-00-02)
|
||||
- update Readme and .Readme again
|
||||
|
||||
12-08-14 mma (AnaEx03-V10-00-01)
|
||||
- restaure calorimeter drawing in Readme and .Readme
|
||||
- restaure calorimeter drawing in Readme and .Readme
|
||||
|
||||
11-06-14 I. Hrivnacova (AnaEx03-V10-00-00)
|
||||
- Fixed path to copy_files.sh, clean_files.sh in GNUmalefile
|
||||
@@ -79,44 +85,44 @@ track of all tags.
|
||||
- Fixed SharedFilesList.txt - removed PhysicList class
|
||||
|
||||
28-05-14 I. Hrivnacova
|
||||
- Use Geant4 physics list (FTFP_BERT) in AnaEx01,02,03,
|
||||
- Use Geant4 physics list (FTFP_BERT) in AnaEx01,02,03,
|
||||
removed PhysicList class from shared
|
||||
(tag in examples/analysis)
|
||||
|
||||
13-11-12 I. Hrivnacova (AnaEx03-V09-05-05)
|
||||
|
||||
13-11-12 I. Hrivnacova (AnaEx03-V09-05-05)
|
||||
- Fixed order of instatiating G4VisExecutive and G4UIExecutive
|
||||
(required when Qt driver is activated).
|
||||
|
||||
03-09-12 I. Hrivnacova (AnaEx03-V09-05-04)
|
||||
03-09-12 I. Hrivnacova (AnaEx03-V09-05-04)
|
||||
- New tag to be synchronized with the update in tests/ctest;
|
||||
no changes in the example itself
|
||||
no changes in the example itself
|
||||
|
||||
31-08-12 I. Hrivnacova (AnaEx03-V09-05-03)
|
||||
31-08-12 I. Hrivnacova (AnaEx03-V09-05-03)
|
||||
- Updated CMakeLists.tx:
|
||||
adding install target, minor fixes
|
||||
- Added .README
|
||||
- UseOpenScientist.txt, InstallAida.txt moved in A01
|
||||
- UseOpenScientist.txt, InstallAida.txt moved in A01
|
||||
(as README.AIDA, README.OpenScientist)
|
||||
|
||||
21 June 2012 Ivana Hrivnacova (AnaEx03-V09-05-02)
|
||||
- Updated CMakeLists.txt to get FindAIDA.cmake module found
|
||||
21 June 2012 Ivana Hrivnacova (AnaEx03-V09-05-02)
|
||||
- Updated CMakeLists.txt to get FindAIDA.cmake module found
|
||||
by CMake automatically
|
||||
|
||||
21 June 2012 Ivana Hrivnacova (AnaEx03-V09-05-01)
|
||||
|
||||
21 June 2012 Ivana Hrivnacova (AnaEx03-V09-05-01)
|
||||
- Added AIDA support in CMake build
|
||||
|
||||
15 June 2012 Gabriele Cosmo (AnaEx03-V09-05-00)
|
||||
15 June 2012 Gabriele Cosmo (AnaEx03-V09-05-00)
|
||||
- Fixed compilation warnings in case analysis is not used...
|
||||
|
||||
16 April 2012 Ivana Hrivnacova
|
||||
- Restored AnaEx01 example with AIDA under new name AnaEx03.
|
||||
|
||||
07 June 2011 mma (AnaEx01-V09-04-01)
|
||||
07 June 2011 mma (AnaEx01-V09-04-01)
|
||||
- PhysicsList migrated to new scheme G4PhysListHelper
|
||||
|
||||
|
||||
03 February 2011 mma (AnaEx01-V09-04-00)
|
||||
- delete subdirectory analysis
|
||||
|
||||
|
||||
08 November 2010 Michel Maire (AnaEx01-V09-03-00)
|
||||
- revised version of example :
|
||||
class HistoManager to replace AnaEx01AnalysisManager
|
||||
@@ -130,7 +136,7 @@ track of all tags.
|
||||
In fact the analysis directory should not be distributed anymore.
|
||||
- have a run.mac in the main example directory.
|
||||
- AnaEx01AnalysisManager : arrange to have histo and tuple name
|
||||
as interger in case of hbook file format.
|
||||
as interger in case of hbook file format.
|
||||
|
||||
5 March 2009 Guy Barrand
|
||||
- GNUmakefile : remove the G4ANALYSIS_USE logic found in this file, since
|
||||
|
||||
Reference in New Issue
Block a user