Import Geant4 10.7.0 source tree
This commit is contained in:
Gabriele Cosmo
@@ -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(nanobeam)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
@@ -23,11 +26,11 @@ include(${Geant4_USE_FILE})
|
||||
if(Geant4_builtin_clhep_FOUND)
|
||||
message(STATUS "G4 Examples: CLHEP external package not found --> nanobeam disabled")
|
||||
return()
|
||||
endif()
|
||||
endif()
|
||||
#----------------------------------------------------------------------------
|
||||
# Locate sources and headers for this project
|
||||
#
|
||||
include_directories(${PROJECT_SOURCE_DIR}/include
|
||||
include_directories(${PROJECT_SOURCE_DIR}/include
|
||||
${Geant4_INCLUDE_DIR})
|
||||
file(GLOB sources ${PROJECT_SOURCE_DIR}/src/*.cc)
|
||||
file(GLOB headers ${PROJECT_SOURCE_DIR}/include/*.hh)
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
|
||||
Package History file
|
||||
--------------------
|
||||
15 Nov 2020 - S. Guatelli tag nanobeam-V10-06-01
|
||||
- Migration to G4RunManagerFactory
|
||||
|
||||
02 Nov 2020 - B.Morgan tag nanobeam-V10-06-00
|
||||
- Support same CMake version range as core Geant4
|
||||
|
||||
19 Nov 2019 - G. Folger tag nanobeam-V10-05-01
|
||||
- remove using namespace std from header file TabulatedField3D.hh
|
||||
@@ -97,15 +102,15 @@
|
||||
- Coding style cleaning
|
||||
|
||||
29 May 2013 - tag nanobeam-V09-06-03 -L. Pandola
|
||||
- Migrate analysis from AIDA (in a singleton class) to the
|
||||
g4analysis tools. AIDA dependency is removed. Output file is
|
||||
- Migrate analysis from AIDA (in a singleton class) to the
|
||||
g4analysis tools. AIDA dependency is removed. Output file is
|
||||
unchanged (still a ROOT file named nanobeam.root)
|
||||
|
||||
7 May 2013 - tag nanobeam-V09-06-02 - S. Incerti, B. Morgan
|
||||
- Updated CMakeLists.txt thanks to Ben (example requires external CLHEP)
|
||||
|
||||
8 March 2013 - tag nanobeam-V09-06-01 - A. Dotti
|
||||
- Adding protection in case Geant4 is build with internal CLHEP
|
||||
- Adding protection in case Geant4 is build with internal CLHEP
|
||||
(example requires external CLHEP)
|
||||
|
||||
4 December 2012 - tag nanobeam-V09-06-00 - G. Cosmo
|
||||
@@ -115,10 +120,10 @@ unchanged (still a ROOT file named nanobeam.root)
|
||||
- Fixed compilation warning and corrected CMakeLists.txt
|
||||
|
||||
3 November 2012 - tag nanobeam-V09-05-05 - S. Incerti
|
||||
- Removed shadowing in SteppingAction and TabulatedField3D
|
||||
- Removed shadowing in SteppingAction and TabulatedField3D
|
||||
|
||||
1 November 2012 - tag nanobeam-V09-05-04 - S. Incerti
|
||||
- Switched to touchables
|
||||
- Switched to touchables
|
||||
|
||||
26 October 2012 - tag nanobeam-V09-05-03 - L. Pandola
|
||||
- Changed CMakeLists.txt to deal with UI and AIDA
|
||||
@@ -132,10 +137,10 @@ unchanged (still a ROOT file named nanobeam.root)
|
||||
12 October 2012 - tag nanobeam-V09-05-00 - G. Cosmo
|
||||
- Explicit inclusion of units and constants headers.
|
||||
|
||||
05 November 2011- tag nanobeam-V09-04-06 - S. Incerti
|
||||
05 November 2011- tag nanobeam-V09-04-06 - S. Incerti
|
||||
- removed export=root option in HistoManager.cc
|
||||
|
||||
03 October 2011- tag nanobeam-V09-04-05 - G. Folger
|
||||
03 October 2011- tag nanobeam-V09-04-05 - G. Folger
|
||||
- fix compilation warnings from gcc46 in TabulatedField3D.cc
|
||||
|
||||
19 August 2011- tag nanobeam-V09-04-04 - S. Incerti
|
||||
@@ -172,11 +177,11 @@ unchanged (still a ROOT file named nanobeam.root)
|
||||
- updated multiple scattering class for e+- and mu
|
||||
|
||||
2-March 2009 - tag nanobeam-V09-02-01 - G.Folger
|
||||
- correct for gcc4.3/slc5 warning
|
||||
- correct for gcc4.3/slc5 warning
|
||||
|
||||
26 February 2009 - tag nanobeam-V09-02-00 - G.Folger
|
||||
- Correct TabulatedField3D.cc to use logical AND (&&) in few if()
|
||||
|
||||
|
||||
21 June 2008 - tag nanobeam-V09-01-11 - S. Incerti
|
||||
- several tags to try to resolve conflict with system testing
|
||||
|
||||
|
||||
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
+4
-14
@@ -27,12 +27,7 @@
|
||||
// Nucl.Instrum.Meth.B260:20-27, 2007
|
||||
|
||||
#include "G4Types.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
#include "G4MTRunManager.hh"
|
||||
#else
|
||||
#include "G4RunManager.hh"
|
||||
#endif
|
||||
#include "G4RunManagerFactory.hh"
|
||||
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
@@ -48,20 +43,15 @@ int main(int argc,char** argv) {
|
||||
|
||||
// Construct the default run manager
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager* runManager = new G4MTRunManager;
|
||||
auto* runManager = G4RunManagerFactory::CreateRunManager();
|
||||
G4int nThreads = 1;
|
||||
runManager->SetNumberOfThreads(nThreads);
|
||||
|
||||
// Use only one thread for aberration coefficient calculation ("coef*" macros)
|
||||
//
|
||||
// For high statistics (no aberration coefficient calculation, "image*" & "grid*" macros),
|
||||
// switch to more threads
|
||||
|
||||
runManager->SetNumberOfThreads(1);
|
||||
|
||||
#else
|
||||
G4RunManager* runManager = new G4RunManager;
|
||||
#endif
|
||||
|
||||
// Set mandatory initialization classes
|
||||
|
||||
DetectorConstruction* detector = new DetectorConstruction;
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Forcing G4RunManager type...
|
||||
|
||||
############################################
|
||||
!!! WARNING - FPE detection is activated !!!
|
||||
############################################
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-10-06-ref-04 (30-April-2020)
|
||||
Geant4 version Name: geant4-10-07-ref-00 (4-December-2020)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -16,7 +17,7 @@
|
||||
|
||||
***** Table : Nb of materials = 1 *****
|
||||
|
||||
Material: Vacuum density: 0.000 kg/m3 RadL: 204310101.835 pc Nucl.Int.Length: 113427275.267 pc
|
||||
Material: Vacuum density: 0.000 mg/cm3 RadL: 204310098.490 pc Nucl.Int.Length: 113427284.261 pc
|
||||
Imean: 19.200 eV temperature: 293.15 K pressure: 1.00 atm
|
||||
|
||||
---> Element: H (H) Z = 1.0 N = 1 A = 1.008 g/mole
|
||||
@@ -36,14 +37,13 @@
|
||||
G2 (T/m) = 16.4947
|
||||
G3 (T/m) = 9.86677
|
||||
G4 (T/m) = -6.24449
|
||||
G4ChordFinder: Creating G4MagInt_Driver with stepMinimum = 1e-06 numVar= 6
|
||||
PhysicsList::SetCuts:CutLength : 1 um
|
||||
G4Material WARNING: duplicate name of material Vacuum
|
||||
|
||||
|
||||
***** Table : Nb of materials = 3 *****
|
||||
|
||||
Material: Vacuum density: 0.000 kg/m3 RadL: 204310101.835 pc Nucl.Int.Length: 113427275.267 pc
|
||||
Material: Vacuum density: 0.000 mg/cm3 RadL: 204310098.490 pc Nucl.Int.Length: 113427284.261 pc
|
||||
Imean: 19.200 eV temperature: 293.15 K pressure: 1.00 atm
|
||||
|
||||
---> Element: H (H) Z = 1.0 N = 1 A = 1.008 g/mole
|
||||
@@ -64,7 +64,7 @@ G4Material WARNING: duplicate name of material Vacuum
|
||||
ElmMassFraction: 100.00 % ElmAbundance 100.00 %
|
||||
|
||||
|
||||
Material: Vacuum density: 0.000 kg/m3 RadL: 204310101.835 pc Nucl.Int.Length: 113427275.267 pc
|
||||
Material: Vacuum density: 0.000 mg/cm3 RadL: 204310098.490 pc Nucl.Int.Length: 113427284.261 pc
|
||||
Imean: 19.200 eV temperature: 293.15 K pressure: 1.00 atm
|
||||
|
||||
---> Element: H (H) Z = 1.0 N = 1 A = 1.008 g/mole
|
||||
@@ -84,7 +84,6 @@ G4Material WARNING: duplicate name of material Vacuum
|
||||
G2 (T/m) = 16.4953
|
||||
G3 (T/m) = 9.86726
|
||||
G4 (T/m) = -6.2448
|
||||
G4ChordFinder: Creating G4MagInt_Driver with stepMinimum = 1e-06 numVar= 6
|
||||
|
||||
phot: for gamma SubType=12 BuildTable=0
|
||||
LambdaPrime table from 200 keV to 100 TeV in 61 bins
|
||||
@@ -103,9 +102,9 @@ conv: for gamma SubType=14 BuildTable=1
|
||||
BetheHeitlerLPM : Emin= 0 eV Emax= 100 TeV ModifiedTsai
|
||||
|
||||
msc: for e- SubType= 10
|
||||
RangeFactor= 0.04, stepLimType: 1, latDisp: 1
|
||||
===== EM models for the G4Region DefaultRegionForTheWorld ======
|
||||
UrbanMsc : Emin= 0 eV Emax= 100 TeV Nbins=84 100 eV - 100 TeV
|
||||
StepLim=UseSafety Rfact=0.04 Gfact=2.5 Sfact=0.6 DispFlag:1 Skin=1 Llimit=1
|
||||
|
||||
eIoni: for e- SubType=2
|
||||
dE/dx and range tables from 100 eV to 100 TeV in 84 bins
|
||||
@@ -123,9 +122,9 @@ eBrem: for e- SubType=3
|
||||
eBremLPM : Emin= 1 GeV Emax= 100 TeV ModifiedTsai
|
||||
|
||||
msc: for e+ SubType= 10
|
||||
RangeFactor= 0.04, stepLimType: 1, latDisp: 1
|
||||
===== EM models for the G4Region DefaultRegionForTheWorld ======
|
||||
UrbanMsc : Emin= 0 eV Emax= 100 TeV Nbins=84 100 eV - 100 TeV
|
||||
StepLim=UseSafety Rfact=0.04 Gfact=2.5 Sfact=0.6 DispFlag:1 Skin=1 Llimit=1
|
||||
|
||||
eIoni: for e+ SubType=2
|
||||
dE/dx and range tables from 100 eV to 100 TeV in 84 bins
|
||||
@@ -147,9 +146,9 @@ annihil: for e+, integral:1 SubType=5 BuildTable=0
|
||||
eplus2gg : Emin= 0 eV Emax= 100 TeV
|
||||
|
||||
msc: for proton SubType= 10
|
||||
RangeFactor= 0.2, stepLimType: 0, latDisp: 0
|
||||
===== EM models for the G4Region DefaultRegionForTheWorld ======
|
||||
UrbanMsc : Emin= 0 eV Emax= 100 TeV Nbins=84 100 eV - 100 TeV
|
||||
StepLim=Minimal Rfact=0.2 Gfact=2.5 Sfact=0.6 DispFlag:0 Skin=1 Llimit=1
|
||||
|
||||
hIoni: for proton SubType=2
|
||||
dE/dx and range tables from 100 eV to 100 TeV in 84 bins
|
||||
@@ -163,19 +162,19 @@ hBrems: for proton SubType=3
|
||||
dE/dx and range tables from 100 eV to 100 TeV in 84 bins
|
||||
Lambda tables from threshold to 100 TeV, 7 bins/decade, spline: 1
|
||||
===== EM models for the G4Region DefaultRegionForTheWorld ======
|
||||
hBrem : Emin= 0 eV Emax= 100 TeV
|
||||
hBrem : Emin= 0 eV Emax= 100 TeV ModifiedMephi
|
||||
|
||||
hPairProd: for proton SubType=4
|
||||
dE/dx and range tables from 100 eV to 100 TeV in 84 bins
|
||||
Lambda tables from threshold to 100 TeV, 7 bins/decade, spline: 1
|
||||
Sampling table 17x1001 from 7.50618 GeV to 100 TeV
|
||||
===== EM models for the G4Region DefaultRegionForTheWorld ======
|
||||
hPairProd : Emin= 0 eV Emax= 100 TeV
|
||||
hPairProd : Emin= 0 eV Emax= 100 TeV ModifiedMephi
|
||||
|
||||
msc: for GenericIon SubType= 10
|
||||
RangeFactor= 0.2, stepLimType: 0, latDisp: 0
|
||||
===== EM models for the G4Region DefaultRegionForTheWorld ======
|
||||
UrbanMsc : Emin= 0 eV Emax= 100 TeV
|
||||
StepLim=Minimal Rfact=0.2 Gfact=2.5 Sfact=0.6 DispFlag:0 Skin=1 Llimit=1
|
||||
|
||||
ionIoni: for GenericIon SubType=2
|
||||
dE/dx and range tables from 100 eV to 100 TeV in 84 bins
|
||||
@@ -187,9 +186,9 @@ ionIoni: for GenericIon SubType=2
|
||||
BetheBloch : Emin= 2 MeV Emax= 100 TeV
|
||||
|
||||
msc: for alpha SubType= 10
|
||||
RangeFactor= 0.2, stepLimType: 0, latDisp: 0
|
||||
===== EM models for the G4Region DefaultRegionForTheWorld ======
|
||||
UrbanMsc : Emin= 0 eV Emax= 100 TeV Nbins=84 100 eV - 100 TeV
|
||||
StepLim=Minimal Rfact=0.2 Gfact=2.5 Sfact=0.6 DispFlag:0 Skin=1 Llimit=1
|
||||
|
||||
ionIoni: for alpha SubType=2
|
||||
dE/dx and range tables from 100 eV to 100 TeV in 84 bins
|
||||
@@ -199,7 +198,7 @@ ionIoni: for alpha SubType=2
|
||||
BraggIon : Emin= 0 eV Emax=7.9452 MeV
|
||||
BetheBloch : Emin=7.9452 MeV Emax= 100 TeV
|
||||
|
||||
========= Table of registered couples ==============================
|
||||
========= Table of registered couples ============================
|
||||
|
||||
Index : 0 used in the geometry : Yes
|
||||
Material : Vacuum
|
||||
@@ -208,9 +207,9 @@ Index : 0 used in the geometry : Yes
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
====================================================================
|
||||
==================================================================
|
||||
|
||||
##### Create analysis manager 0x14cf3f0
|
||||
##### Create analysis manager 0x1c02ac0
|
||||
Using Root analysis manager
|
||||
Ntuple-1 created
|
||||
Ntuple-2 created
|
||||
@@ -246,7 +245,7 @@ Ntuple-3 created
|
||||
=>IMAGE : X(microns)=11.739796819681 Y(microns)=-1.2386815553063 THETA(mrad)=8.0886256100935 PHI(mrad)=-6.5213432754334
|
||||
|
||||
-> Event= 24: X0(mm)= -1.6440171508071 X0(mm) = 0.1811453908911 Z0(m) = -8.87 THETA(mrad)= -0.09956438716731 PHI(mrad)= 0.0025997657493583 E0(MeV)= 3.0000024453136
|
||||
=>IMAGE : X(microns)=-277.93813703976 Y(microns)=4.1394119767572 THETA(mrad)=-27.914598183369 PHI(mrad)=5.1888302083521
|
||||
=>IMAGE : X(microns)=-277.93345473216 Y(microns)=4.1389707020423 THETA(mrad)=-27.914589558642 PHI(mrad)=5.1888288561074
|
||||
|
||||
-> Event= 31: X0(mm)= -0.016022163470015 X0(mm) = 0.041404162571301 Z0(m) = -8.87 THETA(mrad)= 0.028542617532504 PHI(mrad)= 0.088134758705809 E0(MeV)= 3.0000432110726
|
||||
=>IMAGE : X(microns)=0.1094027977376 Y(microns)=0.73278491257216 THETA(mrad)=1.6453108565386 PHI(mrad)=10.062577768408
|
||||
@@ -258,10 +257,10 @@ Ntuple-3 created
|
||||
=>IMAGE : X(microns)=0.16317907584152 Y(microns)=0.55650397305418 THETA(mrad)=1.3321705383455 PHI(mrad)=-3.2844916125969
|
||||
|
||||
-> Event= 45: X0(mm)= 1.0359873985916 X0(mm) = 1.4585907714292 Z0(m) = -8.87 THETA(mrad)= 0.049847294080646 PHI(mrad)= 0.085519303927924 E0(MeV)= 3.0000424805792
|
||||
=>IMAGE : X(microns)=93.212267900392 Y(microns)=39.663681068242 THETA(mrad)=16.573463116366 PHI(mrad)=48.307503421516
|
||||
=>IMAGE : X(microns)=93.216485952497 Y(microns)=39.658363369997 THETA(mrad)=16.573475748505 PHI(mrad)=48.307485770058
|
||||
|
||||
-> Event= 49: X0(mm)= 0.69762782443828 X0(mm) = -1.6249490563253 Z0(m) = -8.87 THETA(mrad)= 0.040619733867931 PHI(mrad)= -0.076739556760004 E0(MeV)= 2.9999358606204
|
||||
=>IMAGE : X(microns)=48.940668495895 Y(microns)=-42.304503052802 THETA(mrad)=11.587426099965 PHI(mrad)=-51.921911885198
|
||||
=>IMAGE : X(microns)=48.93779215545 Y(microns)=-42.312570408262 THETA(mrad)=11.587416807211 PHI(mrad)=-51.921938678405
|
||||
|
||||
-> Event= 51: X0(mm)= 0.029132094194837 X0(mm) = 0.23781110045416 Z0(m) = -8.87 THETA(mrad)= 0.068763552807069 PHI(mrad)= 0.025225497903624 E0(MeV)= 2.9999801399332
|
||||
=>IMAGE : X(microns)=2.8236454534197 Y(microns)=2.7442922247997 THETA(mrad)=4.8296688679511 PHI(mrad)=9.0095603631758
|
||||
@@ -270,7 +269,7 @@ Ntuple-3 created
|
||||
=>IMAGE : X(microns)=8.2845160209151 Y(microns)=3.4543118589059 THETA(mrad)=6.7239668455362 PHI(mrad)=11.919753303181
|
||||
|
||||
-> Event= 55: X0(mm)= -0.85375717958006 X0(mm) = 0.3573014582006 Z0(m) = -8.87 THETA(mrad)= -0.074501244846954 PHI(mrad)= 0.039440666297839 E0(MeV)= 2.999966559615
|
||||
=>IMAGE : X(microns)=-64.022657044574 Y(microns)=6.1167393046648 THETA(mrad)=-15.804350835721 PHI(mrad)=13.702920781475
|
||||
=>IMAGE : X(microns)=-64.025187461689 Y(microns)=6.1155711944451 THETA(mrad)=-15.804358305202 PHI(mrad)=13.702917585895
|
||||
|
||||
-> Event= 56: X0(mm)= 0.1454709674432 X0(mm) = -0.011799618926587 Z0(m) = -8.87 THETA(mrad)= -0.03021980519692 PHI(mrad)= 0.027948785176419 E0(MeV)= 2.9999781445788
|
||||
=>IMAGE : X(microns)=2.2280357803426 Y(microns)=-0.065990321511344 THETA(mrad)=-0.10470310153243 PHI(mrad)=2.5149549454001
|
||||
@@ -309,7 +308,7 @@ Ntuple-3 created
|
||||
=>IMAGE : X(microns)=0.50775463051147 Y(microns)=0.14714703947499 THETA(mrad)=1.1094803619608 PHI(mrad)=-5.7501242243973
|
||||
|
||||
-> Event= 85: X0(mm)= 1.0674724333131 X0(mm) = -1.0663214971145 Z0(m) = -8.87 THETA(mrad)= 0.063205803646676 PHI(mrad)= -0.055370508485 E0(MeV)= 3.000051629789
|
||||
=>IMAGE : X(microns)=97.274009939425 Y(microns)=-23.478946376012 THETA(mrad)=17.851751504662 PHI(mrad)=-34.581636579734
|
||||
=>IMAGE : X(microns)=97.290844140945 Y(microns)=-23.472399708891 THETA(mrad)=17.851795504956 PHI(mrad)=-34.58162314867
|
||||
|
||||
-> Event= 86: X0(mm)= -0.19481916629754 X0(mm) = 0.95206247986366 Z0(m) = -8.87 THETA(mrad)= -0.0050314491063534 PHI(mrad)= 0.088572692400845 E0(MeV)= 2.9999719319194
|
||||
=>IMAGE : X(microns)=-5.6749369137073 Y(microns)=16.635361610945 THETA(mrad)=-2.8117399104848 PHI(mrad)=34.820400204571
|
||||
|
||||
Executable → Regular
Executable → Regular
+1
-1
@@ -159,7 +159,7 @@ G4VPhysicalVolume* DetectorConstruction::ConstructVolumes()
|
||||
|
||||
G4double x_grid=5.0*mm;
|
||||
G4double y_grid=5.0*mm;
|
||||
G4double grid_Zpos=(250+200)*mm; // 250+10 mm for object size of 50µm diam
|
||||
G4double grid_Zpos=(250+200)*mm; // 250+10 mm for object size of 50µm diam
|
||||
|
||||
//G4double thickness_grid=10*micrometer;
|
||||
G4double thickness_grid=100*micrometer;
|
||||
|
||||
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Reference in New Issue
Block a user