lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 9.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/advanced/gammaray_telescope/CMakeLists.txt
+79 -8
View File
@@ -1,14 +1,85 @@
#----------------------------------------------------------------------------
# Setup the project
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
project(gammaray_telescope)
set(name GammaRayTel)
project(${name})
find_package(Geant4 REQUIRED)
#----------------------------------------------------------------------------
# Find Geant4 package, activating all available UI and Vis drivers by default
# You can set WITH_GEANT4_UIVIS to OFF via the command line or ccmake/cmake-gui
# to build a batch mode only executable
#
option(WITH_GEANT4_UIVIS "Build example with Geant4 UI and Vis drivers" ON)
if(WITH_GEANT4_UIVIS)
find_package(Geant4 REQUIRED ui_all vis_all)
else()
find_package(Geant4 REQUIRED)
endif()
#----------------------------------------------------------------------------
# Setup Geant4 include directories and compile definitions
#
include(${Geant4_USE_FILE})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${Geant4_INCLUDE_DIR})
file(GLOB sources ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cc)
#----------------------------------------------------------------------------
# Find AIDA (optional package)
#
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
find_package(AIDA QUIET)
if(AIDA_FOUND)
message(STATUS "G4 Examples: AIDA found. --> gammaray_telescope example with AIDA enabled.")
add_definitions(-DG4ANALYSIS_USE)
else()
message(STATUS "G4 Example: AIDA not found --> gammaray_telescope example with AIDA disabled.")
endif()
add_executable(${name} EXCLUDE_FROM_ALL ${name}.cc ${sources})
target_link_libraries(${name} ${Geant4_LIBRARIES})
#----------------------------------------------------------------------------
# Add option to control storage
#
option(G4STORE_DATA "Stores output data" OFF)
if(G4STORE_DATA)
add_definitions(-DG4STORE_DATA)
endif()
#----------------------------------------------------------------------------
# Locate sources and headers for this project
#
include_directories(${PROJECT_SOURCE_DIR}/include
${Geant4_INCLUDE_DIR}
${AIDA_INCLUDE_DIR})
file(GLOB sources ${PROJECT_SOURCE_DIR}/src/*.cc)
file(GLOB headers ${PROJECT_SOURCE_DIR}/include/*.hh)
#----------------------------------------------------------------------------
# Add the executable, and link it to the Geant4 libraries
#
add_executable(GammaRayTel GammaRayTel.cc ${sources} ${headers})
target_link_libraries(GammaRayTel ${Geant4_LIBRARIES} ${AIDA_LIBRARIES} )
#----------------------------------------------------------------------------
# Copy all scripts to the build directory, i.e. the directory in which we
# build gammaray_telescope. This is so that we can run the executable directly because it
# relies on these scripts being in the current working directory.
#
set(gammaray_telescope_SCRIPTS
emlowe.mac emstd.mac gammaraytel.in gammaraytel.out macro1.mac macro2.mac macro3.mac macro4.mac macro5.mac prerunGammaRayTel.mac
)
foreach(_script ${gammaray_telescope_SCRIPTS})
configure_file(
${PROJECT_SOURCE_DIR}/${_script}
${PROJECT_BINARY_DIR}/${_script}
COPYONLY
)
endforeach()
#----------------------------------------------------------------------------
# Add program to the project targets
# (this avoids the need of typing the program name after make)
#
add_custom_target(gammaray_telescope DEPENDS GammaRayTel)
#----------------------------------------------------------------------------
# Install the executable to 'bin' directory under CMAKE_INSTALL_PREFIX
#
install(TARGETS GammaRayTel DESTINATION bin)
configure_file(emstd.mac emstd.mac COPYONLY)
examples/advanced/gammaray_telescope/GNUmakefile
+1 -1
View File
@@ -15,7 +15,7 @@ endif
all: had_list lib bin
had_list:
@echo "Gamma Ray Tel Advanced example"
@echo "Gamma-Ray Telescope advanced example"
include $(G4INSTALL)/config/binmake.gmk
examples/advanced/gammaray_telescope/GammaRayTel.cc
+29 -41
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTel.cc,v 1.19 2010-11-11 17:42:50 stesting Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
@@ -38,32 +37,32 @@
// See README file for details on this example
// 20.11.01 G.Santin: new analysis management, and some modification in the
// construction of some Action's
// ************************************************************
// ************************************************************
#include "G4RunManager.hh"
#include "G4UImanager.hh"
#include "G4UImanager.hh"
#ifdef G4VIS_USE
#include "G4VisExecutive.hh"
#endif
#endif
#ifdef G4UI_USE
#include "G4UIExecutive.hh"
#endif
#include "GammaRayTelDetectorConstruction.hh"
#include "GammaRayTelPhysicsList.hh"
#include "GammaRayTelPrimaryGeneratorAction.hh"
#include "GammaRayTelRunAction.hh"
#include "GammaRayTelEventAction.hh"
#include "QGSP_BIC.hh"
//#include "QGSP_BIC.hh"
#include "FTFP_BERT.hh"
#ifdef G4ANALYSIS_USE
#include "GammaRayTelAnalysis.hh"
#endif
/* This global file is used to store relevant data for
analysis with external tools */
std::ofstream outFile;
@@ -72,34 +71,35 @@ std::ofstream outFile;
int main(int argc, char** argv)
{
// Construct the default run manager
G4RunManager* runManager = new G4RunManager;
G4RunManager* runManager = new G4RunManager;
// Set mandatory user initialization classes
GammaRayTelDetectorConstruction* detector =
new GammaRayTelDetectorConstruction;
runManager->SetUserInitialization(detector);
// POSSIBILITY TO SELECT ANOTHER PHYSICS LIST
// do not use GammaRayTelPhysicsList, this is old style and crashes at
// program exit
//runManager->SetUserInitialization(new GammaRayTelPhysicsList);
// runManager->SetUserInitialization(new QGSP_BIC);
runManager->SetUserInitialization(new FTFP_BERT);
runManager->SetUserInitialization(new QGSP_BIC);
// Set mandatory user action classes
runManager->SetUserAction(new GammaRayTelPrimaryGeneratorAction);
#ifdef G4ANALYSIS_USE
// Creation of the analysis manager
GammaRayTelAnalysis* analysis = GammaRayTelAnalysis::getInstance();
#endif
// Set optional user action classes
GammaRayTelEventAction* eventAction = new GammaRayTelEventAction();
GammaRayTelRunAction* runAction = new GammaRayTelRunAction();
runManager->SetUserAction(eventAction);
runManager->SetUserAction(runAction);
// Set visualization and user interface
#ifdef G4VIS_USE
// Visualization manager
@@ -112,37 +112,25 @@ int main(int argc, char** argv)
// Get the pointer to the UI manager
G4UImanager* UImanager = G4UImanager::GetUIpointer();
#ifdef G4UI_USE
G4UIExecutive* ui = 0;
ui = new G4UIExecutive(argc, argv);
if (ui)
if (argc!=1) // batch mode
{
G4String command = "/control/execute ";
G4String fileName = argv[1];
UImanager->ApplyCommand(command+fileName);
}
else
{
/* prerunGammaRayTel.mac is loaded by default
unless a macro file is passed as the argument
of the executable */
if(argc>1)
{
#endif
G4String command = "/control/execute ";
for (int i=2; i<=argc; i++)
{
G4String macroFileName = argv[i-1];
UImanager->ApplyCommand(command+macroFileName);
}
#ifdef G4UI_USE
}
else
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
if (ui->IsGUI())
{
/* prerunGammaRayTel.mac is loaded by default */
UImanager->ApplyCommand("/control/execute prerunGammaRayTel.mac");
ui->SessionStart();
}
delete ui;
}
#endif
}
// Job termination
#ifdef G4VIS_USE
delete visManager;
examples/advanced/gammaray_telescope/History
+26 -1
View File
@@ -9,6 +9,32 @@ $Id: History,v 1.11 2010-11-11 17:43:55 gunter Exp $
History file
------------
07.11.2012 L. Pandola and F. Longo, Tag: gammaraytel-V09-05-05
Change the logic of the UI/GUI instantiation in the main(),
to avoid problems observed in the STT when running in batch
mode. Minor change in the CMakeLists.txt
02.11.2012 L. Pandola, Tag: gammaraytel-V09-05-04
Remove warnings due to two G4Regions without their own
cut. Change physics list from QGSP_BIC to FTFP_BERT, to
avoid warnings due to the deprecated LEP models.
Removed gammaraytel.err file.
31.10.2012 L. Pandola and F. Longo, Tag: gammaraytel-V09-05-03
Edit the CMakeLists.txt file to fix the AIDA dependency
and to properly treat the G4STORE_DATA option
30.10.2012 Luciano Pandola, Tag gammaraytel-V09-05-02
Comment out /vis/viewer/update at the EndOfRun (avoids a warning)
Comment out in gammaraytel.in a command which is no
longer defined
25.10.2012 Luciano Pandola, Tag: gammaraytel-V09-05-01
Replace CMakeLists.txt to deal with UI/VIS
11.10.2012 Gabriele Cosmo, Tag: gammaraytel-V09-05-00
Explicit inclusion of units and constants headers.
03.10.2011 Gunter Folger, Tag: gammaraytel-V09-04-03
Fix compilation warnings from gcc 4.6 in GammaRayTelEventAction.cc,
GammaRayTelDetectorConstruction.cc and GammaRayTelTrackerROGeometry.cc
@@ -16,7 +42,6 @@ $Id: History,v 1.11 2010-11-11 17:43:55 gunter Exp $
16.09.2011 Pere Mato, Tag: gammaraytel-V09-04-02
Added SVN eol property to file gammaraytel.err to allow proper file comparissons
16.09.2011 Pere Mato, Tag: gammaraytel-V09-04-01
Fixed the error introduced with G4USE_UI conditional code
Added file gammaraytel.err with the expected error output
examples/advanced/gammaray_telescope/gammaraytel.err
-9
View File
@@ -1,9 +0,0 @@
***** COMMAND NOT FOUND </physics/addPhysics Standard EM> *****
***** Batch is interrupted!! *****
Warning : Region <Calorimeter> does not have specific production cuts,
even though it appears in the current tracking world.
Default cuts are used for this region.
Warning : Region <Tracker> does not have specific production cuts,
even though it appears in the current tracking world.
Default cuts are used for this region.
examples/advanced/gammaray_telescope/gammaraytel.in
+1 -1
View File
@@ -7,7 +7,7 @@
/control/saveHistory
/run/verbose 1
/gun/sourceGen true
/control/execute emstd.mac
#/control/execute emstd.mac
/run/initialize
examples/advanced/gammaray_telescope/gammaraytel.out
+4961 -4869
View File
File diff suppressed because it is too large Load Diff
examples/advanced/gammaray_telescope/include/GammaRayTelAnalysis.hh
+1 -2
View File
@@ -25,8 +25,7 @@
//
#ifdef G4ANALYSIS_USE
//
// $Id: GammaRayTelAnalysis.hh,v 1.18 2006-06-29 15:54:51 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelAnalysisMessenger.hh,v 1.4 2006-06-29 15:54:54 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class header file
examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelAnticoincidenceHit.hh,v 1.3 2006-06-29 15:54:57 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelAnticoincidenceSD.hh,v 1.5 2006-06-29 15:55:00 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelCalorimeterHit.hh,v 1.3 2006-06-29 15:55:03 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelCalorimeterSD.hh,v 1.5 2006-06-29 15:55:06 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh
+3 -4
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDetectorConstruction.hh,v 1.10 2006-06-29 15:55:09 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
@@ -268,8 +267,8 @@ private:
GammaRayTelCalorimeterSD* calorimeterSD; //pointer to the sensitive detector
GammaRayTelAnticoincidenceSD* anticoincidenceSD; //pointer to the sensitive detector
G4Region* aTKRRegion; // TKR cut region
G4Region* aCALRegion; // CAL cut region
//G4Region* aTKRRegion; // TKR cut region
//G4Region* aCALRegion; // CAL cut region
private:
examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDetectorMessenger.hh,v 1.4 2006-06-29 15:55:12 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class header file
examples/advanced/gammaray_telescope/include/GammaRayTelDigi.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDigi.hh,v 1.3 2006-06-29 15:55:15 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelDigitizer.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDigitizer.hh,v 1.4 2006-06-29 15:55:18 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelDigitizerMessenger.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDigitizerMessenger.hh,v 1.2 2006-06-29 15:55:21 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh
+1 -2
View File
@@ -25,8 +25,7 @@
//
//
// $Id: GammaRayTelDummySD.hh,v 1.6 2006-06-29 15:55:24 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelEMlowePhysics.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelEMlowePhysics.hh,v 1.1 2009-11-18 15:57:21 flongo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
examples/advanced/gammaray_telescope/include/GammaRayTelEMstdPhysics.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelEMstdPhysics.hh,v 1.1 2009-11-18 15:57:21 flongo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelEventAction.hh,v 1.10 2006-06-29 15:55:29 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelGeneralPhysics.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelGeneralPhysics.hh,v 1.2 2006-06-29 15:55:32 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
examples/advanced/gammaray_telescope/include/GammaRayTelHadronPhysics.hh
+1 -2
View File
@@ -23,8 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: GammaRayTelHadronPhysics.hh,v 1.5 2010-11-11 17:25:01 stesting Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class header file
examples/advanced/gammaray_telescope/include/GammaRayTelIonPhysics.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelIonPhysics.hh,v 1.3 2010-11-11 17:25:01 stesting Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
examples/advanced/gammaray_telescope/include/GammaRayTelMuonPhysics.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelMuonPhysics.hh,v 1.3 2010-11-11 17:25:01 stesting Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelPrimaryGeneratorAction.hh,v 1.8 2006-06-29 15:55:49 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class header file
examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelPrimaryGeneratorMessenger.hh,v 1.5 2006-06-29 15:55:52 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelRunAction.hh,v 1.6 2006-06-29 15:55:55 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelTrackerHit.hh,v 1.3 2006-06-29 15:55:58 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelTrackerROGeometry.hh,v 1.5 2006-06-29 15:56:01 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelTrackerSD.hh,v 1.5 2006-06-29 15:56:04 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class header file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/src/GammaRayTelAnalysis.cc
+1 -2
View File
@@ -25,8 +25,7 @@
//
#ifdef G4ANALYSIS_USE
//
// $Id: GammaRayTelAnalysis.cc,v 1.22 2010-11-10 00:15:42 asaim Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelAnalysisMessenger.cc,v 1.9 2006-06-29 15:56:10 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelAnticoincidenceHit.cc,v 1.5 2010-11-11 17:25:01 stesting Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc
+2 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelAnticoincidenceSD.cc,v 1.6 2006-06-29 15:56:15 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -40,6 +39,7 @@
#include "GammaRayTelAnticoincidenceHit.hh"
#include "GammaRayTelDetectorConstruction.hh"
#include "G4SystemOfUnits.hh"
#include "G4VPhysicalVolume.hh"
#include "G4Step.hh"
#include "G4VTouchable.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelCalorimeterHit.cc,v 1.5 2010-11-11 17:25:01 stesting Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc
+2 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelCalorimeterSD.cc,v 1.7 2006-06-29 15:56:19 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -40,6 +39,7 @@
#include "GammaRayTelCalorimeterHit.hh"
#include "GammaRayTelDetectorConstruction.hh"
#include "G4SystemOfUnits.hh"
#include "G4VPhysicalVolume.hh"
#include "G4Step.hh"
#include "G4VTouchable.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc
+19 -17
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDetectorConstruction.cc,v 1.15 2006-06-29 15:56:22 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -47,6 +46,8 @@
#include "GammaRayTelAnticoincidenceSD.hh"
#include "GammaRayTelCalorimeterSD.hh"
#include "G4PhysicalConstants.hh"
#include "G4SystemOfUnits.hh"
#include "G4Material.hh"
#include "G4Box.hh"
#include "G4LogicalVolume.hh"
@@ -83,8 +84,8 @@ GammaRayTelDetectorConstruction::GammaRayTelDetectorConstruction()
solidCALDetectorY(0),logicCALDetectorY(0),physiCALDetectorY(0),
solidPlane(0),logicPlane(0),physiPlane(0),
solidConverter(0),logicConverter(0),physiConverter(0),
trackerSD(0),calorimeterSD(0),anticoincidenceSD(0),
aTKRRegion(0), aCALRegion(0)
trackerSD(0),calorimeterSD(0),anticoincidenceSD(0)
// aTKRRegion(0), aCALRegion(0)
{
// default parameter values of the payload
@@ -681,19 +682,20 @@ G4VPhysicalVolume* GammaRayTelDetectorConstruction::ConstructPayload()
// Cuts by Regions
G4String regName[] = {"Calorimeter","Tracker"};
if (aCALRegion) delete aCALRegion;
aCALRegion = new G4Region(regName[0]);
logicCAL->SetRegion(aCALRegion);
aCALRegion->AddRootLogicalVolume(logicCAL);
if (aTKRRegion) delete aTKRRegion;
aTKRRegion = new G4Region(regName[1]);
logicTKR->SetRegion(aTKRRegion);
aTKRRegion->AddRootLogicalVolume(logicTKR);
/*
G4String regName[] = {"Calorimeter","Tracker"};
if (aCALRegion) delete aCALRegion;
aCALRegion = new G4Region(regName[0]);
logicCAL->SetRegion(aCALRegion);
aCALRegion->AddRootLogicalVolume(logicCAL);
if (aTKRRegion) delete aTKRRegion;
aTKRRegion = new G4Region(regName[1]);
logicTKR->SetRegion(aTKRRegion);
aTKRRegion->AddRootLogicalVolume(logicTKR);
*/
//Sensitive Detector Manager
examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDetectorMessenger.cc,v 1.8 2006-06-29 15:56:25 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
examples/advanced/gammaray_telescope/src/GammaRayTelDigi.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDigi.cc,v 1.5 2006-06-29 15:56:28 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/src/GammaRayTelDigitizer.cc
+4 -5
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDigitizer.cc,v 1.6 2006-06-29 15:56:31 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -36,6 +35,8 @@
//
// ************************************************************
#include <vector>
#include "GammaRayTelDigitizer.hh"
#include "GammaRayTelDigi.hh"
#include "GammaRayTelDigitizerMessenger.hh"
@@ -44,15 +45,13 @@
#include "GammaRayTelCalorimeterHit.hh"
#include "GammaRayTelAnticoincidenceHit.hh"
#include "G4SystemOfUnits.hh"
#include "G4EventManager.hh"
#include "G4Event.hh"
#include "G4SDManager.hh"
#include "G4DigiManager.hh"
#include "G4ios.hh"
//#include "G4CollectionNameVector.hh"
#include <vector>
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
GammaRayTelDigitizer::GammaRayTelDigitizer(G4String name)
examples/advanced/gammaray_telescope/src/GammaRayTelDigitizerMessenger.cc
+2 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelDigitizerMessenger.cc,v 1.5 2006-06-29 15:56:34 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -42,6 +41,7 @@
#include "GammaRayTelDigitizerMessenger.hh"
#include "GammaRayTelDigitizer.hh"
#include "G4SystemOfUnits.hh"
#include "G4UIcmdWithADoubleAndUnit.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
examples/advanced/gammaray_telescope/src/GammaRayTelEMlowePhysics.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelEMlowePhysics.cc,v 1.1 2009-11-18 15:59:05 flongo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
examples/advanced/gammaray_telescope/src/GammaRayTelEMstdPhysics.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelEMstdPhysics.cc,v 1.1 2009-11-18 15:59:05 flongo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc
+2 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelEventAction.cc,v 1.20 2010-06-06 06:18:54 perl Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -49,6 +48,7 @@
#include "GammaRayTelAnalysis.hh"
#endif
#include "G4SystemOfUnits.hh"
#include "G4Event.hh"
#include "G4EventManager.hh"
#include "G4HCofThisEvent.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelHadronPhysics.cc
+5 -4
View File
@@ -24,15 +24,16 @@
// ********************************************************************
//
//
// $Id: GammaRayTelHadronPhysics.cc,v 1.4 2006-06-29 15:56:45 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
#include <iomanip>
#include "GammaRayTelHadronPhysics.hh"
#include "G4ShortLivedConstructor.hh"
#include "globals.hh"
#include "G4ios.hh"
#include <iomanip>
#include "G4SystemOfUnits.hh"
#include "G4ShortLivedConstructor.hh"
GammaRayTelHadronPhysics::GammaRayTelHadronPhysics(const G4String& name)
examples/advanced/gammaray_telescope/src/GammaRayTelIonPhysics.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelIonPhysics.cc,v 1.4 2006-06-29 15:56:48 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
examples/advanced/gammaray_telescope/src/GammaRayTelMuonPhysics.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelMuonPhysics.cc,v 1.8 2008-11-24 15:10:47 cirrone Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
#include "GammaRayTelMuonPhysics.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc
+3 -3
View File
@@ -24,14 +24,15 @@
// ********************************************************************
//
//
// $Id: GammaRayTelPhysicsList.cc,v 1.9 2010-11-12 08:28:54 flongo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
#include <iomanip>
#include "GammaRayTelPhysicsList.hh"
#include "globals.hh"
#include "G4SystemOfUnits.hh"
#include "G4ParticleDefinition.hh"
#include "G4ParticleWithCuts.hh"
#include "G4ProcessManager.hh"
@@ -42,7 +43,6 @@
#include "G4Material.hh"
#include "G4MaterialTable.hh"
#include "G4ios.hh"
#include <iomanip>
#include "GammaRayTelParticles.hh"
#include "GammaRayTelGeneralPhysics.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.11 2007-11-09 16:33:34 flongo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -45,6 +44,8 @@
#include "GammaRayTelDetectorConstruction.hh"
#include "GammaRayTelPrimaryGeneratorMessenger.hh"
#include "G4PhysicalConstants.hh"
#include "G4SystemOfUnits.hh"
#include "G4Event.hh"
#include "G4ParticleGun.hh"
#include "G4GeneralParticleSource.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc
+2 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelPrimaryGeneratorMessenger.cc,v 1.8 2006-06-29 15:57:01 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -42,6 +41,7 @@
#include "GammaRayTelPrimaryGeneratorMessenger.hh"
#include "GammaRayTelPrimaryGeneratorAction.hh"
#include "G4SystemOfUnits.hh"
#include "G4UIcmdWithAnInteger.hh"
#include "G4UIcmdWithAString.hh"
#include "G4UIcmdWithADoubleAndUnit.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelRunAction.cc,v 1.11 2006-06-29 15:57:04 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
@@ -105,10 +104,12 @@ void GammaRayTelRunAction::EndOfRunAction(const G4Run* aRun)
G4cout << "End of Run " << G4endl;
G4cout << "File " << name << G4endl;
/*
// Run ended, update the visualization
if (G4VVisManager::GetConcreteInstance()) {
G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
}
*/
// Close the file with the hits information
#ifdef G4STORE_DATA
examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelTrackerHit.cc,v 1.5 2010-11-11 17:25:01 stesting Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
// ------------------------------------------------------------
// GEANT 4 class implementation file
// CERN Geneva Switzerland
examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc
+2 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: GammaRayTelTrackerROGeometry.cc,v 1.6 2006-06-29 15:57:10 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// ------------------------------------------------------------
@@ -42,6 +41,7 @@
#include "GammaRayTelDummySD.hh"
#include "GammaRayTelDetectorConstruction.hh"
#include "G4SystemOfUnits.hh"
#include "G4LogicalVolume.hh"
#include "G4VPhysicalVolume.hh"
#include "G4PVPlacement.hh"
examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc
+1
View File
@@ -39,6 +39,7 @@
#include "GammaRayTelTrackerHit.hh"
#include "GammaRayTelDetectorConstruction.hh"
#include "G4SystemOfUnits.hh"
#include "G4VPhysicalVolume.hh"
#include "G4Step.hh"