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

Import Geant4 10.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -3
View File
@@ -3,7 +3,7 @@
#
# 21st September 2010 Ben Morgan
#
# $Id: CMakeLists.txt 94339 2015-11-12 10:05:50Z gcosmo $
# $Id: CMakeLists.txt 97443 2016-06-03 07:59:02Z gcosmo $
#
#-----------------------------------------------------------------------
@@ -35,9 +35,9 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
project(Geant4)
# - Versioning. We do this here for now
set(${PROJECT_NAME}_VERSION "10.2.0")
set(${PROJECT_NAME}_VERSION "10.3.0")
set(${PROJECT_NAME}_VERSION_MAJOR "10")
set(${PROJECT_NAME}_VERSION_MINOR "2")
set(${PROJECT_NAME}_VERSION_MINOR "3")
set(${PROJECT_NAME}_VERSION_PATCH "0")
ReleaseNotes/Beta4.10.3-1.txt
+770
View File
@@ -0,0 +1,770 @@
Geant4 10.3-beta-01 Release Notes
---------------------------------
30 June 2016
Migration Notes & Main New Features
-----------------------------------
o Introduced new utility class G4MTBarrier implementing a synchronization
point between threads.
o Added handling of multiple actions to be instantiated and handled by
user code. Added G4MultiRunAction, G4MultiPrimaryAction and
G4Multi{Stepping,Tracking}Action.
o Added ability to scale shapes' dimension in X, Y and Z.
Added possibility to import/export scaled shapes in GDML.
o Updated properties of particles according to PDG-2015.
o Introducing floating level base to G4Ions and related classes.
o Disabled multiple-scattering at post-step for position change,
now all happening along-step.
o All EM parameters now handled by G4EmParameters class and can be modified
via UI commands, G4EmProcessOptions class is obsolete and will be
removed soon.
o Major revision of the QGS final-state model (note: this was already
included in 10.2.beta, but did not enter in 10.2 due to the missing
re-tuning of parameters): implemented Reggeon cascading and "Fermi motion";
new algorithm for the determination of the kinematical properties of
partons; improved formation of the residual nucleus.
o New tuning of the FTF model parameters; introduced smearing of delta-isobar
mass and improved di-quark fragmentation into baryons in Lund string
fragmentation.
o Introduced drawing and filtering by touched volume in visualization.
o New data sets G4ENSDFSTATE-1.3.1, G4RadioactiveDecay-4.4.1 and G4TENDL-1.2.
----------------------------------------------------------------------------
Technical Notes
---------------
o Tested platforms:
+ Linux, gcc-4.8.4.
Tested on 64 bit architectures (Intel or AMD) with CERN CentOS
Linux 7 (CC7) (based on CentOS Linux 7).
Versions of Geant4 have also been compiled successfully on other
Linux distributions, Ubuntu, Debian, Suse or other RedHat systems.
+ MacOSX 10.11, clang-3.7 (Apple LLVM/Clang-7.3.0)
* For multi-threading on MacOSX, -clang- compiler has to be used.
+ Windows/10 with Visual C++ 14.0 (Visual Studio 2015)
* Multi-threading mode currently -not- supported on Windows.
o More verified configurations:
+ Linux, gcc-4.9.4, gcc-5.3.0, gcc-6.1.0
+ Linux, Intel-icc 15.0, 16.0.
+ MacOSX 10.10 with clang-3.6
+ MacOSX 10.9 with clang-3.5
+ Linux for Intel Xeon Phi with Intel-icc 15.0, 16.0
(gcc-4.9 compatibility layer)
o Geant4 10.3-beta-01 has been tested using CLHEP-2.3.3.0, required
for external installation of the CLHEP library.
Please refer to the Geant4 User Documentation:
http://cern.ch/geant4/support/userdocuments.shtml
for further information about using Geant4.
----------------------------------------------------------------------------
List of features and fixes included in this Beta release since 10.2.p02:
o Configuration:
-------------
+ CMake:
o Set CLHEP-2.3.3.0 as the required version for external CLHEP library.
o Updated version of data sets:
G4ENSDFSTATE-1.3.1, G4RadioactiveDecay-4.4.1 and G4TENDL-1.2.
Updated tags for 10.3-beta.
o Analysis:
--------
+ Fixed incompatibility with ROOT 5.x and 6.x formats.
+ Fixed compilation warnings on Windows-64.
+ Updated to g4tools version 1.27.4 (see History_tools).
o Event:
-----
+ Introducing G4MultiEventAction to allow multiple user actions
in the same job.
o Externals:
---------
+ Updated CLHEP module to version 2.3.3.0:
o Added use_atomic.h header to use std::atomic if compiler supports it.
o MixMaxRng: corrected initialisation and use of 'numberOfEngines'
when more than one threads calls the constructor.
Use simple loop for flatArray(); engine built-in function turns out
to be extremely slow and unefficient.
Use seed_spbox() for seeding MixMax with single seed.
Avoid hard-coded constant for initialisation of VECTOR_STATE_SIZE in
MixMaxRng, to directly use actual value of "N" from mixmax generator.
Corrected check for counter range in method getState().
Changed default number of N in mixmax generator to 17 (was 256).
Removed use of obsolete 'register' keyword.
Provided new skipping coefficients for the new value of N and for
the optional case N=8.
o HepRandom: revised settings of "defaults" to use a single
thread_local pointer.
o Geometry:
--------
+ magneticfield:
o Added new stepper classes G4BogackiShampine23 (BS23),
G4BogackiShampine45 (BS45) and DormandPrince745 (DP45),
implementing third order (BS23) and fifth order (BS45, DP45)
embedded RK tableaus.
o Added new stepper classes embedded RK method: DoLoMcPriRK34 (6-stage
3/4 RK, interpolation), DormandPrinceRK56 (9-stage 5/6 RK,
interpolation, FSAL-able) and DormandPrinceRK78 (13-stage 7/8 RK,
interpolation).
o Added TsitourasRK45 stepper.
o First version of FSAL classes: FSAL Integrator Driver (concrete,
stand-alone driver); FSAL Integrator Stepper (base class);
FBogackiShampine45 (FSAL-version of BogackiShampine45 stepper);
FDormandPrince745 (FSAL-version of FDormandPrince745 stepper).
o G4MagIntegratorStepper: added counter for calls to equation RHS,
with Get/Reset() methods.
o G4HelixMixedStepper: fixes and added new (5th order) stepper choices.
o Fix in G4CashKarp for the size of arrays holding intermediate values.
+ management:
o Added G4ScaleTransform class for Cartesian scaling transformations.
o Introduced G4BoundingEnvelope helper class to be used for the
calculation of the extent of a solid within the limits defined by
the G4VoxelLimits object.
o Properly use 3D transformations in G4ReflectedSolid. Removed unused
affine-transformation data and related methods; removed not used cached
inverse transformation. Simplified code.
Re-implemented CalculateExtent() to use new class G4BoundingEnvelope.
+ solids/Boolean:
o Added new class G4ScaledSolid providing ability to scale dimensions of
a shape in X, Y or Z.
o Boosted computation of GetPointOnSurface() for G4BooleanSolid;
reimplemented algorithm, using cached list of primitives.
o Added warning in G4BooleanSolid::GetPointOnSurface() in case of non
convergence after fixed number of trials.
+ solids/specific:
o Revised implementation for GetSurfaceArea() and GetCubicVolume() in
G4GenericTrap.
o Added 'const' qualifier for methods in G4ExtrudedSolid.
Added CheckPolygon() to remove collinear and coincident points from
polygons.
o Improved algorithms for computation of area in G4TriangularFacet and
G4QuadrangularFacet. Added post-const qualifier to GetArea().
o G4QuadrangularFacet: added exhaustive tests in constructor to catch
potential problems with a quadrangular facet: collinear vertices, non
planar surface, degenerate, concave or self intersecting quadrilateral.
o G4TriangularFacet: improved test in constructor to detect degenerate
(too small or too narrow) triangles.
o Global:
------
+ Added 'us' and 'ps' units symbols for microsend and picosecond
respectively to G4UnitsTable. Requiring new CLHEP library 2.3.3.0
for external CLHEP library.
+ Converted all units and constants from "static const" to "static
constexpr".
+ Introduced new utility class G4MTBarrier implementing a synchronization
point between threads.
+ Changed exception code in G4TWorkspacePool from G4TWorkspacePool
to "WorkspaceNN".
+ Changed date for release 10.3-beta.
o Materials:
---------
+ G4DensityEffectData, G4IonisParamMat: fixed density effect parameters
corrections for the case when NIST mean ionisation potential is not equal
to that parameter in Shternheimer table.
+ G4NistElementBuilder, G4NistMaterialBuilder: added access to the mean
ionisation potential; put liquid water in front of the list of NIST
materials (index=0), so pure materials can be easier accessed via atomic
number (Z > 0).
+ Added new class G4AtomicShells_EADL which extends shell data up to Z=120.
+ G4MaterialPropertiesTable: moved complex methods from inline to source.
+ G4UCNMicroRoughnessHelper: all methods declared as const.
+ G4NistManager, G4NistMaterialBuilder, G4NistElementBuilder: added new
const methods FindElement(), FindMaterial() and FindSimpleMaterial(),
for possible run-time use in MT mode.
+ G4Material: avoid deletion of G4MaterialPropertyTable.
+ G4Element: added method GetZ_asInt().
+ G4AtomicShells, G4SandiaTable: substituted asserts by G4Exception.
+ Code cleanup; adoption of nullptr, use of const/static.
o Particles:
---------
+ Updated properties of particles according to PDG-2015.
+ Introducing floating level base to G4Ions and related classes.
Migrated G4NuclideTable to the new floating level base scheme;
temporarily disable new scheme for G4IsotopeMagneticMomentTable.
+ Fixed G4IonTable::GetIon() with non-zero level.
+ Changed default life of ion and hyper nucleus from -1 to 0.
+ Fixed Coverity defects.
o Persistency:
-----------
+ GDML:
o Added ability to automatically export the names of sensitive detectors
as auxiliary information.
o Added ability to import and export scaled shapes. Extended GDML schema
by adding "scaledSolid" tag supporting scaled shapes.
o New GDML schema version 3.1.4 (files: gdml.xsd, gdml_solids.xsd).
o Physics Lists:
-------------
+ Builders:
o Disabled multiple-scattering at post-step in OrderingParameterTable.
+ Constructors:
o electromagnetic:
- Added SetScintillationTrackInfo() method to G4OpticalPhysics with
associated command in G4OpticalPhysicsMessenger.
Fixed memory leak in G4OpticalPhysicsMessenger.
- Partial fix for allowing calls to optical UI commands in "PreInit"
state. Partially addressing problem report #1832.
- G4EmStandardPhysics_option3, option4: added process of e+e- pair
creation by e+ and e-; enabled lateral displacement for muons and
hadrons.
- G4EmStandardPhysicsGS: set default range factor to 0.1.
- DNA and ModelActivator constructors: corrected model/process names;
adjusted high energy threshold of solvation (kill) in respect to the
energy range of the elastic model.
Added G4DNAElectronSolvation to all DNA constructors.
- Updated G4EmDNAPhysics_option5 and G4EmDNAChemistry.
- Updated G4EmDNAPhysics_option7 constructor.
- Updated G4EmModelActivator. Fixed activation of DNA models.
Use Uehara model with chemistry. Corrected elastic process name
for ions.
- Added flag and command for whether or not to call InvokeSD() method
of G4OpBoundaryProcess.
- Fixed G4Exception message in G4OpticalPhysicsMessenger.
- Fixed Coverity defects.
o decay:
- Added G4UnknownDecayPhysics constructor.
- G4RadioactiveDecayPhysics: enabled atomic de-excitation by the call
to EM parameters in ConstructProcess() method.
+ Lists:
o FTFP_BERT_TRV: Switch on the low-mass diffraction dissociation
used in G4HadronHElasticPhysics.
Use GS multiple scattering with the most precise "error-free"
stepping instead of the default (Opt0), for the purpose of studying
the impact of multiple scattering on hadronic showers.
o Moved code to be inline in G4RegisterPhysLists so that it gets
compiled as part of the G4PhysListRegistry compilation unit.
This ensures that all the physics lists declared to the registry are
referenced by it such that the linker will include them if libraries
are built statically.
o Electromagnetic Processes:
-------------------------
+ DNA:
o G4DNAScreenedRutherfordElasticModel: modified handling of energy
boundaries at init time. Deprecated SetKillBelowThreshold() method;
modified initialisation to prevent erasing/rewriting data.
o G4DNAChemistryManager: reversed logic in CreateWaterMolecule()
for interface with physics models.
o G4DNAChampionElasticModel: rearranged declaration of attributes.
Deprecated GetKillBelowThreshold() method; removed attributes;
modified Theta() method. Reset check ekin >= LowEnergyLimit().
Added missing computation of 'sigma'.
o G4DNAUeharaScreenedRutherfordElasticModel: added exception at init
time if model is used for anything other than e-.
Deprecated SetKillBelowThreshold() and GetKillBelowThreshold() methods,
use G4LowECapture or G4DNAElectronSolvatation; modified
SelectHighEnergyLimit() method; removed attributes.
Added possibility to extend applicability limit.
o G4DNAChampionElasticModel, G4DNAUeharaScreenedRutherfordElasticModel:
added pre-processor flag to control Verbose check mode; checking energy
boundaries in Initialise(), removed call to G4Electron; cleanup in
CrossSectionPerVolume by removing unnecessary checks and calls to map;
removed energy checks in SampleSecondaries().
o Updated fast computation of G4DNAScreenRutherfordElasticModel and
G4DNAUeharaScreenedRutherfordElasticModel.
o Renamed class G4DNAElectronSolvatation to G4DNAElectronSolvation.
o G4DNAOneStepThermalizationModel: using pre-processor flag to control
check mode verbosity; removed call to G4Electron at initialization.
o G4DNATransformElectronModel: using pre-processor flag to control check
mode verbosity; removed call to G4Electron at initialization; added
check for creation of solvated electron.
o G4MoleculeCounter: at initialization time, prevent creating entries
for unregistered molecule definition.
Removed check of c++ version for unique_ptr/auto_ptr selection.
o G4DNAMeltonAttachmentModel, G4DNASancheExcitationModel: removed usage
of internal energy boundaries.
o G4DNASancheExcitationModel: removed warning when SANCHE_VERBOSE is OFF.
o G4VUserChemistryList: added flag; some code cleanup.
o Added nrj extensibility to SR and USR models.
o Replaced usage of std::exp() by G4Exp().
+ High Energy:
o Use C++11 features explicit, override, delete, nullptr.
+ Muons:
o G4ePairProduction: new process e+e- pair production by e+-.
o Use C++11 features explicit, override, delete, nullptr.
+ Polarisation:
o G4PolarizedCompton, G4eplusPolarizedAnnihilation,
G4ePolarisedIonisation: in PostStepGPIL(), use cached values of
'currentInteractionLength'; fixes problem at boundaries where
updated value was incorrectly used.
o C++11 migrations: explicit, override, delete operators on function
declarations; remaining nullptr; write floats/doubles with '.'.
Use C++11 features nullptr and range-based for loop in
G4PolarizationManager.
+ Standard:
o G4UrbanMscModel: use new lateral displacement algorithm in opt-3
and opt-4 physics-lists. Modified randomisation of "true path length".
o G4UniversalFluctuation: fixed bug in Glandz part, Gaussian sampling.
The sampling is symmetrical around 'emean' now. Some code cleanup.
o G4SeltzerBergerModel: fixed data handling for Z > 92.
Addressing problem report #1870, about invalid read of data
at run time.
o G4eBremsstrahlungRelModel: change LPM constant such that it gives
suppression variable consistent with Migdal's one; fixes small issue in
LPM function computation.
o G4alphaIonisation, G4hIonisation, G4ionIonisation: do not define
StepFunction in constructor.
o Fixed shadowing compilation warnings in G4GoudsmitSaundersonMscModel
for 'ps'.
o G4ASTARStopping, G4PSTARStopping, G4NISTStoppingData, G4BraggModel:
data arrays become float, computation is left double.
o G4BraggModel, G4BraggIonModel, G4BetheBlochModel: use float for local
static data.
o Added c++11 keywords: explicit, final, override, delete; use nullptr
and use G4Element::GetZasInt().
+ Utils:
o G4VEmProcess, G4EmModelManager: added extra methods to access models.
o G4VEnegryLossProcess, G4EmCorrections: removed unused class members.
o Use C++11 keywords explicit, override, delete and nullptr.
o G4EmParameters, G4EmParametersMessenger: moved remaining parameters
from G4EmProcessOptions, which now becomes obsolete.
o G4EmCalculator, G4LossTableBuilder, G4LossTableManager, G4VMscModel,
G4VEmModel, G4VEmProcess, G4VEnergyLossProcess: use only G4EmParameters
class interfaces for initialisation.
o G4NuclearFormfactorType: added new enumerator.
o G4VMultipleScattering: moved position change to AlongStep.
Added method NumberOfModels().
o G4EmModelManager: reviewed and fixed model configuration for DNA
physics.
o G4EmParameters: allow to change parameters only from the master thread
and only at PreInit or Idle states.
o G4EmCorrections: make part of data static, make internal vectors static,
shared between threads.
o G4LossTableManager, G4VEmModel, G4VMultipleScattering: minor cleanup of
static const data.
o G4VEmModel, G4VAtomDeexcitation, G4EmCalculator: use new method
GetZasInt() from G4Element.
o G4VEmModel: fix in SelectRandomAtomNumber() method. Fixed destruction
in MT mode.
o G4VAtomDeexcitation: fixed possible data race at initialistion.
Extended printout at initialisation.
Completed migration to G4EmParameters interface.
o G4AtomicShell: make methods inlined.
o G4DummyModel: set default low-enegry limit to 0 (needed for DNA).
o G4VMultipleScattering, G4EmModelManager, G4LossTableManager: improved
debug printout.
o Fixed Coverity defects.
+ Xrays:
o Added new class G4ScintillationTrackInformation and use it in
G4Scintillation.
o Use C++11 features explicit, override, delete, nullptr.
o Generic Processes:
-----------------
- Biasing:
o Checked for unbounded while loop in G4ProcessPlacer.
+ Decay:
o Added better diagnostics in exception in G4Decay::DecayIt().
+ Optical:
o Added flag for InvokeSD() method call in G4OpBoundaryProcess.
o Hadronic Processes:
------------------
+ cross_sections
o Checked do-while loops for potential infinite loops.
+ management
o G4HadronicProcess: added flag for "integral" approach to take into
account cross-section change at a step. Do not create new materials
in GetElementCrossSection(), just try to find existing simple
G4Material ones instead. Adopt C++11 keyword nullptr.
o G4HadronicProcessStore: call initialisation of all
G4HadronicInteractions.
+ models/coherent_elastic
o G4LMsdGenerator: restored hadronic internal decay scheme allowing for
stable decay of the Roper resonances.
+ models/de_excitation
o G4EvaporationChannel, G4EvaporationProbability: fixed kinematics
and added discrete excitation energy for the residual fragment
if the excitation is below maximum known level energy.
o G4NuclearLevelData: added extra methods allowing to access the maximum
level energy per isotope in level DB. Added method FindLevel() allowing
to find discrete level for any consumer model.
o G4DeexPrecoParameters, G4NuclearLevelData: added new class for
parameters.
o G4EvaporationProbability: fixed bug in computation of probability
density function; use new method FindLevel() in G4NuclearLevelData when
sampling kinetic energy of emitted particles; changed interface for
sampling method. More detailed grid for probabilities.
Use same sampling algorithm as in the pre-compound model (do not
interpolate probability).
o G4EvaporationChannel: use new interface to the sampling of energy.
o Updated list of parameters; added full list of pre-coumpound parameters
and extra de-excitation ones. Allow to change parameters only from the
master thread and only at PreInit or Idle states.
o G4ExcitationHandler: allow addition of new evaporation or FermiBreakUp
models after the initialisation of the handler.
Removed G4Exception when MF model is called, instead increase default
limit on excitation energy per nucleon to 100GeV.
o G4ExcitationHandler, G4EvaporationChannel, G4EvaporationProbability,
G4NeutronRadCapture: use G4DeexPrecoParameters for initialisation;
initialisation is done once at the first event.
o G4NucLevel, G4LevelManager, G4LevelReader, G4PhotonEvaporation: changed
data structure for the transition data; instead of final energy, index
of final level, added multi-polarity of the transition.
This will allow for correlated gamma emission.
o G4EvaporationChannel, G4EvaporationProbability: improved initialisation
of run time members
o G4NuclearLevelData: improved FindLevel() method.
o G4VEvaporationChannel, G4LevelReader, G4ExcitationHandler,
G4LevelReader: removed commented lines, removed empty descructors.
o G4VEvaporation, G4Evaporation, G4VFermiBreakUp, G4FermiBreakUp,
G4PhotonEvaporation, G4ExcitationHandler: cleaned up initialisation;
added G4VFermiBreakUp pure virtual methods allowing to have alternative
models.
o G4Evaporation: allow change of the channel factory after initialisation.
o G4NeutronRadCapture: added initialisation of G4PhotonEvaporation.
o G4DeexPrecoParameters, Evaporation: use default channel factory.
o G4NuclearLevelData, G4LevelManager: added method to access low-edge
levels.
o G4KalbachCrossSection: more smooth inverse cross section for transitions
of high energy.
o Removed specific GEMCoulombBarrier classes per ion.
o G4PhotonEvaporation: rationalised initialisation in case radioactive
decay initialisation is incomplete, no effect on hadron inelastic
interactions.
o G4DeexPrecoParameters, G4NuclearLevelData, G4ExcitationHandler,
G4PhotonEvaporation: fixed initialisation in MT mode if physics-list
has only radioactive decay.
o Added c++11 keywords in many headers.
o Added warning in G4ExcitationHandler for super excited fragments;
improved warning printout for the high energy excitation.
o G4LevelManager, G4NucLevel: substituted asserts by G4Exception.
o Cleaned up code in CoulombBarrier and FermiFragment classes.
o Fixed Coverity defects.
+ models/management
o G4HadronicInteractionRegistry: added InitialiseModels() method.
G4HadronicInteraction: added InitialiseModel() method.
o G4VPreCompoundModel, G4VIntraNuclearTransportModel,
G4HadronicInteractionRegistry, G4HadronicInteraction:
added c++11 keywords, minor cleanup.
+ models/particle_hp
o Changed default option of GNUmake script; G4PHPDEBUG flag was
unintentionally activated.
+ models/parton_string
o Major revision of QGS model; implemented Reggeon cascading and
associated "Fermi motion". Implemented new algorithm of parton
kinematical properties determination and calculation of residual
nucleus properties. Adjusted G4GammaParticipants to the revised
model.
o Improved energy-momentum conservation in the QGS model, especially
in the case of diffraction interactions.
o G4QGSMSplitableHadron: fixed bug in the case of gamma projectile with
P_minus = 0.
o New tuning of FTF model parameters.
o Introduced various <Pt^2> for diffractive and non-diffractive
interactions in G4FTFModel, for NA49 and NA61/SHINE experimental data.
o Fine tuning in G4DiffractiveExcitation for the FTF model, to describe
NA49 experimental data, especially, <Pt> on Xf.
o Fix to address the baryon puzzle of NA49 data; <Pt> of baryons 1/2 at a
string fragmentation setting up at 435 MeV/c, and <Pt> for barion 3/2
production st 900 MeV/c.
o Fine tuning of G4LundStringFragmentation. <Pt> of mesons created at
quark fragmentation is decreased. <Pt> of baryons created at quark and
di-quark is increased. Corrected fragmentation functions of qq-> B(1/2)
and B(3/2). <Pt^2> is increased in 2 times.
Important for a description of NA49 experimental data on pp-interactions
at 158 GeV/c, especially for xF and Pt distributions.
o Introduced smearing of delta-isobar mass; delta-isobars are now treated
as a kinetic track; improved parameterisation of the quark exchange
process with excitation.
NA61/SHINE exp. data on Pi+, Pi-, K+, K- and protons in PP interactions
at 20, 31, 40, 80 and 158 GeV/c are now described. Now reproducing the
ratio of <Strane Q>/<Normal Q> in PP interactions. Not describing kink
in AA interactions.
o Improved di-quark fragmentation into baryons in Lund string
fragmentation. Improved description of NA49 and NA61/SHINE exp. data
on p+p->p+X. Improvements in method SetMinimalStringMass(), relevant
for Pbar P annihilation.
o Moved G4PomeronCrossSection class to 'qgsm' module.
+ models/pre_equilibrium
o G4PreCompoundModel: changed non-equilibrium condition to switch to
de-excitation; this allows to perform pre-equilibrium emission for
light nuclei.
o Migrated classes to use G4DeexPrecoParameters; removed obsolete class
G4PreCompoundParameters.
o G4GNASHTransitions: fixed problem in computation of probability.
o Use nullptr and define internal const as static const.
+ models/radioactive_decay
o G4RadioactiveDecay: renamed several methods and variables to more
closely represent their meaning.
In DoDecay(): added protection for zero pointer in case of missing
decay channel. Added new method AddDeexcitationSpectrumForBiasMode().
In BuildPhysicsTable(), removed initialization of atomic de-excitation
to avoid overwriting its initialization in EM.
Throw fatal exception if initialization not done somewhere.
Initialisation should be now done in physics-lists.
o Added production of gamma and electron spectra from de-excitation of
excited levels in the biased mode.
o Removed obsolete class G4RIsotopeTable.
+ models/util
o Fixed Coverity defect in G4Fragment.
o Run
---
+ Added handling of multiple actions to be instantiated and handled by
user code. Added G4MultiRunAction class to allow for multiple run actions
in a single job; added G4MultiPrimaryAction to allow for multiple
user-primary generation actions in a single job.
+ Renamed all MT related exceptions to have new code matching pattern.
+ Use scoped enum for G4MTRunManager::WorkerActionRequest and
added PROCESSUI action.
+ Added G4MTRunManager::GetNumberActiveThreads() method.
+ Use new class G4MTBarrier to implement synchronization points.
+ Introduced skeleton for new functionality to force workers to
execute UI commands w/o beamOn.
Introduced new UI command: "/run/workersProcessCmds" to trigger
execution of UI commands by workers even without a "/run/beamOn";
C++ API is G4MTRunManager::RequestWorkersProcessCommandsStack().
+ When workers are terminated they execute the UI commands issued
after the last /run/beamOn
+ Fixed potential memory leak in G4RunMessenger.
+ Disabled multi-scattering during post-step in G4PhysicsListHelper.
Fixed default process ordering parameters for G4UnknownDecay that
should not have AtRest.
+ G4AdjointSimManager: correction in the use of run actions to avoid
infinite loop during an adjoint simulation.
+ G4AdjointPrimaryGenerationAction: removed 3 times splitting of primary
adjoint gamma.
o Track & Tracking
----------------
+ Change G4VUserTrackInformation pointer in G4Track to mutable and setters
to be const-methods. This allows the user to set his/her
G4VUserTrackInformation pointer without casting G4Track const pointer.
+ New G4Multi{Stepping,Tracking}Action classes to allow for multiple
user-actions in the same job.
o Visualization:
-------------
+ management:
o MT mode: moved flush to end of visualization thread; this is so that
all trajectories are flushed from the thread before switching back to
master thread. Also fixing picking in MT mode.
o Introduced UI command /vis/viewer/interpolate.
o Added some calls to SetView for security.
o Inhibited use of BeginRun, BeginEvent, EndEvent and EndRun
when vis is not enabled, for example after /vis/disable.
In particular this prevents the start of the vis thread in
multi-threading mode.
o G4VisExecutive: registered drawing and filtering by touched volume.
o G4VisCommandsSceneAdd: removed incorrect check on existing models in
command "/vis/scene/add/volume". It was preventing parallel worlds being
added individually.
o Fixed mistake in introductory vis manager message.
o Improved error tracking: introduced error code to track error
conditions in G4VVisCommand; tracked error conditions for '/vis/open'
and '/vis/drawTree' in G4VisCommandsCompound.
o Improved '/vis/viewer/save'.
o Use SetWorldVolume() for OriginVolume drawing and filtering.
o Code cleanup in G4VisCommandsSceneHandler.
+ modeling:
o Introduced drawing and filtering by touched volume.
i.e., "/vis/modeling/trajectories/create/drawByTouchedVolume"
"/vis/filtering/trajectories/create/touchedVolumeFilter"
and their associated commands.
This selects only by a single string, the physical volume name.
If there are more than one physical volumes with that name then any
trajectory touching any one of those volumes will be selected.
If the user sets more than one physical volume name (by using the set
command more than once) the trajectory will be selected if it touches
either of those volumes and which of the attributes (e.g., colour)
associated with those volumes is chosen is arbitrary.
A more comprehensive facility would allow the user to select by
touched touchable, i.e., by the full path and copy numbers of the
physical volume - but that is a job for the future if a use case arises.
o Added specific arguments to LocateGlobalPointAndSetup() to handle
multi-threading mode in G4TrajectoryDrawByOriginVolume::Draw() and
G4TrajectoryOriginVolumeFilter::Evaluate().
o G4TrajectoryModelFactories: added
G4TrajectoryDrawByTouchedVolumeFactory.
o G4TrajectoryFilterFactories: added
G4TrajectoryTouchedVolumeFilterFactory.
o Added new files and classes: G4TrajectoryDrawByTouchedVolume and
G4TrajectoryTouchedVolumeFilter.
o G4ModelColourMap: sdded new access function GetBasicMap().
o G4ModelingParameters: added VisAttributesModifier set commands.
o Tidied uo G4TrajectoryDrawByOriginVolume.
o G4TrajectoryDrawByOriginVolume: tidied #include statements.
+ OpenGL:
o Xm: Ensure all items get flushed to screen, even when
'eventsDrawInterval' is set greater than 1.
o Fixed some inconsistencies in "/vis/ogl/set/eventsDrawInterval" and
"/vis/ogl/set/displayListLimit" commands.
o Fixed bug in picking output text.
o G4OpenGLXViewer: Added thread awareness regarding glXMakeCurrent.
o Fix for notifying multiple OGL X views.
o Fix in G4OpenGLViewer::getRealPrintFilename() so that files can
easily be referenced in alphanumeric order.
o CompareForKernelVisit(): tested for total visualization attributes
modifiers instead of just for size.
o Fixed typo for macro G4CONDITIONBROADCAST.
+ OpenInventor:
o G4OpenInventorXtExaminerViewer: designed new icons (XPM) for the
"Extended Pick Mode" and "Pick Reference Trajectory" buttons.
o Modified the mouse-over-trajectory output to make it more clear.
o Improved diagnostics for Bookmark file handling.
o New approach for determining distance along the reference path, using
element centers instead of bounding boxes. Solves problems with spurious
bounding box warnings and incorrect distance values.
o G4OpenInventorXtExtended & G4OpenInventorXtExtendedViewer: suppressed
some unwanted diagnostic output.
o Fixed setting of transparency type
(SoGLRenderAction::SORTED_OBJECT_ADD).
o Fixed dispatching.
o Fixed Coverity defects.
+ Tree:
o G4ASCIITreeSceneHandler: prevent multiple writing of the informational
header on the output file.
+ XXX:
o CompareForKernelVisit(): tested for total visualization attributes
modifiers instead of just for size.
o Data Sets:
---------
+ G4ENSDFSTATE-1.3.1:
o Added missing data for AC225, SI25, 193RN, TE140.
+ G4RadioactiveDecay-4.4.1:
o Added KM coefficients for e- capture and taken from DDEP data.
o Correction to Fe55
o Corrected 0 lifetime for Ac225.
+ G4TENDL-1.2:
o Compressed version of the library.
o Added information of source (ENDF/B-VII.1 or TENDL-2014) for each file.
o Fixed problem to Deuteron/Inelastic/F01/1_3_Hydrogen.z.
o Examples:
--------
+ Updated reference outputs, macros and scripts.
+ advanced/air_shower
o Replaced usage of std::log() by G4Log().
+ advanced/amsEcal
o PhysListEmStandard: use G4EmParameters.
+ advanced/composite_calorimeter (ccal-V10-02-00)
o Replaced usage of std::exp() by G4Exp().
+ advanced/hadrontherapy
o Added new modulator class.
+ advanced/microbeam (microbeam-V10-02-00)
o Replaced usage of std::exp() by G4Exp().
+ advanced/microelectronics
o Fixed multiple-scattering definition in PhysicsList.
+ advanced/nanobeam
o Replaced usage of std::exp() by G4Exp().
+ advanced/underground_physics
o DMXPhysicsList: migrated EM physics to G4EmParameters.
+ extended/electromagnetic/TestEm0
o PhysicsList: use G4EmParameters.
+ extended/electromagnetic/TestEm1
o PhysicsList::AddRadioactiveDecay(): set like threshold to
0.1*picosecond in G4NuclideTable. Updated radioactive.mac.
Use G4EmParameters.
o Added decayinfly.mac macro.
o Modified colors in vis.mac.
o PrimaryGeneratorMessenger: restore command SetDefaultKinematic.
Updated all macros.
+ extended/electromagnetic/TestEm2
o PhysicsList: use G4EmParameters.
+ extended/electromagnetic/TestEm3
o PhysicsList: use G4EmParameters.
+ extended/electromagnetic/TestEm5
o EventAction: corrected filling of histogram 1.
o PhysicsList: use G4EmParameters.
o Removed geant3 sub-directory.
+ extended/electromagnetic/TestEm7
o Fix in c2_functions.
o Fixed compilation warnings on gcc-6.1.
+ extended/electromagnetic/TestEm8
o TestParameters, Run, PrimaryGeneratorAction, PrimaryGeneratorMessenger:
reorganized printout of beam particle; use energy smearing as an
addition of noise, so smeared noise should be added in units of energy.
+ extended/electromagnetic/TestEm10
o Major example revision & clean-up: simplified class names; refactored
detector construction & its messenger classes; revised scoring, removed
unused code and replaced histograms with standard calls to g4tools;
added StackingAction which accounts XTR gamma, all gamma and all e-
spectra; changed to a modular physics list and introduced
TransitionRadiationPhysics builder; clean-up of the primary generator
action; added test_suite.sh script.
+ extended/electromagnetic/TestEm11
o PhysicsList: added radioactiveDecay process; use G4EmParameters.
o Removed G4DiscreteScattering.
o Run: compute energy deposit per absorber
o PrimaryGenerator: restored SetDefaultKinematic().
o Updated macro radioactive.mac.
+ extended/electromagnetic/TestEm12
o PhysicsList, PhysListEmStandard: use G4EmParameters.
+ extended/electromagnetic/TestEm13, TestEm14
o PhysicsList: use G4EmParameters.
o Removed geant3 sub-directory.
+ extended/electromagnetic/TestEm15
o PhysicsList: use G4EmParameters.
+ extended/electromagnetic/TestEm18
o PhysListEmStandard: use G4EmParameters.
+ extended/hadronic/Hadr06
o Added NE213 material.
o PhysicsList: added G4StoppingPhysics.
o EmStandardPhysics: use G4EmParameters.
+ extended/hadronic/Hadr07
o New example to survey energy deposition and particle's flux from
an hadronic cascade.
+ extended/medical/dna/clustering
o Added GNUmakefile and reference output.
+ extended/medical/dna/dnaphysics
o Added flagProcess value for electron capture.
o DetectorConstructor, DetectorMessenger: ensure that geometry is created
once; material may be changed for next runs.
o SteppingAction: added label for solvation.
o Added 2nd argument in SteppingAction for number of threads.
o /run/initialise moved from code to macro.
o DNA physics configuration moved from code to macro.
+ extended/medical/dna/microdosimetry
o Increase cuts of G4ElectronCapture to 7.4 eV to remain compatible
with the energy validity of the Champion's elastic model.
+ extended/medical/dna/range
+ extended/medical/dna/wvalue
o Changed physics constructor selection.
+ medical/electronScattering
o PhysListEmStandard: use G4EmParameters.
o PhysListEmStandard_WVI, SS: added SetMscThetaLimit().
+ extended/parallel/TBB
o Ported code following last updates to 'run' category.
+ extended/parallel/ThreadsafeScorers
o Corrected GNUmakefile.
+ extended/persistency/persistency/gdml/G01
o Added test case for scaled solids: scaledTube.gdml.
o Added missing gdml files to CMake installation script.
+ extended/polarisation/Pol01
o PhysicsList: move to use current method of ConstructParticle().
+ extended/radioactivedecay/rdecay01
o Initialize atomic de-excitation in PhysicsList::ConstructProcess()
instead of in G4RadioactiveDecay to avoid overwriting initializtion
in EM.
o Set world size to 2 cm and gun direction along X.
o Added survey of each nuclide in a given time window.
Print-out activity of each nuclide.
+ extended/radioactivedecay/rdecay02
o PhysicsList: register hadronic processes.
+ extended/runAndEvent/RE01
o Removed obsolete use of readout geometry.
o Added protection against a track sticking on the calorimeter inner
boundary.
o Use G4UnknownDecayPhysics constructor and removed ad-hoc physics-list.
+ extended/runAndEvent/RE04
o Added command "/vis/drawVolume worlds" to vis.mac.
----------------------------------------------------------------------------
ReleaseNotes/Patch4.10.1-3.txt
+201
View File
@@ -0,0 +1,201 @@
Geant4 10.1 - patch-03 Release Notes
------------------------------------
5 February 2016
List of fixes included in this public patch since the public release 10.1.p02:
o Configuration:
-------------
+ CMake:
o Updated Apple Clang detection to work on Xcode-7.
o Always use libc++ with Apple Clang so that std-supporting library is
used for C++11 mode on older Mac systems where libstdc++ is the default.
o Updated std-flag setting rules.
+ GNUMake:
o Updated X11 settings in MacOS platform.
o Added settings for C++ standards in platform specific scripts.
o Analysis:
--------
+ Fixed G4Analysis::Tokenize() which was failing when processsing a string
containing opening double quota without a closing one.
+ Fixed handling ntuples created in MT mode on master thread
This fixes the problem reported in hypernews (#459) and the problem
of deleting non-empty Root file containing only ntuples.
o Geometry:
--------
+ divisions:
o Fix for use of rotation matrix in G4VDivisionParameterisation in
MT-mode; use thread-local pointer for rotation matrix as member of the
class G4VDivisionParameterisation and set it to suto-delete.
Removed unnecessary thread-local verbose flag.
Addressing problem reports #1743 and #1758.
o Set as unsupported divisions of polycone and polyhedra in MT-mode.
+ magneticfield:
o Added check in G4ChordFinder against number of iterations in
FindNextChord(), to identify potential cases of lack of convergence.
o Better diagnostics text in case of errors in G4FieldTrack and
G4UniformMagField.
o Added explanation comment in G4MagHelicalSteper.
+ navigation:
o G4MultiLevelLocator::EstimateIntersectionPoint(): fix for logic error
in keeping consistent candidate intersection. Copes with case that a
candidate intersection is not found in the next segment (typically in
the 'second half' part).
Ensure that splitting of step (new level/depth) advances the required
length, used when adding a new level/depth.
Revised condition of 'while' loop which ensures that a new candidate
intersection exists. Corrected the resetting of 'first_section' flag.
Replaced fatal error for exceeding max steps with warning and signal
'looping' for too many steps; G4PropagatorInField detects this
condition, and identifies it as a 'Looping Particle' which is then
flagged; the calling class (Transportation, PathFinder) is expected
to stop the tracking of this particle after a few of these steps.
Addressing issue seen by ALICE (non-finishing of step due to poor
advances).
o G4VIntersectionLocator: added new logging methods & revised interfaces.
o G4NavigationLogger: added method to report issue with normal that
is the result of applying a rotation.
o G4NormalNavigation, G4VoxelNavigation: added check of rotated exit
normal.
o Relaxed condition for zero or almost-zero steps in G4ReplicaNavigation
and G4Navigator, to allow for faster progression in case of stuck tracks
in 3D scoring meshes. Addressing old problem report #1432.
o Fix in G4ReplicaNavigation::ComputeStep() for correct setting of copyNo
for particle entering. Fixes issue of negative copyNo observed in nested
replica setups. Addressing problem report #1634.
o Moved check for overlaps in G4Navigator::ComputeStep() within G4VERBOSE.
Addressing problem report #1811.
+ solids/Boolean:
o Checked for potential never-ending loops. Replaced while-do loop with
bounded for-loop in G4IntersectionSolid::DistanceToIn(p,v).
Also addressing problem report #1821.
+ solids/CSG:
o Introduced check in G4Sphere::DistanceToIn(p,v) for concave Theta and
point located on the origin. Also make proper use of radial tolerance in
DistanceToOut(p,v).
o Fixed Coverity defect in G4CutTubs::GetMaxMinZ().
+ solids/specific:
o Added specialised implementation for GetCubicVolume() in
G4TessellatedSolid. Added debug printouts withing G4SPECSDEBUG for
DistanceToIn/Out(p,v) to identify potential wrong responses.
o Removed redundant condition in G4Polyhedra and G4polycone
SetOriginalParameters() method.
o Minor code cleanup in G4SurfaceVoxelizer.
o Checked for potential never-ending loops.
+ volumes:
o Enabled paramerisation by solid type in G4GeometryWorkspace in MT-mode.
Assumes solids being parameterised are declared thread-local in the
user's parameterisation class and allocated just once.
o Global:
------
+ Tune radial tolerance to same value as for Cartesian tolerance in
G4GeometryTolerance.
+ Corrected conditions for proper treatment of gcc-5 in tls.hh and
G4Threading.hh.
+ Removed unused and buggy operator=(const G4String&) in G4SubString.
Added string length check in G4String::operator==().
Added missing 'inline' specification to functions in G4String.
+ Force use of G4MT wrappers for Intel-icc compiler for random numbers.
+ Updated date and version for 10.1.p03.
o Materials:
---------
+ G4NistElementBuilder: fixed typo in printout.
Addressing problem report #1786.
o Parameterisations:
-----------------
+ gflash: fix for Zeff wrongly computed as ( W1*Z2 ) + ( W2*Z1 ), with Z1
and Z2 swapped. Addressing problem report #1719.
o Particles:
---------
+ Fixed wrong argument order CreateIon(A,Z,LL,0.0) in G4IonTable to
CreateIon(Z,A,LL,0.0).
+ Fixed setting of mass in decay parent particle.
Addressing problem report #1820.
o Persistency:
-----------
+ GDML:
o Use relaxed precision constant for matrix to angle formula evaluation
in G4GDMLWriteDefine, to allow for proper treatment of singularities.
Fixes issues of misplaced volumes in exported geometries of complex
detectors.
o Rectify rotation matrices in reading and writing GDML files to reduce
spurious roundoff errors in stored values.
o Physics Lists
-------------
+ constructors/limiters:
o G4ParallelWorldPhysics: fixed process order index for
G4ParallelWorldProcess to 9900 to make sure it is registered
prior to G4OpBoundaryProcess.
o Processes - Electromagnetic:
---------------------------
+ xrays:
o G4VTransitionRadiation, G4VXTRenergyLoss: fixed process sub-type.
o Processes - Generic:
-------------------
+ scoring:
o G4ParallelWorldProcess: fixed processType from 'fParameterized'
to 'fParallel' and set processSubType to 491.
o Fixed Coverity defects.
o Processes - Hadronic:
--------------------
+ cross_sections:
o G4NeutronInelasticXS, G4NeutronCaptureXS: fixed isotope cross-sections
including retrieve, data management, isotope x-section and isotope
selection. Fixed Coverity defects.
+ models/cascade:
o G4CascadeCoalescence: added explicit inclusion of
G4InuclElementaryParticle header to address compiler error from Cray
(as reported in Configuration Hypernews Forum #1764).
+ models/coherent_elastic:
o G4DiffuseElastic: bug-fix in BuildAngleTable() to improve the angle
bin accuracy at high energies.
+ models/im_r_matrix:
o Fixed compiler warning in clang-3.6.
o Run:
---
+ G4PhysicsListHelper: add entry for G4ParallelWorldProcess.
+ G4RunManager, G4WorkerRunManager: fixed process order index of
G4ParallelWorldProcess to 9900 to make sure it is registered
prior to G4OpBoundaryProcess.
o Tracking:
--------
+ G4SteppingManager: fix to properly set 'OriginTouchableHandle' for the
primary track. Addressing problem report #1773.
o Examples:
--------
+ Updated reference outputs.
+ basic/B4:
o Restored the third parameter in G4UIsession construction, which was
lost when moving G4UIExecutive at the beginning of main().
Addressing problem report #1802.
----------------------------------------------------------------------------
Technical Notes
---------------
o This patch should be applied on top of release 10.1, 10.1.p01 or 10.1.p02.
o Technical notes distributed for release 10.1 are also applicable and
valid for this patch.
The code and rebuilt binary libraries for release 10.1.p03 are available
through our "Download" Web page.
Please refer to the Geant4 User Documentation for further information about
using Geant4.
ReleaseNotes/Patch4.10.2-1.txt
+251
View File
@@ -0,0 +1,251 @@
Geant4 10.2 - patch-01 Release Notes
------------------------------------
26 February 2016
List of fixes included in this public patch since the public release 10.2:
o Configuration:
-------------
+ CMake:
o Fixed configuration error occurring when using CLHEP-2.3.1.1 external
installation. Addressing problem report #1805.
o Updated data-sets to RadioactiveDecay-4.3.1 and G4ENSDFSTATE-1.2.1.
+ GNUMake:
o Added settings for C++ standards in platform specific scripts.
o Analysis:
--------
+ Fixed definition of /analysis/ntuple command directory which was created
implicitly with the commands and so defined without a guideline and not
deleted.
o Externals
---------
+ zlib:
o Fixed compilation warnings on clang-3.7 compiler.
o Geometry:
--------
+ magnetic-field:
o Fix for spin tracking of particles with negative magnetic moment.
Addressing problem report #1831.
+ navigation:
o Relaxed condition for zero or almost-zero steps in G4ReplicaNavigation
and G4Navigator, to allow for faster progression in case of stuck tracks
in 3D scoring meshes. Addressing old problem report #1432.
o Fix in G4ReplicaNavigation::ComputeStep() for correct setting of copyNo
for particle entering. Fixes issue of negative copyNo observed in nested
replica setups. Addressing problem report #1634.
o Moved check for overlaps in G4Navigator::ComputeStep() within G4VERBOSE.
Addressing problem report #1811.
+ solids/Boolean:
o Minor optimisation in Inside(p) for G4UnionSolid and G4SubtractionSolid.
+ solids/specific:
o Fix in G4GenericTrap for computation of extent.
Addressing problem report #1809.
Disabled debug warning in SurfaceNormal().
o Correction in G4ExtrudedSolid::AddGeneralPolygonFacets() for precision
treatment in construction of tessels to avoid cases of collinear points
and consequent degenerating triangles.
Addressing problem report #1777.
o Use pre-computed kCarToleranceHalf constant in G4ExtrudedSolid, now
protected in G4TessellatedSolid.
o Global:
------
+ Corrected conditions for proper treatment of gcc-5 in tls.hh and
G4Threading.hh.
+ Removed unused and buggy operator=(const G4String&) in G4SubString.
+ Updated date and version for 10.2.p01.
o Graphics Representations:
------------------------
+ Use "" instead of <> for internal header inclusion in
HepPolyhedronProcessor.h.
o Materials:
---------
+ Fixed rare data-race in G4MaterialPropertiesTable for optical physics.
+ G4NistMaterialBuilder: added lock to build of new NIST material; needed,
as some physics processes may create a new NIST material from worker
thread.
+ G4NistElementBuilder: fixed typo in printout.
Addressing problem report #1786.
o Particles:
---------
+ Fixed wrong argument order CreateIon(A,Z,LL,0.0) in G4IonTable to
CreateIon(Z,A,LL,0.0).
+ Fixed setting of mass in decay parent particle.
Addressing problem report #1820.
+ Fixed G4DecayTable::SelectADecayChannel() for decay channels all
kinematically forbidden.
+ In G4IonTable removed static const tolerance and replaced with call to
G4NuclideTable; this recovers missed levels when they are closer together
than 2 keV. Reverted default value of level tolerance in G4NuclideTable
to 1 eV; turn out rounding of excitation energy to avoid potential
conservation problems.
o Persistency:
-----------
+ GDML:
o Corrected broken URLs and version number to schema.
o Physics Lists
-------------
+ builders:
o G4NeutronHPBuilder: corrected name from "NeutronHPInelastic" to
"ParticleHPInelastic".
+ constructors/limiters:
o G4ParallelWorldPhysics: fixed process order index for
G4ParallelWorldProcess to 9900 to make sure it is registered
prior to G4OpBoundaryProcess.
+ constructors/electromagnetic:
o G4EmStandardPhysicsSS: do not compute cross-section tables
if experimental Mott cross-section is enabled (this provides a
significant increase in CPU, but only in this conditions Mott
corrections are valid).
+ constructors/hadron_elastic:
o Added missing hadron elastic for He3 in G4HadronElasticPhysics,
using Glauber-Gribov elastic cross-section (Gheisha does not have
hadronic - elastic and inelastic - cross-sections for He3).
o Processes - Electromagnetic:
---------------------------
+ dna:
o In ionisation models SampleSecondaries(), added protection on energy
in case of interpolation method change.
+ lowenergy:
o Fixed inclusion guard in G4LivermorePolarizedPhotoElecticModel.hh.
Addressing problem report #1816.
o Code cleanup and fixed Coverity defects.
+ standard:
o Fixed cases of floating-point exception in G4ScreeningMottCrossSection.
Some code cleanup and performance improvements.
o Fixed sampling of scattering angle in G4eSingleCoulombScatteringModel.
Addressing problem report #1823.
o G4GoudsmitSaundersonMscModel G4GoudsmitSaundersonTable: updated step
limitations. Fixed Coverity defects and improved comments.
+ utils:
o G4EmSaturation: corrected method name from VisibleEnergyDeposition() to
VisibleEnergyDepositionAtAStep(), in order to allow overloading of
virtual method. Addressing problem report #1807.
o G4EmCalculator: fixed computation of dEdx and range for He3 and alpha.
Addressing problem report #1808.
o G4LossTableManager: avoid double addition of He3 and alpha to the loss
table map (should not have any effect on results).
+ xrays:
o G4VTransitionRadiation, G4VXTRenergyLoss: fixed process sub-type.
o G4Scintillation: use new method introduced in G4EmSaturation
VisibleEnergyDepositionAtAStep() in order to fix overloading problem.
o Processes - Generic:
-------------------
+ biasing:
o Code cleanup and Coverity fixes in 'generic' and 'management' modules.
+ scoring:
o G4ParallelWorldProcess: fixed processType from 'fParameterized'
to 'fParallel' and set processSubType to 491.
+ optical:
o Fix to DielectricLUT concerning the sequence of rotations.
Addressing problem report #1826.
o Processes - Hadronic:
--------------------
+ models/abla:
o Fixed bug in de-excitation of boosted nucleon remnants.
+ models/de_excitation:
o G4GammaTransition: added protection against rare problem in sampling
of internal conversion when transition energy is lower than atomic
level energy: instead of stopping the cascade, set bound level energy
to zero and produce final e-; this allows to complete radioactive-decay
cascade. Addressing problem report #1806.
o G4PhotonEvaporation, G4LevelManager, G4LevelReader, G4NuclearLevelData:
fixed remaining cases of production of excited stated.
Addressing problem report #1806.
o G4PhotonEvaporation, G4LevelReader, G4NucLevel: fixed treatment of
X-levels (meta-stable nuclear levels which have forbidden gamma
transition but opened beta-transitions); this fix excludes creation of
very low-energy fake gamma and provides a correct nuclear decay
sequence.
o G4PhotonEvaporation: set limit on emitted gamma energy 0.1 keV (was
10 keV).
+ models/lend:
o Fixed problem in prodcution of residual neutrons.
o Corrected use of isnan() to std::isnan() for compilers different than
Windows/VC++.
o Fixed Coverity defects.
+ models/particle_hp:
o Fixes for problem on materials with hydrogen or helium.
o Fixed problems in deletion of cross-section data set in MT mode
and initialisation of cached data.
o Fixed Coverity defects.
+ models/qmd:
o Fixed bug in handling forbidden decay in G4QMDCollision.
+ models/radioactive_decay:
o G4BetaMinusDecay, G4RadioactiveDecay: added protection for case
when end point energy is 0 in beta- decay.
Addressing problem report #1766.
+ models/util:
o G4KineticTrack: replaced G4cerr with a 'JustWarning' G4Exception.
+ util:
o G4Nucleus: increased the max number of loops allowed in the method
GetBiasedThermalNucleus().
o Run:
---
+ G4PhysicsListHelper: added entry for G4ParallelWorldProcess.
+ G4RunManager, G4WorkerRunManager: fixed process order index of
G4ParallelWorldProcess to 9900 to make sure it is registered
prior to G4OpBoundaryProcess.
o Tracking:
--------
+ G4SteppingManager: fix to properly set 'OriginTouchableHandle' for the
primary track. Addressing problem report #1773.
o Data sets:
---------
+ Patched data set for nuclides properties G4ENSDFSTATE-1.2.1:
o Added missing data for RA228, SI24, SI25 and 193RN.
+ Patched data set for radioactive-decay, G4RadioactiveDecay-4.3.1:
o Replace NaN values for intensity by 1 in z71.a157(Lu157),
z55.a136(Cs136) and z59.a129(Pr129).
o Examples:
--------
+ Updated reference outputs.
+ basic:
o Added G4ENSDFSTATEDATA in the lists of mandatory data sets; updated
README files. Addressing problem report #1810.
o B4: restored the third parameter in G4UIsession construction, which
was lost when moving G4UIExecutive at the beginning of main().
Addressing problem report #1802.
+ extended/biasing/B03:
o B03PhysicsList: corrected process order index of G4ParallelWorldProcess
to 9900 to make sure it is registered prior to G4OpBoundaryProcess.
+ extended/electromagnetic:
o Fixed macros to allow to work both with Root-5 and 6.
+ extended/radioactivedecay/rdecay01:
o PhysicsList: SetLevelTolerance to 1*eV, there appears to already be a
level Ni60[1332.510] stored somewhere instead of Ni60[1332.514].
Setting the tolerance to 1 eV gets the right level.
o Improved printout in Run::EndOfRun().
o Updated references in it1.mac and it2.mac.
----------------------------------------------------------------------------
Technical Notes
---------------
o This patch should be applied on top of release 10.2.
o Technical notes distributed for release 10.2 are also applicable and
valid for this patch.
The code and rebuilt binary libraries for release 10.2.p01 are available
through our "Download" Web page.
Please refer to the Geant4 User Documentation for further information about
using Geant4.
ReleaseNotes/Patch4.10.2-2.txt
+258
View File
@@ -0,0 +1,258 @@
Geant4 10.2 - patch-02 Release Notes
------------------------------------
17 June 2016
List of fixes included in this public patch since the public release 10.2.p01:
o Configuration:
-------------
+ CMake:
o Enhanced advanced option for use of external USolids/VecGeom library;
it is now possible to select individual shapes for partial use of the
set of primitives provided by the library, by specifying through the
GEANT4_USE_USOLIDS the list of primitives to consider, i.e. using:
-DGEANT4_USE_USOLIDS="box;tubs" will replace box and tubs shapes with
USolids/VecGeom ones; -DGEANT4_USE_USOLIDS="all" or -DGEANT4_USE_USOLIDS
will replace with all shapes enabled in the library.
o Fix for treatment of FindCLHEP module for the case of external CLHEP
installation. Addressing problem report #1855.
o Adding libXt to X11_LIBRARIES on all Unix platforms when using
Motif/Inventor. Addressing problem report #1828.
Added missing Xmu to X11_LIBRARIES when using Motif/OpenInventor on
MacOSX.
o Corrected Modules/genwindef/LibSymbolInfo.cpp for use with Windows
VC++ 64 bits compilation.
o Updated data-sets to RadioactiveDecay-4.3.2 and G4ENSDFSTATE-1.2.3.
+ GNUMake:
o Added flags for partial use of USolids/VecGeom types.
o Added Linux-clang.gmk script for use of clang compiler on Linux system.
o Analysis:
--------
+ Fixed compilation warnings from gcc-6.1.
o Digits-Hits:
-----------
+ Fixed typo in printing on cout in G4SDManager::AddNewDetector().
+ Fixed shadowing compilation warnings in G4VScoringMesh for 'ps'.
+ Code cleanup and introduced some C++11 features.
+ Checked do-while loops for potential infinite loops.
o Event:
-----
+ Fixed typo in printout. Addressing problem report #1860.
+ Fixed shadowing compilation warnings for 'ps'.
+ Code cleanup and introduced some C++11 features.
o Externals
---------
+ zlib:
o Fix in gzguts.h for Windows with Visual Studio 2015 in 64 bit
compilation.
o Geometry:
--------
+ magnetic-field:
o Corrected implementation of operator=() and copy-ctor for G4Field,
G4ElectroMagneticField, G4ElectricField and G4CachedMagneticField.
Fixed Clone() signatures in derived Field classes.
+ management:
o Throw exception in call to CreatePolyhedron() for base class G4USolid.
Method is now implemented in the concrete wrappers. Code cleanup.
o In G4USolid, directly call GetEntityType() from wrapper classes for
CreatePolyhedron().
o Added flag to USolids wrappers for partial use of USolids/VecGeom types.
o G4AffineTransform: added inline keywords and fixed formatting.
+ navigation:
o Avoid static constant definition of surface tolerance in
G4VoxelNavigation in method LocateNextVoxel() to clear spurious
warnings for data-race conflicts from Valgrind/DRD tool; defined
as class data member. Cleared up use of static constants also in
other navigation classes.
o Improved diagnostics in G4Navigator. Moved some debug checks to
G4VERBOSE.
o Fixed few compilation warnings on gcc-6.1.
+ solids/Boolean:
o Moved accessors and modifiers in UMultiUnion wrapper to be not inlined.
Required modification in order to allow correct dispatching to VecGeom
types.
+ solids/CSG:
o Added overloaded CreatePolyhedron() method to USolids wrappers.
It is now possible to visualize supported VecGeom shapes.
Added flag for partial use of USolids/VecGeom types.
Moved accessors and modifiers to be not inlined. Required modification
in order to allow correct dispatching to VecGeom types.
Added overloaded GetEntityType() method.
o G4Orb: fixed typo in G4Exception message.
+ solids/specific:
o Fix in G4IntersectingCone for smaller precision constant in
LineHitsCone1() and LineHitsCone2(). Fixes issue observed in
G4GenericPolycone. Addressing problem report #1794.
o Added overloaded GetEntityType() method to USolids wrappers.
Moved accessors and modifiers to be not inlined. Required modification
in order to allow correct dispatching to VecGeom types.
Added overloaded CreatePolyhedron() method. It is now possible to
visualize supported VecGeom shapes.
Added flag for partial use of USolids/VecGeom types.
o Global:
------
+ Define G4GeometryTolerance singleton instance pointer as tread-local
to get rid of spurious race conflicts at initialisation.
+ Added check for support of atomics for clang compiler in HEPRandom
wrappers.
+ Improved algorithm for G4RandomDirection.
+ Turn warnings to fatal exceptions in G4UnitsTable for non existing
units or categories in the table. Addressing problem report #1843.
+ Updated date and version for 10.2.p02.
o Interfaces:
----------
+ Fix for Qt driver for position of 'OK' button.
+ Fixed compilation warnings on MacOS for conversion to char* in G4UIXm.
+ Fixed compilation warnings in G4UIWin32 for Windows.
o Particles:
---------
+ Fixed MT data-race in G4VDecayTable. Addressing problem report #1834.
o Persistency:
-----------
+ GDML:
o G4GDMLWrite: increased max_chars in the transcode() calls.
Addressing problem report #1847.
o Added checks for correctness of imported units.
Addressing problem report #1842.
o Parameterisations:
-----------------
+ gflash:
o Added missing inclusion of header in G4VGFlashSensitiveDetector.
Addressing problem report #1867.
o Physics Lists
-------------
+ constructors/hadron_elastic:
o Made G4HadronElasticPhysicsPHP constructor thread-safe.
+ constructors/hadron_inelastic:
o G4HadronPhysicsFTFP_BERT_ATL: new constructor for ATLAS, similar to
G4HadronPhysicsFTFP_BERT but with the transition between BERT and FTFP
in the energy region [9, 12] GeV.
o G4HadronPhysicsQGSP_BIC_AllHP: treat only proton with ParticleHP in
this class, and move the others (deuteron, triton, 3He, alpha) to
the class G4IonPhysicsPHP.
+ constructors/ions:
o Added G4IonPhysicsPHP constructor class.
+ lists:
o New experimental physics-list FTFP_BERT_ATL, similar to FTFP_BERT but
with the transition between BERT and FTFP in the energy region [9, 12]
GeV. Meant to reduce jet energy scale difference observed in ATLAS.
o QGSP_BIC_AllHP : use new, specialized ion constructor, G4IonPhysicsPHP.
o Processes - Electromagnetic:
---------------------------
+ dna:
o Fixed compilation warnings from gcc-6.1.
+ lowenergy:
o Updated G4LowEPComptonModel; addressing problem report #1676.
o Replaced usage of std::exp() by G4Exp().
o Fixed compilation warnings in gcc-6.1. Code cleanup.
+ standard:
o G4eSingleCoulombScatteringModel, G4ScreeningMottCrossSection: fixed
initialisation of classes allowing to use precomputed cross-sections.
Addressing problem report #1823.
+ utils:
o G4EmCalculator: added protection against zero cut value; use lowest
electron energy. Addressing problem report #1845.
o Processes - Hadronic:
--------------------
+ models/de_excitation:
o G4PhotonEvaporation: fixed final energy in the case of X-level.
o G4ExcitationHandler: substituted usage of iterators by simple loop;
added exception for the case of infinite loop of evaporation.
Addressing problem report #1837.
+ models/lend:
o Fixed problem on setting birth time of delayed neutrons.
+ models/particle_hp:
o Fixed problem in deletion of models in multi-thread mode.
o Corrected message about a behavior under the activation of fission
fragment production.
o Fixed bug in usage of G4Nucleus::GetBiassedThermalNucleus().
o Fix for calculation of residual A and Z, affecting results for
charged particle projectiles. Addressing problem report #1815.
o Bug fix in sampling of kinematic energy of scattered particle in
DiscreteTwoBody. Addressing problem report #1815.
o Fixed warning message from gcc-6.1.
o Fixed Coverity defects.
+ models/parton_string/diffraction:
o Fixed bug in G4FTFModel for nucleus-nucleus interactions
Also improvements in sampling of kinematical variables.
o Improved G4FTFAnnihilation; now creating Pi0, Eta and Eta_prime.
+ models/quasi_elastic:
o Fixed shadowing compilation warnings in G4QuasiElRatios for 'ps'.
+ models/radioactive_decay:
o Use new API for G4VDecayChannel class to avoid MT data-race.
Fixes issues of observed event non-reproducibility in MT mode.
+ models/util:
o G4Fragment: introduced "spin", added accessors and modifiers needed
by INCL++; fixes a memory leak discussed on HN PhysicsList Forum #930.
o Use modified G4VDecayChannel API to avoid data-race in MT.
o Fixed Coverity defects.
o Track:
-----
+ Use G4Log in G4VelocityTable::Value() method.
o Visualization:
-------------
+ Fixed compilation warnings from gcc-6.1.
+ gMocren:
o Fixed compilation warnings on win64.
+ OpenInventor:
o Corrected delete statement in sortBookmarksCB() for
G4OpenInventorXtExaminerViewer.
o Fixed compilation warnings on MacOS for conversion to char* in
G4OpenInventorXtExtendedViewer and G4OpenInventorXtViewer sources.
o Data sets:
---------
+ Patched data set for nuclides properties G4ENSDFSTATE-1.2.3:
o Corrected packaging for download. Contents unchanged.
Addressing problem reports #1849, #1854.
+ Patched data set for radioactive-decay, G4RadioactiveDecay-4.3.2:
o Corrected packaging for download. Contents unchanged.
Addressing problem reports #1849, #1854.
o Examples:
--------
+ Updated reference outputs.
+ advanced/human_phantom:
o Fixed compilation warnings from gcc-6.1.
+ basic/B3:
o Fixed initialization of the hits collections IDs in B3aEventAction.
Addressing problem report #1862.
+ basic/B5:
o Fixed wrong determination of the copy number in replicas.
+ extended/field:
o field03, field04: fixed compilation warnings from gcc-6.1.
+ extended/parameterisations/Par02:
o Added magnetic field and corrected the way to create a G4FieldTrack
object in Par02FastSimModelTracker.
----------------------------------------------------------------------------
Technical Notes
---------------
o This patch should be applied on top of release 10.2.
o Technical notes distributed for release 10.2 are also applicable and
valid for this patch.
The code and rebuilt binary libraries for release 10.2.p01 are available
through our "Download" Web page.
Please refer to the Geant4 User Documentation for further information about
using Geant4.
cmake/History
+131
View File
@@ -31,6 +31,136 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
----------------------------------------------------------
17th June 2016 - Gabriele Cosmo (cmake-V10-02-17)
- Modules/Geant4OptionalComponents.cmake: set CLHEP-2.3.3.0 as the required
version for external CLHEP library.
9th June 2016 - Gunter Folger (cmake-V10-02-16)
- revert change in Templates/Geant4Config.cmake.in in tag cmake-V10-02-14,
revision 97140; the coworking tags have been rejected.
3rd June 2016 - Gunter Folger (cmake-V10-02-15)
- switch to RadioActiveDecay 4.4.1 and G4ENSDFSTATE 1.3.1, both provided by
Laurent.
25th May 2016 - Robert Hatcher (cmake-V10-02-14)
- Templates/Geant4Config.cmake.in : No longer use --whole-archive for
G4physicslists on static builds; this was never possible for _WIN32 and recent
physics list factory work makes this untenable.
25th May 2016 - Ben Morgan (cmake-V10-02-13)
- Modules/Geant4InterfaceOptions.cmake : Always add Xmu to X11_LIBRARIES when
using Motif/OpenInventor to avoid missing symbol errors on OS X.
24th May 2016 - Ben Morgan (cmake-V10-02-12)
- Modules/Geant4OptionalComponents.cmake : Fix regex to avoid matching to "CONS"
shape is check for all shapes.
24th May 2016 - Ben Morgan (cmake-V10-02-11)
- Modules/Geant4OptionalComponents.cmake : Initial implementation of a list
based interface to GEANT4_USE_USOLIDS. Rather than booleans, unify USolids
replacement into single string/list variable with following behaviour:
1) Setting to "all", any CMake boolean true value, or a list containing either
results in complete usolids replacement
2) A list, i.e. "a;b;c", or shapes to replace with Usolids equivalents may be supplied.
Validate arguments to prevent unknown shapes being set, and otherwise retain previous
behaviour
List allowed values in option docstring.
- Modules/Geant4BuildProjectConfig.cmake : Ensure setting of Usolids use marker to a
proper boolean value.
- Templates/Geant4Config.cmake.in : Use new full boolean variable as expansion variable
to indicate usolids support.
23rd May 2016 - Ben Morgan
- Modules/Geant4OptionalComponents.cmake : Allow developers to select
subsets of solids to replace with USolids equivalents. Request from developers
and CMS to assist in performance evaluation. NOT INTENDED FOR USERS!
If GEANT4_USE_SOLIDS is set, use existing configuration/setup. If it is OFF,
allow setting of additional CMake options, one per shape, to enable replacement
of that shape with USolids equivalent. When any of these variables are set, set
additional internal variable GEANT4_USE_PARTIAL_USOLIDS. Convert variables to
internal preprocessor flags for shape/usolid activation.
- Modules/Geant4BuildProjectConfig.cmake : Export needed USOLIDS/shape activation
preprocessor flags for selected configuration.
- Modules/Geant4ConfigureConfigScript.cmake : Export needed USOLIDS/shape activation
preprocessor flags for selected configuration.
28th April 2016 - Ben Morgan (cmake-V10-02-10)
- Templates/Geant4Config.cmake.in: BUGFIX #1855. When using an external
CLHEP, the provided FindCLHEP module is not used. Wrap call to
find_package(CLHEP) with push/pop of CMAKE_MODULE_PATH to ensure
Geant4's builtin module is used and not interfere with any user
settings of CMAKE_MODULE_PATH.
19th April 2016 - Gunter Folger (cmake-V10-02-09)
- correct Modules/genwindef/LibSymbolInfo.cpp for use with VC 64 bit compilation
29th March 2016 - Gunter Folger (cmake-V10-02-08)
- switch to RadioActiveDecay 4.4; dataset identical to 4.3.1, packaging
corrected to be a compressed tar file, 4.3.1 is plain tar
16th March 2016 - Ben Morgan (cmake-V10-02-07)
- Modules/Geant4InterfaceOptions.cmake : Fix Bug #1828
Apply patch from Vladimir Belov to add libXt to X11_LIBRARIES on all
Unix platforms when using Motif/Inventor.
23rd February 2016 - Gunter Folger (cmake-V10-02-06)
- Correct md5sum for RadioactiveDecay.4.3.1 after removal of MAC Safari files.
23rd February 2016 - Gunter Folger (cmake-V10-02-05)
- Modules/Geant4DatasetDefinitions.cmake:
- revert back to G4ENSDFSTATE.1.3
- use patched RadioactiveDecay data 4.3.1
23rd February 2016 - Gunter Folger (cmake-V10-02-04)
- Modules/Geant4DatasetDefinitions.cmake: Use data set G4ENSDFSTATE.1.2.1
Note 1.2.1 is identical to 1.3, it is a patch on 1.2
5th February 2016 - Gunter Folger (cmake-V10-02-03)
- Modules/Geant4DatasetDefinitions.cmake: Use new data set G4ENSDFSTATE.1.3
22nd January 2016 - Ben Morgan (cmake-V10-02-02)
- Modules/FindCLHEP.cmake : Restore from last version. Update regexing
of defs.h file for CLHEP 2.3.1.1 changes, retaining compatibility with
earlier versions. Create imported targets CLHEP and CLHEP::<COMPONENT>
to ease transition to full Config mode support once we can support it.
- Modules/Geant4OptionalComponents.cmake : Rollback to using package-mode
to locate CLHEP. Modify CLHEP_LIBRARIES after finding to fill this with
the imported targets instead of absolute paths.
- Modules/Geant4BuildProjectConfig.cmake : Add FindCLHEP.cmake to installed
modules so that Geant4Config.cmake can refind CLHEP and hence the imported
targets.
- Templates/Geant4Config.cmake.in : Refind CLHEP using package-mode,
using hardcoded CLHEP_ROOT_DIR if set as a hint.
15th December 2015 - Ben Morgan (cmake-V10-02-01)
- Templates/Geant4Config.cmake.in : Use PATHS option in find_package
for CLHEP, setting it to discovered CLHEP_DIR. Required at present
to provide a hint to builds of tests, which do not have
CMAKE_PREFIX_PATH set appropriately.
15th December 2015 - Ben Morgan (cmake-V10-02-00)
- [BUGFIX #1805] : Preliminary fix for CLHEP 2.3.1.1 config error
- Modules/FindCLHEP.cmake : REMOVED as obsolete
- Modules/Geant4OptionalComponents.cmake : Use NO_MODULE in
find_package(CLHEP) so that CLHEPConfig.cmake is preferred.
Retain use of CLHEP_ROOT_DIR temporarily for transition in
testing system
- Modules/Geant4BuildProjectConfig.cmake : Remove setting of explicit CLHEP
directory, defering this to find_package call in Geant4Config.cmake
- Templates/Geant4Config.cmake.in : Use namespaced name for Geant4 cmake
directory to avoid upstream clashes.
Add explicit call to find_package(CLHEP) so that imported targets are refound.
Move inclusion of targets file to after setup steps to ensure all external
targets exist before this is included. This is also to help further work
on use of imported targets.
- Modules/Geant4ConfigureConfigScript.cmake : Extract LOCATION property from
CLHEP targets to provide setting of lib paths in geant4-config
- Templates/geant4-config.cmake.in : Remove explicit calls to clhep-config
- Modules/Geant4ToolchainBackwardCompatibility.cmake : Extract LOCATION
properties from CLHEP imported targets.
25th November 2015 - Ben Morgan (cmake-V10-01-41)
- Modules/Geant4InterfaceOptions.cmake : Move force Qt4 option
alongside use Qt option so that it can be set in Curses/GUI before
@@ -108,6 +238,7 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
23th October 2015 - Gunter Folger (cmake-V10-01-32)
- Modules/Geant4DatasetDefinitions.cmake: Use new data set G4ENSDFSTATE.1.2
22nd October 2015 - Ben Morgan (cmake-V10-01-31)
- Modules/Geant4ToolchainBackwardCompatibility.cmake : Add export
of TOOLS_FONT_PATH to environment when Freetype support is enabled,
cmake/Modules/FindCLHEP.cmake
+35 -1
View File
@@ -205,7 +205,7 @@ find_path(CLHEP_INCLUDE_DIR CLHEP/Units/defs.h
if(CLHEP_INCLUDE_DIR)
set(CLHEP_VERSION 0)
file(READ "${CLHEP_INCLUDE_DIR}/CLHEP/Units/defs.h" _CLHEP_DEFS_CONTENTS)
string(REGEX REPLACE ".*#define PACKAGE_VERSION \"([0-9.]+).*" "\\1"
string(REGEX REPLACE ".*#define (PACKAGE|CLHEP_UNITS)+_VERSION \"([0-9.]+).*" "\\2"
CLHEP_VERSION "${_CLHEP_DEFS_CONTENTS}")
if(NOT CLHEP_FIND_QUIETLY)
@@ -310,6 +310,40 @@ if(CLHEP_FOUND)
list(APPEND CLHEP_LIBRARIES ${${__clhep_lib}})
endforeach()
set(CLHEP_INCLUDE_DIRS ${CLHEP_INCLUDE_DIR})
# Create imported targets
foreach(__clhep_lib ${__CLHEP_LIBRARY_SET})
# Construct imported target name
string(REPLACE "_LIBRARY" "" __clhep_imp_lib "${__clhep_lib}")
string(REPLACE "_" "::" __clhep_imp_lib "${__clhep_imp_lib}")
if(__clhep_imp_lib STREQUAL "CLHEP")
# Create both CLHEP and CLHEP::CLHEP targets
if(NOT TARGET CLHEP::CLHEP)
add_library(CLHEP::CLHEP UNKNOWN IMPORTED)
set_target_properties(CLHEP::CLHEP PROPERTIES
IMPORTED_LOCATION "${CLHEP_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${CLHEP_INCLUDE_DIRS}"
)
endif()
if(NOT TARGET CLHEP)
add_library(CLHEP UNKNOWN IMPORTED)
set_target_properties(CLHEP PROPERTIES
IMPORTED_LOCATION "${CLHEP_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${CLHEP_INCLUDE_DIRS}"
)
endif()
else()
# Have a component target - these are always namespaced
# Note that at present, link interfaces aren't created...
if(NOT TARGET ${__clhep_imp_lib})
add_library(${__clhep_imp_lib} UNKNOWN IMPORTED)
set_target_properties(${__clhep_imp_lib} PROPERTIES
IMPORTED_LOCATION "${${__clhep_lib}}"
INTERFACE_INCLUDE_DIRECTORIES "${CLHEP_INCLUDE_DIRS}"
)
endif()
endif()
endforeach()
endif()
#----------------------------------------------------------------------------
cmake/Modules/Geant4BuildProjectConfig.cmake
+7 -9
View File
@@ -40,11 +40,8 @@ endif()
# - Stuff from Geant4OptionalComponents.cmake
# - CLHEP
# If it's internal, add it to the externals list, if it's external, add the
# include directories to the list of third party header paths
if(GEANT4_USE_SYSTEM_CLHEP)
list(APPEND GEANT4_THIRD_PARTY_INCLUDES ${CLHEP_INCLUDE_DIRS})
else()
# If it's internal, add it to the externals list
if(NOT GEANT4_USE_SYSTEM_CLHEP)
list(APPEND GEANT4_EXTERNALS_TARGETS G4clhep)
endif()
@@ -70,8 +67,9 @@ endif()
# - USolids
# Compile definitions
if(GEANT4_USE_USOLIDS)
list(APPEND GEANT4_CORE_DEFINITIONS -DG4GEOM_USE_USOLIDS)
if(GEANT4_USE_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
set(GEANT4_USE_USOLIDS_EITHER ON)
list(APPEND GEANT4_CORE_DEFINITIONS ${GEANT4_USOLIDS_COMPILE_DEFINITIONS})
# System USolids headers, because these do appear in Geant4's
# public interface. The library should be in the link interface
@@ -163,7 +161,7 @@ configure_file(
COPYONLY
)
foreach(_mod AIDA HepMC Pythia6 ROOT StatTest TBB)
foreach(_mod AIDA CLHEP HepMC Pythia6 ROOT StatTest TBB)
configure_file(
${PROJECT_SOURCE_DIR}/cmake/Modules/Find${_mod}.cmake
${PROJECT_BINARY_DIR}/Modules/Find${_mod}.cmake
@@ -207,7 +205,7 @@ else()
set(GEANT4_INCLUDE_DIR_SETUP "
# Geant4 configured for the install with relative paths, so use these
get_filename_component(Geant4_INCLUDE_DIR \"\${_thisdir}/${GEANT4_RELATIVE_HEADER_PATH}\" ABSOLUTE)
get_filename_component(Geant4_INCLUDE_DIR \"\${_geant4_thisdir}/${GEANT4_RELATIVE_HEADER_PATH}\" ABSOLUTE)
")
endif()
cmake/Modules/Geant4ConfigureConfigScript.cmake
+11 -4
View File
@@ -94,12 +94,19 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS AND UNIX)
# - CLHEP
if(GEANT4_USE_SYSTEM_CLHEP)
set(G4_BUILTWITH_CLHEP "no")
#inc path
get_filename_component(G4_SYSTEM_CLHEP_INCLUDE_DIR "${CLHEP_INCLUDE_DIR}" ABSOLUTE)
#libpath
list(GET CLHEP_LIBRARIES 0 _zeroth_clhep_lib)
get_filename_component(_system_clhep_libdir "${_zeroth_clhep_lib}" PATH)
get_target_property(_system_clhep_libdir "${_zeroth_clhep_lib}" LOCATION)
get_filename_component(_system_clhep_libdir "${_system_clhep_libdir}" REALPATH)
get_filename_component(_system_clhep_libdir "${_system_clhep_libdir}" DIRECTORY)
set(G4_SYSTEM_CLHEP_LIBRARIES "-L${_system_clhep_libdir}")
foreach(_clhep_lib ${CLHEP_LIBRARIES})
get_filename_component(_curlib "${_clhep_lib}" NAME)
get_target_property(_curlib "${_clhep_lib}" LOCATION)
get_filename_component(_curlib "${_curlib}" NAME)
string(REGEX REPLACE "^lib(.*)\\.(so|a|dylib|lib|dll)$" "\\1" _curlib "${_curlib}")
set(G4_SYSTEM_CLHEP_LIBRARIES "${G4_SYSTEM_CLHEP_LIBRARIES} -l${_curlib}")
endforeach()
@@ -144,13 +151,13 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS AND UNIX)
endif()
# - USolids
if(GEANT4_USE_USOLIDS)
if(GEANT4_USE_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
set(G4_BUILTWITH_USOLIDS "yes")
set(G4_USOLIDS_INCLUDE_DIRS ${USOLIDS_INCLUDE_DIRS})
list(REMOVE_DUPLICATES G4_USOLIDS_INCLUDE_DIRS)
list(REMOVE_ITEM G4_USOLIDS_INCLUDE_DIRS ${_cxx_compiler_dirs})
set(G4_USOLIDS_CFLAGS "-DG4GEOM_USE_USOLIDS")
string(REPLACE ";" " " G4_USOLIDS_CFLAGS "${GEANT4_USOLIDS_COMPILE_DEFINITIONS}")
foreach(_dir ${G4_USOLIDS_INCLUDE_DIRS})
set(G4_USOLIDS_CFLAGS "${G4_USOLIDS_CFLAGS} -I${_dir}")
endforeach()
cmake/Modules/Geant4DatasetDefinitions.cmake
+4 -4
View File
@@ -38,11 +38,11 @@ geant4_add_dataset(
# - Radioisotopes
geant4_add_dataset(
NAME RadioactiveDecay
VERSION 4.3
VERSION 4.4.1
FILENAME G4RadioactiveDecay
EXTENSION tar.gz
ENVVAR G4RADIOACTIVEDATA
MD5SUM 9f1630a5d9f00b4ba1ffc5f7df174827
MD5SUM 0aa6c879c17b26f1ca85d3ac915fc30e
)
# - Neutron XS
@@ -98,10 +98,10 @@ geant4_add_dataset(
# - ENSDFSTATE
geant4_add_dataset(
NAME G4ENSDFSTATE
VERSION 1.2
VERSION 1.3.1
FILENAME G4ENSDFSTATE
EXTENSION tar.gz
ENVVAR G4ENSDFSTATEDATA
MD5SUM a2e88f2c626141e4be4587c838832707
MD5SUM eddd153110184256a57ce6b753f0d527
)
cmake/Modules/Geant4InterfaceOptions.cmake
+3 -5
View File
@@ -236,11 +236,9 @@ if(UNIX)
endif()
# Create final list of X11 libraries needed for Geant4
# - Motif
if(APPLE)
if(GEANT4_USE_XM OR GEANT4_USE_INVENTOR)
set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xt_LIB})
endif()
# - Motif/Inventor
if(GEANT4_USE_XM OR GEANT4_USE_INVENTOR)
set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xt_LIB} ${X11_Xmu_LIBRARY})
endif()
# - If we got to this point, RayTracer is o.k., so add the feature
cmake/Modules/Geant4OptionalComponents.cmake
+76 -9
View File
@@ -53,9 +53,19 @@ if(GEANT4_USE_SYSTEM_CLHEP)
set(__system_clhep_mode " (granular)")
endif()
# We keep this as required, because if the user chooses to use a
# system option we assume that we absolutely, positively require this.
find_package(CLHEP 2.3.1.0 REQUIRED ${__g4_clhep_components})
# Find CLHEP using package-mode (i.e. FindCLHEP)
# This will set up imported targets for us, but we need
# to set CLHEP_LIBRARIES afterwards to use these
find_package(CLHEP 2.3.3.0 REQUIRED ${__g4_clhep_components})
set(CLHEP_LIBRARIES CLHEP::CLHEP)
if(GEANT4_USE_SYSTEM_CLHEP_GRANULAR)
set(CLHEP_LIBRARIES)
foreach(_comp ${__g4_clhep_components})
list(APPEND CLHEP_LIBRARIES "CLHEP::${_comp}")
endforeach()
endif()
set(GEANT4_USE_SYSTEM_CLHEP TRUE)
else()
set(CLHEP_FOUND TRUE)
@@ -167,22 +177,79 @@ endif()
#-----------------------------------------------------------------------
# Optional support for USolids - Requires USolids package
#
option(GEANT4_USE_USOLIDS "EXPERIMENTAL: Replace Geant4 solids with USolids equivalents" OFF)
# GEANT4_USE_USOLIDS is a list argument which must take values:
# - Empty/CMake boolean false : DEFAULT, do not replace G4 solids with USolids
# - ALL/CMake boolean true : Replace all G4 solids with USolids
# - List : Replace listed G4 solids with Usolids equivalents. Valid elements are
set(GEANT4_USOLIDS_SHAPES
BOX
CONS
EXTRUDEDSOLID
GENERICPOLYCONE
GENERICTRAP
ORB
PARABOLOID
POLYCONE
POLYHEDRA
SPHERE
TET
TRAP
TRD
TORUS
TUBS
)
set(GEANT4_USE_USOLIDS OFF CACHE STRING "EXPERIMENTAL: List Geant4 solids to replace with USolids equivalents (ALL;${GEANT4_USOLIDS_SHAPES})")
mark_as_advanced(GEANT4_USE_USOLIDS)
# - Must be a CMake list - no real way to enforce this
# Preprocess by stripping any spaces and uppercasing
string(REPLACE " " "" __g4_usolids_shape_list "${GEANT4_USE_USOLIDS}")
string(TOUPPER "${__g4_usolids_shape_list}" __g4_usolids_shape_list)
# - Check for use of all or usolids
set(GEANT4_USE_ALL_USOLIDS OFF)
string(REGEX MATCH "ALL|^(1|ON|YES|TRUE)" GEANT4_USE_ALL_USOLIDS "${__g4_usolids_shape_list}")
# - Check and validate partial non-empty list
if(NOT GEANT4_USE_ALL_USOLIDS AND GEANT4_USE_USOLIDS)
set(GEANT4_USE_PARTIAL_USOLIDS ON)
set(GEANT4_USE_PARTIAL_USOLIDS_SHAPE_LIST)
foreach(__g4_usolids_requested_shape ${__g4_usolids_shape_list})
list(FIND GEANT4_USOLIDS_SHAPES "${__g4_usolids_requested_shape}" __g4solids_shape_index)
if(__g4solids_shape_index GREATER -1)
list(APPEND GEANT4_USE_PARTIAL_USOLIDS_SHAPE_LIST ${__g4_usolids_requested_shape})
else()
message(FATAL_ERROR "GEANT4_USE_USOLIDS: unknown shape '${__g4_usolids_requested_shape}' in input, must be one of\n${GEANT4_USOLIDS_SHAPES}\n")
endif()
endforeach()
endif()
# - G4USolids setup
if(GEANT4_USE_USOLIDS)
if(GEANT4_USE_ALL_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
find_package(USolids REQUIRED)
add_definitions(-DG4GEOM_USE_USOLIDS)
if(GEANT4_USE_ALL_USOLIDS)
set(GEANT4_USOLIDS_COMPILE_DEFINITIONS "-DG4GEOM_USE_USOLIDS")
GEANT4_ADD_FEATURE(GEANT4_USE_USOLIDS "Replacing all Geant4 solids with USolids equivalents (EXPERIMENTAL)")
else()
set(GEANT4_USOLIDS_COMPILE_DEFINITIONS "-DG4GEOM_USE_PARTIAL_USOLIDS")
foreach(__g4_usolid_shape ${GEANT4_USE_PARTIAL_USOLIDS_SHAPE_LIST})
list(APPEND GEANT4_USOLIDS_COMPILE_DEFINITIONS "-DG4GEOM_USE_U${__g4_usolid_shape}")
endforeach()
GEANT4_ADD_FEATURE(GEANT4_USE_USOLIDS "Replacing Geant4 solids with USolids equivalents for ${GEANT4_USE_PARTIAL_USOLIDS_SHAPE_LIST} (EXPERIMENTAL)")
endif()
# Combined definitions
add_definitions(${GEANT4_USOLIDS_COMPILE_DEFINITIONS})
# Add USolids inc dirs here - can be removed once USolids supports
# INTERFACE_INCLUDE_DIRECTORIES
include_directories(${USOLIDS_INCLUDE_DIRS})
endif()
GEANT4_ADD_FEATURE(GEANT4_USE_USOLIDS "Replacing Geant4 solids with USolids equivalents (EXPERIMENTAL)")
#-----------------------------------------------------------------------
# Optional support for Freetype - Requires external Freetype install
cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake
+16 -9
View File
@@ -327,25 +327,29 @@ macro(_g4tc_configure_tc_variables SHELL_FAMILY SCRIPT_NAME)
# - CLHEP...
if(GEANT4_USE_SYSTEM_CLHEP)
# Have to use detected CLHEP paths to set base dir and others
get_filename_component(_CLHEP_BASE_DIR ${CLHEP_INCLUDE_DIR} PATH)
get_filename_component(_CLHEP_INCLUDE_DIR "${CLHEP_INCLUDE_DIR}" REALPATH)
get_filename_component(_CLHEP_BASE_DIR "${_CLHEP_INCLUDE_DIR}" DIRECTORY)
# Handle granular vs singular cases
if(GEANT4_USE_SYSTEM_CLHEP_GRANULAR)
get_filename_component(_CLHEP_LIB_DIR ${CLHEP_Vector_LIBRARY} PATH)
get_target_property(_CLHEP_LIB_DIR CLHEP::Vector LOCATION)
else()
get_filename_component(_CLHEP_LIB_DIR ${CLHEP_LIBRARY} PATH)
get_target_property(_CLHEP_LIB_DIR CLHEP::CLHEP LOCATION)
endif()
set(GEANT4_TC_G4LIB_USE_CLHEP "# USING SYSTEM CLHEP")
_g4tc_setenv_command(GEANT4_TC_CLHEP_BASE_DIR ${SHELL_FAMILY} CLHEP_BASE_DIR ${_CLHEP_BASE_DIR})
get_filename_component(_CLHEP_LIB_DIR "${_CLHEP_LIB_DIR}" REALPATH)
get_filename_component(_CLHEP_LIB_DIR "${_CLHEP_LIB_DIR}" DIRECTORY)
_g4tc_setenv_command(GEANT4_TC_CLHEP_INCLUDE_DIR ${SHELL_FAMILY} CLHEP_INCLUDE_DIR ${CLHEP_INCLUDE_DIR})
set(GEANT4_TC_G4LIB_USE_CLHEP "# USING SYSTEM CLHEP")
_g4tc_setenv_command(GEANT4_TC_CLHEP_BASE_DIR ${SHELL_FAMILY} CLHEP_BASE_DIR "${_CLHEP_BASE_DIR}")
_g4tc_setenv_command(GEANT4_TC_CLHEP_INCLUDE_DIR ${SHELL_FAMILY} CLHEP_INCLUDE_DIR "${_CLHEP_INCLUDE_DIR}")
# Only need to handle CLHEP_LIB for granular case
if(GEANT4_USE_SYSTEM_CLHEP_GRANULAR)
set(G4_SYSTEM_CLHEP_LIBRARIES )
foreach(_clhep_lib ${CLHEP_LIBRARIES})
get_filename_component(_curlib "${_clhep_lib}" NAME)
get_target_property(_CLHEP_LIB_NAME ${_clhep_lib} LOCATION)
get_filename_component(_curlib "${_CLHEP_LIB_NAME}" NAME)
string(REGEX REPLACE "^lib(.*)\\.(so|a|dylib|lib|dll)$" "\\1" _curlib "${_curlib}")
set(G4_SYSTEM_CLHEP_LIBRARIES "${G4_SYSTEM_CLHEP_LIBRARIES} -l${_curlib}")
endforeach()
@@ -757,11 +761,14 @@ foreach(_shell bourne;cshell)
if(GEANT4_USE_SYSTEM_CLHEP)
# Handle granular vs singular cases
if(GEANT4_USE_SYSTEM_CLHEP_GRANULAR)
get_filename_component(_CLHEP_LIB_DIR ${CLHEP_Vector_LIBRARY} PATH)
get_target_property(_CLHEP_LIB_DIR CLHEP::Vector LOCATION)
else()
get_filename_component(_CLHEP_LIB_DIR ${CLHEP_LIBRARY} PATH)
get_target_property(_CLHEP_LIB_DIR CLHEP::CLHEP LOCATION)
endif()
get_filename_component(_CLHEP_LIB_DIR "${_CLHEP_LIB_DIR}" REALPATH)
get_filename_component(_CLHEP_LIB_DIR "${_CLHEP_LIB_DIR}" DIRECTORY)
_g4tc_prepend_path(GEANT4_TC_CLHEP_LIB_PATH_SETUP
${_shell}
${_libpathname}
cmake/Modules/genwindef/LibSymbolInfo.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
using namespace std;
#define MakePtr( cast, ptr, addValue ) (cast)( (DWORD)(ptr) + (DWORD)(addValue))
#define MakePtr( cast, ptr, addValue ) (cast)( (DWORD_PTR)(ptr) + (DWORD_PTR)(addValue))
/////////////////////////////////////////////////////////////////////////////
// CLibSymbolInfo
cmake/Templates/Geant4Config.cmake.in
+43 -28
View File
@@ -157,7 +157,7 @@ endif()
# Locate ourselves, since all other config files should have been
# installed alongside us...
#
get_filename_component(_thisdir "${CMAKE_CURRENT_LIST_FILE}" PATH)
get_filename_component(_geant4_thisdir "${CMAKE_CURRENT_LIST_FILE}" PATH)
#-----------------------------------------------------------------------
# Provide *recommended* compiler flags used by this build of Geant4
@@ -202,6 +202,22 @@ endif()
@GEANT4_MODULE_PATH_SETUP@
#-----------------------------------------------------------------------
# Re-Configure paths for third party packages.
# - Refind any needed external/imported targets.
# - Relies on same/compatible packages being in the paths CMake uses to
# search for packages
#-----------------------------------------------------------------------
# If we have used imported targets for any third party packages, reimport
# them here, BEFORE we try and import the Geant4 targets which are
# linked against them.
# Generally, we try and use a standard find_package, but try and force it
# to find the actual package we were built against.
# THIS IS NOT PERFECT, AS IT CANNOT GUARANTEE A BINARY COMPATIBLE
# PACKAGE IS FOUND.
@GEANT4_THIRD_PARTY_IMPORT_SETUP@
#-----------------------------------------------------------------------
# Configure the path(s) to third party headers.
# This is not a perfect solution to recording dependencies on external
@@ -219,31 +235,6 @@ set(Geant4_INCLUDE_DIRS
${Geant4_INCLUDE_DIR}
${Geant4_THIRD_PARTY_INCLUDE_DIRS})
#-----------------------------------------------------------------------
# If we have used imported targets for any third party packages, reimport
# them here, BEFORE we try and import the Geant4 targets which are
# linked against them.
# Generally, we try and use a standard find_package, but try and force it
# to find the actual package we were built against.
# THIS IS NOT PERFECT, AS IT CANNOT GUARANTEE A BINARY COMPATIBLE
# PACKAGE IS FOUND.
@GEANT4_THIRD_PARTY_IMPORT_SETUP@
#-----------------------------------------------------------------------
# Include the files listing all the imported targets and configuring
# Intel Compile Features
# (Not needed if used in the same Geant4 project, or if we have run before)
# This is always installed in the same location as us...
#
if(NOT CMAKE_PROJECT_NAME STREQUAL Geant4)
include("${_thisdir}/Modules/IntelCompileFeatures.cmake")
if(NOT Geant4_LIBDEPS_LOADED)
include("${_thisdir}/Geant4LibraryDepends.cmake")
set(Geant4_LIBDEPS_LOADED 1)
endif()
endif()
#-----------------------------------------------------------------------
# Data Resources
# NB: Because data paths can be "forward declared" these offer no
@@ -273,6 +264,16 @@ unset(Geant4_DATASET_DESCRIPTIONS)
set(Geant4_builtin_clhep_FOUND @GEANT4_USE_BUILTIN_CLHEP@)
if(NOT Geant4_builtin_clhep_FOUND)
set(Geant4_system_clhep_ISGRANULAR @GEANT4_USE_SYSTEM_CLHEP_GRANULAR@)
set(CLHEP_ROOT_DIR "@CLHEP_ROOT_DIR@")
set(__GEANT4_OLD_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
set(CMAKE_MODULE_PATH "${_geant4_thisdir}/Modules" ${CMAKE_MODULE_PATH})
find_package(CLHEP @CLHEP_VERSION@ REQUIRED @__g4_clhep_components@)
set(CMAKE_MODULE_PATH ${__GEANT4_OLD_CMAKE_MODULE_PATH})
unset(CLHEP_ROOT_DIR)
unset(__GEANT4_OLD_CMAKE_MODULE_PATH)
#CLHEP doesn't use target properties fully yet, so always include_directories
include_directories(${CLHEP_INCLUDE_DIRS})
endif()
set(Geant4_builtin_expat_FOUND @GEANT4_USE_BUILTIN_EXPAT@)
@@ -304,7 +305,7 @@ if(Geant4_g3tog4_FOUND)
endif()
# - Usolids
set(Geant4_usolids_FOUND @GEANT4_USE_USOLIDS@)
set(Geant4_usolids_FOUND @GEANT4_USE_USOLIDS_EITHER@)
if(Geant4_usolids_FOUND)
list(REMOVE_ITEM Geant4_FIND_COMPONENTS usolids)
endif()
@@ -488,6 +489,20 @@ if(Geant4_vis_openinventor_FOUND)
list(REMOVE_ITEM Geant4_FIND_COMPONENTS vis_openinventor)
endif()
#-----------------------------------------------------------------------
# Include the files listing all the imported targets and configuring
# Intel Compile Features
# (Not needed if used in the same Geant4 project, or if we have run before)
# This is always installed in the same location as us...
#
if(NOT CMAKE_PROJECT_NAME STREQUAL Geant4)
include("${_geant4_thisdir}/Modules/IntelCompileFeatures.cmake")
if(NOT Geant4_LIBDEPS_LOADED)
include("${_geant4_thisdir}/Geant4LibraryDepends.cmake")
set(Geant4_LIBDEPS_LOADED 1)
endif()
endif()
#-----------------------------------------------------------------------
# Now perform final configuration of libraries...
@@ -614,7 +629,7 @@ list(REMOVE_DUPLICATES Geant4_LIBRARIES)
# Point the user to the UseGeant4.cmake file which they may wish to include
# to help them with setting up Geant4
#
set(Geant4_USE_FILE ${_thisdir}/UseGeant4.cmake)
set(Geant4_USE_FILE "${_geant4_thisdir}/UseGeant4.cmake")
#-----------------------------------------------------------------------
# Finally, handle any remaining components.
cmake/Templates/geant4-config.in
+1 -3
View File
@@ -57,8 +57,6 @@ description="Geant4 toolkit for the simulation of the passage of particles throu
version="@Geant4_VERSION@"
# 'Requires' that may affect cflags and libs.
clhep_config_exe=@CLHEP_CONFIG_EXECUTABLE@
# Basic flags and libraries for visualization
vis_cflags="-DG4UI_USE_TCSH"
@@ -131,7 +129,7 @@ have_clhep="@G4_BUILTWITH_CLHEP@"
feature_list="${feature_list} clhep[${have_clhep}]"
if test "x${have_clhep}" = "xno" ; then
cflags="${cflags} `${clhep_config_exe} --include`"
cflags="${cflags} -I@G4_SYSTEM_CLHEP_INCLUDE_DIR@"
libs="${libs} @G4_SYSTEM_CLHEP_LIBRARIES@"
fi
if test "x${have_clhep}" = "xyes" ; then
config/History
+17 -1
View File
@@ -1,4 +1,4 @@
svn log $Id: History 94578 2015-11-25 08:11:03Z gcosmo $
svn log $Id: History 97771 2016-06-09 15:15:27Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -16,6 +16,22 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
8th June 2016 Gunter Folger (config-V10-02-04)
- revert previous change for G4{,NO}STATIC_MODE
8th June 2016 Gunter Folger (config-V10-02-03)
- delete G4STATIC_MODE and G4NOSTATIC_MODE options in sys/Darwin* and sys/linux*
This is not a complete removal of the option yet...
25th April 2016 Gabriele Cosmo (config-V10-02-02)
- Added Linux-clang.gmk script for use of clang compiler on Linux system.
14th April 2016 Gabriele Cosmo (config-V10-02-01)
- Added flags for partial use of USolids/VecGeom types.
5th February 2016 Gabriele Cosmo (config-V10-02-00)
- Added settings for 14 and 17 C++ standards in platform specific scripts.
24th November 2015 Gabriele Cosmo (config-V10-01-08)
- binmake.gmk: added "analysis/parameters/include" to INCFLAGS.
config/architecture.gmk
+9 -3
View File
@@ -1,4 +1,4 @@
# $Id: architecture.gmk 93150 2015-10-08 11:52:29Z gcosmo $
# $Id: architecture.gmk 96443 2016-04-14 14:19:28Z gcosmo $
# ------------------------------------------------------------------------
# GEANT 4 - Architecture configuration script for GNU Make
#
@@ -180,6 +180,12 @@ endif
# USolids path, etc.
#
ifdef G4GEOM_USE_USOLIDS
G4USOLIDS :=1
endif
ifdef G4GEOM_USE_PARTIAL_USOLIDS
G4USOLIDS :=1
endif
ifdef G4USOLIDS
G4LIB_USE_USOLIDS := 1
ifndef USOLIDS_BASE_DIR
$(error ERROR - Define path USOLIDS_BASE_DIR to USolids/VecGeom installation!)
@@ -275,10 +281,10 @@ endif
ifdef G4LIB_USE_USOLIDS
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
LDFLAGS += -link $(LIB_PATH)$(USOLIDS_LIB_DIR)
LOADLIBS += $(USOLIDS_LIB) # $(VECGEOM_LIB)
LOADLIBS += $(USOLIDS_LIB) $(VECGEOM_LIB)
else
LDFLAGS += -L$(USOLIDS_LIB_DIR)
LOADLIBS += -l$(USOLIDS_LIB) # -l$(VECGEOM_LIB)
LOADLIBS += -l$(USOLIDS_LIB) -l$(VECGEOM_LIB)
endif
endif
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
config/geomconf.gmk
+10 -1
View File
@@ -7,7 +7,12 @@
ifdef G4GEOM_USE_USOLIDS
CPPFLAGS += -DG4GEOM_USE_USOLIDS
CPPFLAGS += -DVECGEOM_SCALAR -DVECGEOM_REPLACE_USOLIDS -DVECGEOM_NO_SPECIALIZATION -DVECGEOM_USOLIDS
UEXTRAFLAGS := 1
endif
ifdef G4GEOM_USE_PARTIAL_USOLIDS
CPPFLAGS += -DG4GEOM_USE_PARTIAL_USOLIDS
UEXTRAFLAGS := 1
endif
ifdef G4GEOM_USE_UBOX
@@ -55,3 +60,7 @@ endif
ifdef G4GEOM_USE_UTUBS
CPPFLAGS += -DG4GEOM_USE_UTUBS
endif
ifdef UEXTRAFLAGS
CPPFLAGS += -DVECGEOM_SCALAR -DVECGEOM_REPLACE_USOLIDS -DVECGEOM_NO_SPECIALIZATION -DVECGEOM_USOLIDS
endif
config/sys/Darwin-clang.gmk
+10
View File
@@ -12,6 +12,16 @@ ifeq ($(G4SYSTEM),Darwin-clang)
ifdef G4USE_STD11
CXXFLAGS += -std=c++11
endif
ifdef G4USE_STD14
G4USE_STD11 := 1
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
endif
ifdef G4USE_STD17
G4USE_STD11 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
endif
config/sys/Darwin-g++.gmk
+10
View File
@@ -16,6 +16,16 @@ ifeq ($(G4SYSTEM),Darwin-g++)
ifdef G4USE_STD11
CXXFLAGS += -std=c++11
endif
ifdef G4USE_STD14
G4USE_STD11 := 1
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
endif
ifdef G4USE_STD17
G4USE_STD11 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
endif
# CXXFLAGS += -stdlib=libstdc++
ifdef G4OPTIMISE
CXXFLAGS += -O2
config/sys/Linux-clang.gmk
+156
View File
@@ -0,0 +1,156 @@
#
# ------ GNU/LINUX ------ clang 3.6 and higher
#
# Original author: Gabriele Cosmo - CERN
#
ifeq ($(G4SYSTEM),Linux-clang)
CXX := clang++
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
ifdef G4USE_STD11
CXXFLAGS += -std=c++11
CPPFLAGS += -std=c++11
endif
ifdef G4USE_STD14
G4USE_STD11 := 1
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
endif
ifdef G4USE_STD17
G4USE_STD11 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
endif
ifdef G4OPTIMISE
CXXFLAGS += -O2
FCFLAGS := -O2
CCFLAGS := -O2
else
ifdef G4DEBUG
CXXFLAGS += -g
FCFLAGS := -g
CCFLAGS := -g
endif
endif
ifdef G4PROFILE
CXXFLAGS += -pg
FCFLAGS += -pg
CCFLAGS += -pg
endif
ifdef G4OPTDEBUG
CXXFLAGS += -O2 -g
FCFLAGS += -O2 -g
CCFLAGS += -O2 -g
endif
ifdef G4LIB_BUILD_SHARED
CXXFLAGS += -fPIC
FCFLAGS += -fPIC
CCFLAGS += -fPIC
endif
G4RUNPATHOPTION := -Wl,-rpath
G4STATIC_MODE += -Wl,--whole-archive
G4NOSTATIC_MODE += -Wl,--no-whole-archive
CC := clang
FC := gfortran
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
FCLIBS := -lg2c -lnsl
ECHO := /bin/echo -e
SHEXT := so
ARCH := $(shell uname -m | cut -s -d "_" -f 2)
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
ifndef X11LIBS
X11LIBS := -L/usr/X11R6/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
endif
ifndef XMFLAGS
XMFLAGS := -I/usr/X11R6/include
endif
ifndef XMLIBS
XMLIBS := -lXm -lXpm
endif
ifndef XAWFLAGS
XAWFLAGS := -I/usr/X11R6/include
endif
ifndef XAWLIBS
XAWLIBS := -lXaw
endif
DLDLIBS := -ldl
ifndef OGLFLAGS
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
endif
# ---- QT Setup block -------------------------------------------------------
ifndef QTHOME
QTHOME := /usr
endif
ifndef QTMOC
QTMOC := $(QTHOME)/bin/moc
endif
QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
ifeq ($(QT_VERSION),5)
ifndef QTFLAGS # Qt5
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
QTFLAGS += -I $(QTHOME)/include/QtCore
QTFLAGS += -I $(QTHOME)/include/QtGui
QTFLAGS += -I $(QTHOME)/include/QtWidgets
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
endif
else # Qt4
ifndef QTFLAGS
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
QTFLAGS += -I$(QTHOME)/include/QtCore
QTFLAGS += -I$(QTHOME)/include/QtGui
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
endif
endif
ifndef QTLIBPATH
QTLIBPATH := $(QTHOME)/lib
QT_SEARCH_LIB := $(shell ls $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
ifneq ($(QT_SEARCH_LIB),0)
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
endif
endif
ifeq ($(QT_VERSION),5)
ifndef QTLIBS # Qt5
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtPrintSupport
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtOpenGL -lQtPrintSupport
endif
else # Qt4
ifndef QTLIBS
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
endif
endif
#----------------------------------------------------------------------------
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
cd $(G4TMPDIR); \
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
endef
define build-global-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
cd $(G4TMP)/$(G4SYSTEM); \
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
endef
endif
config/sys/Linux-g++.gmk
+10
View File
@@ -10,6 +10,16 @@ ifeq ($(G4SYSTEM),Linux-g++)
CPPFLAGS += -std=c++11
CXXFLAGS += -std=c++11
endif
ifdef G4USE_STD14
G4USE_STD11 := 1
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
endif
ifdef G4USE_STD17
G4USE_STD11 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
endif
#
# Uncomment the following options to activate Pentium4 chip specific
# floating-point operations on the SSE unit. It will allow for more stable
config/sys/Linux-icc.gmk
+10
View File
@@ -8,6 +8,16 @@ ifeq ($(G4SYSTEM),Linux-icc)
CPPFLAGS += -std=c++11
CXXFLAGS += -std=c++11
endif
ifdef G4USE_STD14
G4USE_STD11 := 1
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
endif
ifdef G4USE_STD17
G4USE_STD11 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
endif
config/sys/WIN32-g++.gmk
+10
View File
@@ -13,6 +13,16 @@ ifeq ($(G4SYSTEM),WIN32-g++)
CPPFLAGS += -std=c++11
CXXFLAGS += -std=c++11
endif
ifdef G4USE_STD14
G4USE_STD11 := 1
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
endif
ifdef G4USE_STD17
G4USE_STD11 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
endif
ifdef G4OPTIMISE
CXXFLAGS += -O
FCFLAGS := -O
examples/.doxygen/.svn/entries
+70 -70
View File
@@ -1,8 +1,8 @@
10
dir
94738
svn+ssh://svn.cern.ch/reps/geant4/branches/geant4/_symbols/geant4-10-02_branch/examples/.doxygen
97991
svn+ssh://svn.cern.ch/reps/geant4/branches/geant4/_symbols/geant4-10-03-beta-01_branch/examples/.doxygen
svn+ssh://svn.cern.ch/reps/geant4
@@ -845,40 +845,6 @@ gcosmo
1543
Doxymodules_field.h
file
2015-11-30T08:17:04.980202Z
dc42e815f6f769481b02b2af13d79c59
2013-11-11T10:35:14.738616Z
76473
gcosmo
has-props
4021
Doxymodules_analysis.h
file
@@ -913,6 +879,40 @@ has-props
1332
Doxymodules_field.h
file
2015-11-30T08:17:04.980202Z
dc42e815f6f769481b02b2af13d79c59
2013-11-11T10:35:14.738616Z
76473
gcosmo
has-props
4021
.README.HowToNavigate.txt
file
@@ -947,40 +947,6 @@ gcosmo
2215
Doxymodules_eventgenerator.h
file
2015-11-30T08:17:04.992202Z
0c63d1b29908c72f0c612d55bc41ecff
2015-11-24T09:17:12.168368Z
94561
gcosmo
has-props
3604
Doxymodules_common.h
file
@@ -1015,6 +981,40 @@ has-props
731
Doxymodules_eventgenerator.h
file
2015-11-30T08:17:04.992202Z
0c63d1b29908c72f0c612d55bc41ecff
2015-11-24T09:17:12.168368Z
94561
gcosmo
has-props
3604
Doxymodules_new.h
file
examples/.doxygen/images/.svn/entries
+2 -2
View File
@@ -1,8 +1,8 @@
10
dir
94738
svn+ssh://svn.cern.ch/reps/geant4/branches/geant4/_symbols/geant4-10-02_branch/examples/.doxygen/images
97991
svn+ssh://svn.cern.ch/reps/geant4/branches/geant4/_symbols/geant4-10-03-beta-01_branch/examples/.doxygen/images
svn+ssh://svn.cern.ch/reps/geant4
examples/History
+47
View File
@@ -17,6 +17,53 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
30th June 2016 Gabriele Cosmo (examples-V10-02-06)
- Updated reference outputs according to reference tag geant4-10-02-ref-06.
- Includes tags: microelectronics-V10-02-01, DMX-V10-02-00, testem7-V10-02-02,
dnaphysics-V10-02-02, microdosimetry-V10-02-01,
testem1-V10-02-04, exRunAndEvent-V10-02-00,
exampleRE01-V10-02-01, clustering-V10-02-00,
ThreadsafeScorers-V10-02-02, rdecay01-V10-02-07.
27th May 2016 Gabriele Cosmo (examples-V10-02-05)
- Updated reference outputs according to reference tag geant4-10-02-ref-05.
- Includes tags: hadrontherapy-V10-02-00, human_phantom-V10-02-01,
exampleB3-V10-02-01, testem7-V10-02-01, fieldex03-V10-02-00,
channelingExample-V10-02-00, fieldex04-V10-02-00,
rdecay01-V10-02-04.
29th April 2016 Gabriele Cosmo (examples-V10-02-04)
- Updated reference outputs according to reference tag geant4-10-02-ref-04.
- Includes tags: amsEcal-V10-02-00, testem0-V10-02-02, testem1-V10-02-03,
testem2-V10-02-01, testem5-V10-02-03, testem11-V10-02-05,
testem12-V10-02-02, testem13-V10-02-01, testem14-V10-02-01,
testem15-V10-02-00, testem18-V10-02-01, exhadr06-V10-02-01,
exHadronic-V10-02-00, exhadr07-V10-02-01, G01-V10-02-01,
electronScattering-V10-02-01.
31st March 2016 Gabriele Cosmo (examples-V10-02-03)
- Updated reference outputs according to reference tag geant4-10-02-ref-03.
- Includes tags: air_shower-V10-02-00, ccal-V10-02-00, microbeam-V10-02-00,
nanobeam-V10-02-00, exampleB5-V10-02-00, testem11-V10-02-02,
range-V10-02-00, wvalue-V10-02-00, expar02-V10-02-00,
G01-V10-02-00, expol01-V10-02-00, exampleRE04-V10-02-00.
29th February 2016 Gabriele Cosmo (examples-V10-02-02)
- Updated reference outputs according to reference tag geant4-10-02-ref-02.
- Includes tags: B03-V10-02-00, testem1-V10-02-02, testem3-V10-02-03,
testem5-V10-02-02, testem8-V10-02-00, testem11-V10-02-01,
exhadr06-V10-02-00, tbbex-V10-02-01, rdecay01-V10-02-02,
rdecay02-V10-02-00.
29th January 2016 Gabriele Cosmo (examples-V10-02-01)
- Updated reference outputs according to reference tag geant4-10-02-ref-01.
- Includes tags: exbasic-V10-02-00, testem1-V10-02-00, testem2-V10-02-00,
testem3-V10-02-00, testem4-V10-02-00, testem5-V10-02-01,
testem6-V10-02-00, testem7-V10-02-00, testem10-V10-02-00,
testem11-V10-02-00, testem12-V10-02-01, testem14-V10-02-00,
testem16-V10-02-00, testem17-V10-02-00, testem18-V10-02-00,
rdecay01-V10-02-01.
4th December 2015 Gabriele Cosmo (examples-V10-02-00)
- Updated reference outputs according to reference tag geant4-10-02-ref-00.
- Includes tags: doxygen-V10-01-03, ccal-V10-01-00, hadrontherapy-V10-01-03,
examples/advanced/air_shower/History
+3
View File
@@ -7,6 +7,9 @@
History file
------------
03.03.2016 - L. Pandola (air_shower-V10-02-00)
Replace std::log with G4Log
14.04.2015 - G. Cosmo (air_shower-V10-01-02)
Replaced call to obsolete GetDz() for G4Tubs to GetZHalfLength()
in UltraDetectorConstruction.
examples/advanced/air_shower/air_shower.out
+18 -16
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -37,16 +37,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -267,7 +269,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -294,7 +296,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -405,8 +407,8 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
ooo Run 0 starts (global).
--------- Ranlux engine status ---------
Initial seed = 1449083840
float_seed_table[] = 0.447896 0.279358 0.309507 0.697966 0.519508 0.704111 0.316034 0.920339 0.529677 0.502421 0.00944424 0.93338 0.288877 0.153657 0.468558 0.963484 0.963159 0.877593 0.151048 0.201412 0.391303 0.658429 0.536909 0.908619
Initial seed = 1467116815
float_seed_table[] = 0.46025 0.614568 0.472781 0.0483307 0.905676 0.729853 0.365072 0.0451633 0.362083 0.523468 0.110341 0.283642 0.72332 0.140984 0.441664 0.88339 0.985072 0.727101 0.377638 0.98976 0.381081 0.685145 0.559393 0.655737
i_lag = 23, j_lag = 9
carry = 0, count24 = 0
luxury = 3 nskip = 199
@@ -417,7 +419,7 @@ mu- Mono Plane
Run terminated.
Run Summary
Number of events processed : 100
User=5.07s Real=5.08s Sys=0s
User=2.86s Real=2.89s Sys=0s
### Run 0 (global) ended.
Graphics systems deleted.
Visualization Manager deleting...
@@ -440,13 +442,13 @@ Pool ID '15G4PrimaryVertex', size : 0.000961 MB
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
Pool ID '16G4HitsCollection', size : 0.000961 MB
Pool ID '17G4DynamicParticle', size : 0.213 MB
Pool ID '7G4Track', size : 0.426 MB
Pool ID '17G4DynamicParticle', size : 0.246 MB
Pool ID '7G4Track', size : 0.491 MB
Pool ID '18G4TouchableHistory', size : 0.000961 MB
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
Pool ID '15UltraOpticalHit', size : 0.00385 MB
Pool ID '15UltraOpticalHit', size : 0.000961 MB
Number of memory pools allocated: 12 of which, static: 0
Dynamic pools deleted: 12 / Total memory freed: 0.66 MB
Dynamic pools deleted: 12 / Total memory freed: 0.76 MB
============================================================
G4Allocator objects are deleted.
UImanager deleted.
examples/advanced/air_shower/src/UltraDetectorConstruction.cc
+2 -1
View File
@@ -67,6 +67,7 @@
#include "G4OpBoundaryProcess.hh"
#include "G4VisAttributes.hh"
#include "G4Colour.hh"
#include "G4Log.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -337,7 +338,7 @@ void UltraDetectorConstruction::ConstructTableMaterials()
abslength = 1.0/kInfinity ;
}
else {
abslength = -3.0*mm/(std::log(ABS[i]/100.0)) ;
abslength = -3.0*mm/(G4Log(ABS[i]/100.0)) ;
}
MPT_Acrylic->AddEntry("ABSLENGTH", energy, abslength);
examples/advanced/amsEcal/History
+4 -1
View File
@@ -1,4 +1,4 @@
$Id: History 84372 2014-10-14 12:52:34Z gcosmo $
$Id: History 96602 2016-04-25 13:28:48Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -15,6 +15,9 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
24-04-16 mma (amsEcal-V10-02-00)
- PhysListEmStandard: use G4EmParameters
13-10-14 mma (amsEcal-V10-00-07)
- CmakeLists.txt : remove AIDA references
examples/advanced/amsEcal/run1.out
+96 -96
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -177,7 +177,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
Run terminated.
Run Summary
Number of events processed : 10000
User=17.86s Real=17.93s Sys=0s
User=11.92s Real=11.99s Sys=0s
-------------------------------------------------------------
---> The calorimeter is 9 Modules
@@ -200,106 +200,106 @@ Run Summary
total Energy (rms/mean) visible Energy (rms/mean)
layer 1: 1.5723 MeV +- 2.622 MeV (1.7e+02 %) 158.56 keV +- 721.7 keV (4.6e+02 %)
layer 2: 1.5303 MeV +- 2.254 MeV (1.5e+02 %) 169.7 keV +- 851.7 keV (5e+02 %)
layer 3: 1.5215 MeV +- 2.277 MeV (1.5e+02 %) 160.42 keV +- 748.4 keV (4.7e+02 %)
layer 4: 1.5066 MeV +- 2.172 MeV (1.4e+02 %) 151.77 keV +- 388 keV (2.6e+02 %)
layer 5: 1.5567 MeV +- 2.378 MeV (1.5e+02 %) 161.43 keV +- 562.1 keV (3.5e+02 %)
layer 6: 1.5417 MeV +- 2.629 MeV (1.7e+02 %) 163.09 keV +- 1.002 MeV (6.1e+02 %)
layer 7: 1.5134 MeV +- 2.049 MeV (1.4e+02 %) 160.37 keV +- 709.5 keV (4.4e+02 %)
layer 8: 1.5753 MeV +- 2.909 MeV (1.8e+02 %) 177.93 keV +- 1.325 MeV (7.4e+02 %)
layer 9: 1.5339 MeV +- 2.414 MeV (1.6e+02 %) 158.89 keV +- 772.9 keV (4.9e+02 %)
layer 10: 1.5353 MeV +- 2.352 MeV (1.5e+02 %) 150.94 keV +- 424.3 keV (2.8e+02 %)
layer 11: 1.5743 MeV +- 2.706 MeV (1.7e+02 %) 174.43 keV +- 1.04 MeV (6e+02 %)
layer 12: 1.5051 MeV +- 2.073 MeV (1.4e+02 %) 165.28 keV +- 826.4 keV (5e+02 %)
layer 13: 1.5298 MeV +- 2.401 MeV (1.6e+02 %) 160.73 keV +- 567.9 keV (3.5e+02 %)
layer 14: 1.5756 MeV +- 2.652 MeV (1.7e+02 %) 152.56 keV +- 360.6 keV (2.4e+02 %)
layer 15: 1.5461 MeV +- 2.443 MeV (1.6e+02 %) 153.63 keV +- 511.7 keV (3.3e+02 %)
layer 16: 1.5404 MeV +- 2.369 MeV (1.5e+02 %) 155.21 keV +- 598.6 keV (3.9e+02 %)
layer 17: 1.5476 MeV +- 2.513 MeV (1.6e+02 %) 153.52 keV +- 347.6 keV (2.3e+02 %)
layer 18: 1.5339 MeV +- 2.181 MeV (1.4e+02 %) 149.38 keV +- 466.3 keV (3.1e+02 %)
layer 19: 1.474 MeV +- 2.046 MeV (1.4e+02 %) 155.16 keV +- 476.2 keV (3.1e+02 %)
layer 20: 1.5266 MeV +- 2.146 MeV (1.4e+02 %) 159.09 keV +- 630.3 keV (4e+02 %)
layer 21: 1.4859 MeV +- 1.931 MeV (1.3e+02 %) 147.48 keV +- 237.3 keV (1.6e+02 %)
layer 22: 1.5137 MeV +- 1.982 MeV (1.3e+02 %) 149.95 keV +- 524.7 keV (3.5e+02 %)
layer 23: 1.5349 MeV +- 2.234 MeV (1.5e+02 %) 157.62 keV +- 468 keV (3e+02 %)
layer 24: 1.5217 MeV +- 2.392 MeV (1.6e+02 %) 155.98 keV +- 763.8 keV (4.9e+02 %)
layer 25: 1.5416 MeV +- 2.517 MeV (1.6e+02 %) 166.86 keV +- 978.6 keV (5.9e+02 %)
layer 26: 1.5128 MeV +- 2.235 MeV (1.5e+02 %) 149.89 keV +- 566.2 keV (3.8e+02 %)
layer 27: 1.5389 MeV +- 2.16 MeV (1.4e+02 %) 163.31 keV +- 759 keV (4.6e+02 %)
layer 28: 1.4918 MeV +- 2.074 MeV (1.4e+02 %) 164.29 keV +- 1.01 MeV (6.1e+02 %)
layer 29: 1.5157 MeV +- 2.286 MeV (1.5e+02 %) 164.95 keV +- 746.6 keV (4.5e+02 %)
layer 30: 1.5187 MeV +- 2.007 MeV (1.3e+02 %) 166.29 keV +- 912.6 keV (5.5e+02 %)
layer 31: 1.596 MeV +- 3.006 MeV (1.9e+02 %) 152.81 keV +- 485.3 keV (3.2e+02 %)
layer 32: 1.5231 MeV +- 2.154 MeV (1.4e+02 %) 160.45 keV +- 905.1 keV (5.6e+02 %)
layer 33: 1.4883 MeV +- 1.916 MeV (1.3e+02 %) 149.91 keV +- 413.6 keV (2.8e+02 %)
layer 34: 1.5046 MeV +- 2.345 MeV (1.6e+02 %) 155.84 keV +- 808.8 keV (5.2e+02 %)
layer 35: 1.5136 MeV +- 1.967 MeV (1.3e+02 %) 149.16 keV +- 335.6 keV (2.2e+02 %)
layer 36: 1.541 MeV +- 2.593 MeV (1.7e+02 %) 159.92 keV +- 934.1 keV (5.8e+02 %)
layer 37: 1.5107 MeV +- 1.957 MeV (1.3e+02 %) 156.52 keV +- 597.4 keV (3.8e+02 %)
layer 38: 1.5368 MeV +- 2.551 MeV (1.7e+02 %) 166.29 keV +- 930.9 keV (5.6e+02 %)
layer 39: 1.5455 MeV +- 2.469 MeV (1.6e+02 %) 167.36 keV +- 882.3 keV (5.3e+02 %)
layer 40: 1.5427 MeV +- 2.573 MeV (1.7e+02 %) 157.33 keV +- 555.9 keV (3.5e+02 %)
layer 41: 1.5195 MeV +- 2.23 MeV (1.5e+02 %) 153.93 keV +- 540.8 keV (3.5e+02 %)
layer 42: 1.5494 MeV +- 2.5 MeV (1.6e+02 %) 168.09 keV +- 1.016 MeV (6e+02 %)
layer 43: 1.528 MeV +- 2.287 MeV (1.5e+02 %) 166.99 keV +- 1.089 MeV (6.5e+02 %)
layer 44: 1.5412 MeV +- 2.383 MeV (1.5e+02 %) 154.33 keV +- 517.6 keV (3.4e+02 %)
layer 45: 1.5372 MeV +- 2.287 MeV (1.5e+02 %) 158.65 keV +- 741.9 keV (4.7e+02 %)
layer 46: 1.5365 MeV +- 2.152 MeV (1.4e+02 %) 161.44 keV +- 572.8 keV (3.5e+02 %)
layer 47: 1.5256 MeV +- 2.248 MeV (1.5e+02 %) 167.58 keV +- 1.064 MeV (6.4e+02 %)
layer 48: 1.5058 MeV +- 1.934 MeV (1.3e+02 %) 157.98 keV +- 579 keV (3.7e+02 %)
layer 49: 1.521 MeV +- 2.054 MeV (1.4e+02 %) 165.27 keV +- 754.3 keV (4.6e+02 %)
layer 50: 1.485 MeV +- 1.794 MeV (1.2e+02 %) 148.09 keV +- 304.3 keV (2.1e+02 %)
layer 51: 1.4963 MeV +- 1.893 MeV (1.3e+02 %) 168.08 keV +- 969.3 keV (5.8e+02 %)
layer 52: 1.521 MeV +- 2.19 MeV (1.4e+02 %) 164.35 keV +- 919.2 keV (5.6e+02 %)
layer 53: 1.5101 MeV +- 1.939 MeV (1.3e+02 %) 155.26 keV +- 486.9 keV (3.1e+02 %)
layer 54: 1.5295 MeV +- 2.305 MeV (1.5e+02 %) 170.88 keV +- 1.119 MeV (6.5e+02 %)
layer 55: 1.5176 MeV +- 2.149 MeV (1.4e+02 %) 160.22 keV +- 680.3 keV (4.2e+02 %)
layer 56: 1.5178 MeV +- 2.02 MeV (1.3e+02 %) 166.13 keV +- 767.3 keV (4.6e+02 %)
layer 57: 1.5148 MeV +- 1.987 MeV (1.3e+02 %) 149.03 keV +- 303.5 keV (2e+02 %)
layer 58: 1.5038 MeV +- 1.97 MeV (1.3e+02 %) 158.68 keV +- 684.2 keV (4.3e+02 %)
layer 59: 1.4977 MeV +- 2.215 MeV (1.5e+02 %) 160.91 keV +- 728.2 keV (4.5e+02 %)
layer 60: 1.5258 MeV +- 2.192 MeV (1.4e+02 %) 164.3 keV +- 692.9 keV (4.2e+02 %)
layer 61: 1.5144 MeV +- 2.2 MeV (1.5e+02 %) 165.89 keV +- 950.7 keV (5.7e+02 %)
layer 62: 1.5303 MeV +- 2.202 MeV (1.4e+02 %) 174.45 keV +- 1.09 MeV (6.3e+02 %)
layer 63: 1.5226 MeV +- 2.266 MeV (1.5e+02 %) 159.78 keV +- 761.8 keV (4.8e+02 %)
layer 64: 1.5486 MeV +- 2.503 MeV (1.6e+02 %) 145.84 keV +- 269.2 keV (1.8e+02 %)
layer 65: 1.5112 MeV +- 2.054 MeV (1.4e+02 %) 158.83 keV +- 735 keV (4.6e+02 %)
layer 66: 1.473 MeV +- 1.533 MeV (1e+02 %) 149.27 keV +- 274.2 keV (1.8e+02 %)
layer 67: 1.53 MeV +- 2.506 MeV (1.6e+02 %) 160.64 keV +- 835 keV (5.2e+02 %)
layer 68: 1.5286 MeV +- 2.153 MeV (1.4e+02 %) 167.01 keV +- 818.3 keV (4.9e+02 %)
layer 69: 1.5307 MeV +- 2.244 MeV (1.5e+02 %) 161.91 keV +- 735.6 keV (4.5e+02 %)
layer 70: 1.4968 MeV +- 1.907 MeV (1.3e+02 %) 166.54 keV +- 1.045 MeV (6.3e+02 %)
layer 71: 1.5304 MeV +- 2.073 MeV (1.4e+02 %) 158.91 keV +- 870.3 keV (5.5e+02 %)
layer 72: 1.5419 MeV +- 2.324 MeV (1.5e+02 %) 157.25 keV +- 547.8 keV (3.5e+02 %)
layer 73: 1.5111 MeV +- 2.266 MeV (1.5e+02 %) 154.52 keV +- 587.9 keV (3.8e+02 %)
layer 74: 1.4708 MeV +- 1.95 MeV (1.3e+02 %) 171.45 keV +- 944.8 keV (5.5e+02 %)
layer 75: 1.5288 MeV +- 2.008 MeV (1.3e+02 %) 149.71 keV +- 333.6 keV (2.2e+02 %)
layer 76: 1.5082 MeV +- 2.002 MeV (1.3e+02 %) 157.52 keV +- 729.5 keV (4.6e+02 %)
layer 77: 1.5197 MeV +- 2.197 MeV (1.4e+02 %) 159.5 keV +- 565.9 keV (3.5e+02 %)
layer 78: 1.5055 MeV +- 2.259 MeV (1.5e+02 %) 161.3 keV +- 745.2 keV (4.6e+02 %)
layer 79: 1.5424 MeV +- 2.361 MeV (1.5e+02 %) 163.04 keV +- 630 keV (3.9e+02 %)
layer 80: 1.5564 MeV +- 2.561 MeV (1.6e+02 %) 171.73 keV +- 892.7 keV (5.2e+02 %)
layer 81: 1.5197 MeV +- 2.168 MeV (1.4e+02 %) 162.57 keV +- 757.7 keV (4.7e+02 %)
layer 82: 1.5242 MeV +- 2.168 MeV (1.4e+02 %) 159.44 keV +- 528.3 keV (3.3e+02 %)
layer 83: 1.4739 MeV +- 1.769 MeV (1.2e+02 %) 150.5 keV +- 442.2 keV (2.9e+02 %)
layer 84: 1.491 MeV +- 2.02 MeV (1.4e+02 %) 153.35 keV +- 505.4 keV (3.3e+02 %)
layer 85: 1.5332 MeV +- 2.2 MeV (1.4e+02 %) 174.37 keV +- 1.117 MeV (6.4e+02 %)
layer 86: 1.4977 MeV +- 1.906 MeV (1.3e+02 %) 152.45 keV +- 359.2 keV (2.4e+02 %)
layer 87: 1.4861 MeV +- 1.89 MeV (1.3e+02 %) 152.53 keV +- 395.9 keV (2.6e+02 %)
layer 88: 1.4965 MeV +- 1.647 MeV (1.1e+02 %) 155.23 keV +- 472.3 keV (3e+02 %)
layer 89: 1.4803 MeV +- 1.98 MeV (1.3e+02 %) 157.82 keV +- 694.9 keV (4.4e+02 %)
layer 90: 1.4917 MeV +- 1.977 MeV (1.3e+02 %) 148.92 keV +- 388.9 keV (2.6e+02 %)
layer 1: 1.5171 MeV +- 2.327 MeV (1.5e+02 %) 165.31 keV +- 947.4 keV (5.7e+02 %)
layer 2: 1.4868 MeV +- 2.077 MeV (1.4e+02 %) 149.48 keV +- 385.1 keV (2.6e+02 %)
layer 3: 1.5516 MeV +- 2.522 MeV (1.6e+02 %) 160.55 keV +- 802.4 keV (5e+02 %)
layer 4: 1.5781 MeV +- 2.886 MeV (1.8e+02 %) 175.66 keV +- 1.155 MeV (6.6e+02 %)
layer 5: 1.5366 MeV +- 2.442 MeV (1.6e+02 %) 175.72 keV +- 1.091 MeV (6.2e+02 %)
layer 6: 1.5547 MeV +- 2.855 MeV (1.8e+02 %) 151.27 keV +- 581.7 keV (3.8e+02 %)
layer 7: 1.4998 MeV +- 1.975 MeV (1.3e+02 %) 155.26 keV +- 625.8 keV (4e+02 %)
layer 8: 1.5323 MeV +- 2.391 MeV (1.6e+02 %) 163.72 keV +- 887.5 keV (5.4e+02 %)
layer 9: 1.5192 MeV +- 2.398 MeV (1.6e+02 %) 165.08 keV +- 733 keV (4.4e+02 %)
layer 10: 1.5243 MeV +- 2.443 MeV (1.6e+02 %) 155.45 keV +- 619.2 keV (4e+02 %)
layer 11: 1.5434 MeV +- 2.568 MeV (1.7e+02 %) 151.4 keV +- 631.1 keV (4.2e+02 %)
layer 12: 1.5189 MeV +- 2.187 MeV (1.4e+02 %) 157.75 keV +- 470.1 keV (3e+02 %)
layer 13: 1.4758 MeV +- 1.736 MeV (1.2e+02 %) 158.7 keV +- 532 keV (3.4e+02 %)
layer 14: 1.519 MeV +- 2.239 MeV (1.5e+02 %) 149.18 keV +- 499.8 keV (3.4e+02 %)
layer 15: 1.5243 MeV +- 2.214 MeV (1.5e+02 %) 182.29 keV +- 1.436 MeV (7.9e+02 %)
layer 16: 1.5409 MeV +- 2.255 MeV (1.5e+02 %) 160.52 keV +- 679.1 keV (4.2e+02 %)
layer 17: 1.5264 MeV +- 2.431 MeV (1.6e+02 %) 147.9 keV +- 329.5 keV (2.2e+02 %)
layer 18: 1.5319 MeV +- 2.229 MeV (1.5e+02 %) 155.91 keV +- 576.2 keV (3.7e+02 %)
layer 19: 1.5339 MeV +- 2.441 MeV (1.6e+02 %) 148.99 keV +- 276 keV (1.9e+02 %)
layer 20: 1.5416 MeV +- 2.382 MeV (1.5e+02 %) 158.29 keV +- 555.8 keV (3.5e+02 %)
layer 21: 1.51 MeV +- 2.128 MeV (1.4e+02 %) 154.82 keV +- 704.1 keV (4.5e+02 %)
layer 22: 1.5438 MeV +- 2.456 MeV (1.6e+02 %) 148.94 keV +- 295.2 keV (2e+02 %)
layer 23: 1.5408 MeV +- 2.47 MeV (1.6e+02 %) 155.37 keV +- 610.2 keV (3.9e+02 %)
layer 24: 1.5222 MeV +- 2.238 MeV (1.5e+02 %) 163.18 keV +- 746.1 keV (4.6e+02 %)
layer 25: 1.5003 MeV +- 1.97 MeV (1.3e+02 %) 154.74 keV +- 508.9 keV (3.3e+02 %)
layer 26: 1.5306 MeV +- 2.304 MeV (1.5e+02 %) 166.47 keV +- 1.074 MeV (6.4e+02 %)
layer 27: 1.5143 MeV +- 2.254 MeV (1.5e+02 %) 156.56 keV +- 760.8 keV (4.9e+02 %)
layer 28: 1.5375 MeV +- 2.492 MeV (1.6e+02 %) 164.29 keV +- 661.4 keV (4e+02 %)
layer 29: 1.56 MeV +- 2.681 MeV (1.7e+02 %) 154.39 keV +- 525.2 keV (3.4e+02 %)
layer 30: 1.5786 MeV +- 2.827 MeV (1.8e+02 %) 163.52 keV +- 935.2 keV (5.7e+02 %)
layer 31: 1.5793 MeV +- 2.66 MeV (1.7e+02 %) 170.64 keV +- 1.058 MeV (6.2e+02 %)
layer 32: 1.5505 MeV +- 2.402 MeV (1.5e+02 %) 155.07 keV +- 699.1 keV (4.5e+02 %)
layer 33: 1.5175 MeV +- 2.442 MeV (1.6e+02 %) 157.7 keV +- 618.1 keV (3.9e+02 %)
layer 34: 1.5295 MeV +- 2.212 MeV (1.4e+02 %) 166.71 keV +- 901.9 keV (5.4e+02 %)
layer 35: 1.5013 MeV +- 2.38 MeV (1.6e+02 %) 150.24 keV +- 311.8 keV (2.1e+02 %)
layer 36: 1.5041 MeV +- 1.877 MeV (1.2e+02 %) 153.03 keV +- 399.4 keV (2.6e+02 %)
layer 37: 1.5035 MeV +- 2.116 MeV (1.4e+02 %) 152.36 keV +- 565.1 keV (3.7e+02 %)
layer 38: 1.4936 MeV +- 1.598 MeV (1.1e+02 %) 147.75 keV +- 271.7 keV (1.8e+02 %)
layer 39: 1.5086 MeV +- 1.926 MeV (1.3e+02 %) 159.3 keV +- 611.6 keV (3.8e+02 %)
layer 40: 1.5304 MeV +- 2.105 MeV (1.4e+02 %) 162.67 keV +- 920.2 keV (5.7e+02 %)
layer 41: 1.5459 MeV +- 2.227 MeV (1.4e+02 %) 157.08 keV +- 521.5 keV (3.3e+02 %)
layer 42: 1.5532 MeV +- 2.435 MeV (1.6e+02 %) 155.04 keV +- 439.6 keV (2.8e+02 %)
layer 43: 1.5301 MeV +- 2.078 MeV (1.4e+02 %) 151.76 keV +- 353.1 keV (2.3e+02 %)
layer 44: 1.5167 MeV +- 2.32 MeV (1.5e+02 %) 150.48 keV +- 650.7 keV (4.3e+02 %)
layer 45: 1.5116 MeV +- 2.114 MeV (1.4e+02 %) 156.81 keV +- 559.2 keV (3.6e+02 %)
layer 46: 1.5 MeV +- 2.093 MeV (1.4e+02 %) 166.1 keV +- 985.4 keV (5.9e+02 %)
layer 47: 1.5614 MeV +- 2.482 MeV (1.6e+02 %) 164.56 keV +- 610.1 keV (3.7e+02 %)
layer 48: 1.528 MeV +- 2.193 MeV (1.4e+02 %) 148.22 keV +- 306.6 keV (2.1e+02 %)
layer 49: 1.5405 MeV +- 2.353 MeV (1.5e+02 %) 163.86 keV +- 824.8 keV (5e+02 %)
layer 50: 1.4671 MeV +- 1.722 MeV (1.2e+02 %) 158.73 keV +- 653.4 keV (4.1e+02 %)
layer 51: 1.5432 MeV +- 2.405 MeV (1.6e+02 %) 161.28 keV +- 670 keV (4.2e+02 %)
layer 52: 1.4941 MeV +- 1.919 MeV (1.3e+02 %) 153.11 keV +- 463.4 keV (3e+02 %)
layer 53: 1.5111 MeV +- 2.142 MeV (1.4e+02 %) 162.61 keV +- 946.7 keV (5.8e+02 %)
layer 54: 1.5101 MeV +- 2.139 MeV (1.4e+02 %) 162.72 keV +- 919.2 keV (5.6e+02 %)
layer 55: 1.52 MeV +- 2.01 MeV (1.3e+02 %) 156.65 keV +- 735.8 keV (4.7e+02 %)
layer 56: 1.5261 MeV +- 2.415 MeV (1.6e+02 %) 157.67 keV +- 474.5 keV (3e+02 %)
layer 57: 1.4998 MeV +- 1.992 MeV (1.3e+02 %) 157.55 keV +- 584.2 keV (3.7e+02 %)
layer 58: 1.503 MeV +- 2.147 MeV (1.4e+02 %) 163.67 keV +- 841.2 keV (5.1e+02 %)
layer 59: 1.5088 MeV +- 1.988 MeV (1.3e+02 %) 151.02 keV +- 535.6 keV (3.5e+02 %)
layer 60: 1.4958 MeV +- 1.957 MeV (1.3e+02 %) 161.71 keV +- 586.6 keV (3.6e+02 %)
layer 61: 1.4438 MeV +- 1.412 MeV ( 98 %) 149.18 keV +- 372.1 keV (2.5e+02 %)
layer 62: 1.5556 MeV +- 2.11 MeV (1.4e+02 %) 163.3 keV +- 502.4 keV (3.1e+02 %)
layer 63: 1.5149 MeV +- 2.123 MeV (1.4e+02 %) 154.03 keV +- 412.9 keV (2.7e+02 %)
layer 64: 1.5054 MeV +- 1.719 MeV (1.1e+02 %) 146.66 keV +- 277.2 keV (1.9e+02 %)
layer 65: 1.5346 MeV +- 2.506 MeV (1.6e+02 %) 154.49 keV +- 463.2 keV (3e+02 %)
layer 66: 1.4956 MeV +- 2.04 MeV (1.4e+02 %) 148.03 keV +- 350.5 keV (2.4e+02 %)
layer 67: 1.5347 MeV +- 2.264 MeV (1.5e+02 %) 154.22 keV +- 396.3 keV (2.6e+02 %)
layer 68: 1.5283 MeV +- 2.178 MeV (1.4e+02 %) 156.1 keV +- 580 keV (3.7e+02 %)
layer 69: 1.5328 MeV +- 2.599 MeV (1.7e+02 %) 152.76 keV +- 414.9 keV (2.7e+02 %)
layer 70: 1.5227 MeV +- 2.261 MeV (1.5e+02 %) 163.96 keV +- 975.7 keV (6e+02 %)
layer 71: 1.541 MeV +- 2.685 MeV (1.7e+02 %) 150.97 keV +- 538.6 keV (3.6e+02 %)
layer 72: 1.5049 MeV +- 2.048 MeV (1.4e+02 %) 147.87 keV +- 493.8 keV (3.3e+02 %)
layer 73: 1.5338 MeV +- 2.201 MeV (1.4e+02 %) 154.07 keV +- 376.9 keV (2.4e+02 %)
layer 74: 1.4931 MeV +- 1.994 MeV (1.3e+02 %) 160.84 keV +- 931.1 keV (5.8e+02 %)
layer 75: 1.4741 MeV +- 1.634 MeV (1.1e+02 %) 160.51 keV +- 676.1 keV (4.2e+02 %)
layer 76: 1.4991 MeV +- 1.999 MeV (1.3e+02 %) 157.23 keV +- 585.3 keV (3.7e+02 %)
layer 77: 1.5129 MeV +- 2.162 MeV (1.4e+02 %) 173.24 keV +- 982 keV (5.7e+02 %)
layer 78: 1.5318 MeV +- 2.33 MeV (1.5e+02 %) 152.54 keV +- 465.9 keV (3.1e+02 %)
layer 79: 1.5208 MeV +- 1.972 MeV (1.3e+02 %) 163.43 keV +- 849.7 keV (5.2e+02 %)
layer 80: 1.5359 MeV +- 2.163 MeV (1.4e+02 %) 158.61 keV +- 681.7 keV (4.3e+02 %)
layer 81: 1.5132 MeV +- 2.036 MeV (1.3e+02 %) 152.67 keV +- 445.8 keV (2.9e+02 %)
layer 82: 1.5045 MeV +- 1.869 MeV (1.2e+02 %) 152.23 keV +- 424.8 keV (2.8e+02 %)
layer 83: 1.5082 MeV +- 2.012 MeV (1.3e+02 %) 175.19 keV +- 1.003 MeV (5.7e+02 %)
layer 84: 1.503 MeV +- 1.77 MeV (1.2e+02 %) 157.99 keV +- 709.1 keV (4.5e+02 %)
layer 85: 1.5369 MeV +- 2.394 MeV (1.6e+02 %) 170.28 keV +- 1.056 MeV (6.2e+02 %)
layer 86: 1.4961 MeV +- 1.855 MeV (1.2e+02 %) 155.32 keV +- 442.1 keV (2.8e+02 %)
layer 87: 1.5118 MeV +- 2.182 MeV (1.4e+02 %) 170.75 keV +- 1.093 MeV (6.4e+02 %)
layer 88: 1.5302 MeV +- 2.435 MeV (1.6e+02 %) 157.03 keV +- 523.8 keV (3.3e+02 %)
layer 89: 1.5116 MeV +- 2.151 MeV (1.4e+02 %) 151.95 keV +- 584 keV (3.8e+02 %)
layer 90: 1.5024 MeV +- 1.879 MeV (1.3e+02 %) 154.38 keV +- 582.4 keV (3.8e+02 %)
total calor : 149.47 MeV +- 21.8 MeV ( 15 %) 14.357 MeV +- 6.923 MeV ( 48 %)
total calor : 149.32 MeV +- 21.82 MeV ( 15 %) 14.227 MeV +- 6.535 MeV ( 46 %)
------------------------------------------------------------
Leakage : 850.53 MeV +- 21.8 MeV
Eleak/Ebeam =85.1 % ( forward =85.1 % backward = 0 % lateral = 0 %)
Leakage : 850.68 MeV +- 21.82 MeV
Eleak/Ebeam =85.1 % ( forward =85.1 % backward = 0 % lateral =0.00512 %)
--------- Ranecu engine status ---------
Initial seed (index) = 0
Current couple of seeds = 1738437478, 1541930724
Current couple of seeds = 1418898368, 1305369185
----------------------------------------
G4 kernel has come to Quit state.
UserDetectorConstruction deleted.
examples/advanced/amsEcal/src/PhysListEmStandard.cc
+16 -30
View File
@@ -23,14 +23,15 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: PhysListEmStandard.cc 83010 2014-07-24 14:53:07Z gcosmo $
// $Id: PhysListEmStandard.cc 96602 2016-04-25 13:28:48Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "PhysListEmStandard.hh"
#include "G4BuilderType.hh"
#include "G4ParticleDefinition.hh"
///#include "G4ProcessManager.hh"
#include "G4PhysicsListHelper.hh"
#include "G4ComptonScattering.hh"
@@ -54,7 +55,6 @@
#include "G4ionIonisation.hh"
#include "G4EmProcessOptions.hh"
#include "G4MscStepLimitType.hh"
#include "G4SystemOfUnits.hh"
@@ -63,7 +63,19 @@
PhysListEmStandard::PhysListEmStandard(const G4String& name)
: G4VPhysicsConstructor(name)
{}
{
SetPhysicsType(bElectromagnetic);
G4EmParameters* param = G4EmParameters::Instance();
param->SetDefaults();
param->SetVerbose(0);
param->SetMinEnergy(100*eV);
param->SetMaxEnergy(100*TeV);
param->SetNumberOfBinsPerDecade(10);
param->SetMscStepLimitType(fUseSafety);
param->SetStepFunction(0.2, 100*um);
param->SetStepFunctionMuHad(0.2, 100*um);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -134,32 +146,6 @@ void PhysListEmStandard::ConstructProcess()
ph->RegisterProcess(new G4hIonisation, particle);
}
}
// Em options
//
// Main options and setting parameters are shown here.
// Several of them have default values.
//
G4EmProcessOptions emOptions;
//physics tables
//
emOptions.SetMinEnergy(100*eV); //default
emOptions.SetMaxEnergy(100*TeV); //default
emOptions.SetDEDXBinning(12*10); //default=12*7
emOptions.SetLambdaBinning(12*10); //default=12*7
//multiple coulomb scattering
//
emOptions.SetMscStepLimitation(fUseSafety); //default=fUseSafety
//energy loss
//
emOptions.SetStepFunction(0.2, 100*um); //default=(0.2, 1*mm)
//verbose
//
emOptions.SetVerbose(0);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/advanced/brachytherapy/brachytherapy.out
+26 -11
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -41,16 +41,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -91,7 +93,9 @@ G4ScoringBox : boxMesh_1 --- Shape: Box mesh
/run/geometryModified
### === Deexcitation model UAtomDeexcitation is activated for 1 region:
DefaultRegionForTheWorld
DefaultRegionForTheWorld 1 1 0
### === Auger cascade flag: 0
### === Ignore cuts flag: 0
phot: for gamma SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 10 TeV in 154 bins
@@ -139,6 +143,13 @@ eBrem: for e- SubType= 3
eBremSB : Emin= 0 eV Emax= 1 GeV AngularGen2BS
eBremLPM : Emin= 1 GeV Emax= 10 TeV AngularGen2BS
ePairProd: for e- SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 21x1001 from 0.1 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
muPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for e-, integral: 1 SubType= 1 BuildTable= 1
Lambda table from 100 MeV to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
@@ -167,6 +178,13 @@ eBrem: for e+ SubType= 3
eBremSB : Emin= 0 eV Emax= 1 GeV AngularGen2BS
eBremLPM : Emin= 1 GeV Emax= 10 TeV AngularGen2BS
ePairProd: for e+ SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 21x1001 from 0.1 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
muPairProd : Emin= 0 eV Emax= 10 TeV
annihil: for e+, integral: 1 SubType= 5 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
eplus2gg : Emin= 0 eV Emax= 10 TeV
@@ -230,9 +248,6 @@ nuclearStopping: for GenericIon SubType= 8 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU49NucStopping : Emin= 0 eV Emax= 1 MeV
### === Deexcitation model UAtomDeexcitation is activated for 1 region:
DefaultRegionForTheWorld
msc: for alpha SubType= 10
RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
examples/advanced/composite_calorimeter/History
+4 -1
View File
@@ -1,5 +1,5 @@
-------------------------------------------------------------------
$Id: History 93898 2015-11-03 08:39:38Z gcosmo $
$Id: History 95947 2016-03-03 10:39:24Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -9,6 +9,9 @@ $Id: History 93898 2015-11-03 08:39:38Z gcosmo $
Example History file
---------------------
03.03.2016 - L. Pandola (ccal-V10-02-00)
- Replace std::exp with G4Exp()
02.11.2015 - A. Ribon (ccal-V10-01-00)
- Migrated to ParticleHP.
examples/advanced/composite_calorimeter/src/CCalPrimaryGeneratorAction.cc
+3 -2
View File
@@ -34,6 +34,7 @@
#include "CCalPrimaryGeneratorMessenger.hh"
#include "G4HEPEvtInterface.hh"
#include "G4Exp.hh"
#include "G4PhysicalConstants.hh"
#include "G4SystemOfUnits.hh"
#include "G4Event.hh"
@@ -95,7 +96,7 @@ void CCalPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) {
G4double eta = CLHEP::RandFlat::shoot(etaMin,etaMax);
G4double phi = CLHEP::RandFlat::shoot(phiMin,phiMax);
G4double theta = std::atan(std::exp(-eta))*2.;
G4double theta = std::atan(G4Exp(-eta))*2.;
G4double randomX = std::sin(theta)*std::cos(phi);
G4double randomY = std::sin(theta)*std::sin(phi);
G4double randomZ = std::cos(theta);
@@ -140,7 +141,7 @@ void CCalPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) {
} else {
phiValue += scanPhiStep;
}
G4double theta = std::atan(std::exp(-etaValue))*2.;
G4double theta = std::atan(G4Exp(-etaValue))*2.;
G4double scanX = std::sin(theta)*std::cos(phiValue);
G4double scanY = std::sin(theta)*std::sin(phiValue);
examples/advanced/gammaknife/gammaknife.out
+386 -369
View File
File diff suppressed because it is too large Load Diff
examples/advanced/gammaray_telescope/gammaraytel.out
+4820 -5370
View File
File diff suppressed because it is too large Load Diff
examples/advanced/hadrontherapy/CMakeLists.txt
+1
View File
@@ -62,6 +62,7 @@ endif()
set(EXAMPLEhadrontherapy_SCRIPTS
clean.sh
batch.mac
ModoulWeight.txt
macro/GUIPersonalisation.mac
macro/carbon_beamline.mac
macro/detectorGeometry.mac
examples/advanced/hadrontherapy/History
+2
View File
@@ -7,6 +7,8 @@ http://g4advancedexamples.lngs.infn.it/Examples/hadrontherapy
====================================================
History file of the Hadrontherapy application
====================================================
19.05.2016 F. Romano, B. Jia Tag: hadrontherapy-V10-02-00
- new modulator class implemented
31.10.2015 F. Romano, J. Pipek Tag: hadrontherapy-V10-01-03
- general revisiion and commetns fixed
21.01.2015 J. Apostolakis Tag: hadrontherapy-V10-01-02
examples/advanced/hadrontherapy/ModoulWeight.txt
+24
View File
@@ -0,0 +1,24 @@
NumberOfStep 22
# Thickness Relative_Weight
Step1 0 .14445
Stept2 .8 .05665
Step3 1.6 .05049
Step4 2.4 .04239
Step5 3.2 .04313
Step6 4.0 .03879
Step7 4.8 .04182
Step8 5.6 .03422
Step9 6.4 .03469
Step10 7.2 .03589
Step11 8.0 .03633
Step12 8.8 .03842
Step13 9.6 .03688
Step14 10.4 .03705
Step15 11.2 .03773
Step16 12.0 .03968
Step17 12.8 .04058
Step18 13.6 .03903
Step19 14.4 .04370
Step20 15.2 .03981
Step21 16.0 .05226
Step22 16.8 .03603
examples/advanced/hadrontherapy/hadrontherapy.out
-603
View File
@@ -1,603 +0,0 @@
############################################
!!! WARNING - FPE detection is activated !!!
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
*************************************************************
Activating geometry default
Going to register Parallel world...... done
Using HadrontherapyPhysicsList()
Visualization Manager instantiating with verbosity "warnings (3)"...
Visualization Manager initialising...
Registering graphics systems...
You have successfully registered the following graphics systems.
Current available graphics systems are:
ASCIITree (ATree)
DAWNFILE (DAWNFILE)
G4HepRep (HepRepXML)
G4HepRepFile (HepRepFile)
RayTracer (RayTracer)
VRML1FILE (VRML1FILE)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
RayTracerX (RayTracerX)
Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
End of Event User Vis Actions: none
End of Run User Vis Actions: none
Some /vis commands (optionally) take a string to specify colour.
Available colours:
black, blue, brown, cyan, gray, green, grey, magenta, red, white, yellow
/tracking/verbose 0
/run/verbose 1
/event/verbose 0
/Physics/addPhysics standard_opt4
THE FOLLOWING ELECTROMAGNETIC PHYSICS LIST HAS BEEN ACTIVATED: G4EmStandardPhysics_option4
/run/initialize
HadrontherapyMatrix: Memory space to store physical dose into 200 voxels has been allocated
/run/geometryModified
The (X,Y,Z) dimensions of the phantom are : (40 cm ,40 cm ,40 cm )
The (X,Y,Z) dimensions of the detector are : (4 cm ,4 cm ,4 cm )
Displacement between Phantom and World is: DX= 20 cm DY= 0 fm DZ= 0 fm
The (X,Y,Z) sizes of the Voxels are: (200 um ,4 cm ,4 cm )
The number of Voxels along (X,Y,Z) is: (200,1,1)
G4PhysicsListHelper::AddTransportation()--- G4CoupledTransportation is used
### G4EmConfigurator::AddModels n= 0
PhysicsList::SetCuts:CutLength : 1 mm
/gps/pos/shape Circle
/gps/pos/centre -310. 0. 0. cm
/gps/pos/radius 0. mm
/gps/pos/sigma_r 2. mm
/gps/particle proton
/gps/pos/type Beam
/gps/pos/rot1 0 1 0
/gps/pos/rot2 0 0 1
/gps/ang/rot1 0 0 1
/gps/ang/rot2 0 1 0
/gps/ang/type beam1d
/gps/ang/sigma_r 0. deg
/gps/ene/type Gauss
/gps/ene/mono 62 MeV
/gps/ene/sigma 0.3 MeV
/Step/waterPhantomStepMax 1 mm
/changePhantom/size 40 40 40 cm
/changePhantom/position 20 0 0 cm
/changeDetector/size 4 4 4 cm
/changeDetector/voxelSize 1 40 40 mm
/changeDetector/displacement 0 18 18 cm
/changePhantom/update
HadrontherapyMatrix: Memory space to store physical dose into 40 voxels has been allocated
/run/geometryModified
The (X,Y,Z) dimensions of the phantom are : (40 cm ,40 cm ,40 cm )
The (X,Y,Z) dimensions of the detector are : (4 cm ,4 cm ,4 cm )
Displacement between Phantom and World is: DX= 20 cm DY= 0 fm DZ= 0 fm
The (X,Y,Z) sizes of the Voxels are: (1 mm ,4 cm ,4 cm )
The number of Voxels along (X,Y,Z) is: (40,1,1)
/event/printEventNumber 100
/run/beamOn 500
### === Deexcitation model UAtomDeexcitation is activated for 2 regions:
DefaultRegionForTheWorld
DetectorLog
phot: for gamma SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 10 TeV in 154 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermorePhElectric : Emin= 0 eV Emax= 10 TeV AngularGenSauterGavrila FluoActive
compt: for gamma SubType= 13 BuildTable= 1
Lambda table from 100 eV to 1 MeV, 20 bins per decade, spline: 1
LambdaPrime table from 1 MeV to 10 TeV in 140 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LowEPComptonModel : Emin= 0 eV Emax= 20 MeV FluoActive
KleinNishina : Emin= 20 MeV Emax= 10 TeV FluoActive
conv: for gamma SubType= 14 BuildTable= 1
Lambda table from 1.022 MeV to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
PenConversion : Emin= 0 eV Emax= 80 GeV
BetheHeitlerLPM : Emin= 80 GeV Emax= 10 TeV
Rayl: for gamma SubType= 11 BuildTable= 1
Lambda table from 100 eV to 100 keV, 20 bins per decade, spline: 0
LambdaPrime table from 100 keV to 10 TeV in 160 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermoreRayleigh : Emin= 0 eV Emax= 10 TeV CullenGenerator
msc: for e- SubType= 10
RangeFactor= 0.02, stepLimitType: 3, latDisplacement: 1, skin= 1, geomFactor= 2.5
===== EM models for the G4Region DefaultRegionForTheWorld ======
UrbanMsc : Emin= 0 eV Emax= 100 MeV Table with 120 bins Emin= 100 eV Emax= 100 MeV
WentzelVIUni : Emin= 100 MeV Emax= 10 TeV Table with 100 bins Emin= 100 MeV Emax= 10 TeV
eIoni: for e- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
PenIoni : Emin= 0 eV Emax= 1 MeV
MollerBhabha : Emin= 1 MeV Emax= 10 TeV deltaVI
eBrem: for e- SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
LPM flag: 1 for E > 1 GeV, HighEnergyThreshold(GeV)= 10000
===== EM models for the G4Region DefaultRegionForTheWorld ======
eBremSB : Emin= 0 eV Emax= 1 GeV AngularGen2BS
eBremLPM : Emin= 1 GeV Emax= 10 TeV AngularGen2BS
CoulombScat: for e-, integral: 1 SubType= 1 BuildTable= 1
Lambda table from 100 MeV to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 100 MeV Emax= 10 TeV
msc: for e+ SubType= 10
RangeFactor= 0.02, stepLimitType: 3, latDisplacement: 1, skin= 1, geomFactor= 2.5
===== EM models for the G4Region DefaultRegionForTheWorld ======
UrbanMsc : Emin= 0 eV Emax= 100 MeV Table with 120 bins Emin= 100 eV Emax= 100 MeV
WentzelVIUni : Emin= 100 MeV Emax= 10 TeV Table with 100 bins Emin= 100 MeV Emax= 10 TeV
eIoni: for e+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
PenIoni : Emin= 0 eV Emax= 1 MeV
MollerBhabha : Emin= 1 MeV Emax= 10 TeV deltaVI
eBrem: for e+ SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
LPM flag: 1 for E > 1 GeV, HighEnergyThreshold(GeV)= 10000
===== EM models for the G4Region DefaultRegionForTheWorld ======
eBremSB : Emin= 0 eV Emax= 1 GeV AngularGen2BS
eBremLPM : Emin= 1 GeV Emax= 10 TeV AngularGen2BS
annihil: for e+, integral: 1 SubType= 5 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
eplus2gg : Emin= 0 eV Emax= 10 TeV
CoulombScat: for e+, integral: 1 SubType= 1 BuildTable= 1
Lambda table from 100 MeV to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 100 MeV Emax= 10 TeV
msc: for proton SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
hIoni: for proton SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.02, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 2 MeV deltaVI
BetheBloch : Emin= 2 MeV Emax= 10 TeV deltaVI
hBrems: for proton SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
hBrem : Emin= 0 eV Emax= 10 TeV
hPairProd: for proton SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 13x1001 from 7.50618 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
hPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for proton, integral: 1 SubType= 1 BuildTable= 1
Used Lambda table of anti_proton
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
nuclearStopping: for proton SubType= 8 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU49NucStopping : Emin= 0 eV Emax= 1 MeV
msc: for GenericIon SubType= 10
RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
UrbanMsc : Emin= 0 eV Emax= 10 TeV
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.001, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
ParamICRU73 : Emin= 0 eV Emax= 10 TeV deltaVI
nuclearStopping: for GenericIon SubType= 8 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU49NucStopping : Emin= 0 eV Emax= 1 MeV
msc: for alpha SubType= 10
RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
UrbanMsc : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV deltaVI
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV deltaVI
nuclearStopping: for alpha SubType= 8 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU49NucStopping : Emin= 0 eV Emax= 1 MeV
msc: for anti_proton SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
hIoni: for anti_proton SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.02, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 2 MeV deltaVI
BetheBloch : Emin= 2 MeV Emax= 10 TeV deltaVI
hBrems: for anti_proton SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
hBrem : Emin= 0 eV Emax= 10 TeV
hPairProd: for anti_proton SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 13x1001 from 7.50618 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
hPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for anti_proton, integral: 1 SubType= 1 BuildTable= 1
Lambda table from threshold to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
nuclearStopping: for anti_proton SubType= 8 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU49NucStopping : Emin= 0 eV Emax= 1 MeV
msc: for kaon+ SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
hIoni: for kaon+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.05, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 1.05231 MeV deltaVI
BetheBloch : Emin= 1.05231 MeV Emax= 10 TeV deltaVI
hBrems: for kaon+ SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
hBrem : Emin= 0 eV Emax= 10 TeV
hPairProd: for kaon+ SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 14x1001 from 3.94942 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
hPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for kaon+, integral: 1 SubType= 1 BuildTable= 1
Lambda table from threshold to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
msc: for kaon- SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
hIoni: for kaon- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.05, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 1.05231 MeV deltaVI
BetheBloch : Emin= 1.05231 MeV Emax= 10 TeV deltaVI
hBrems: for kaon- SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
hBrem : Emin= 0 eV Emax= 10 TeV
hPairProd: for kaon- SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 14x1001 from 3.94942 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
hPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for kaon-, integral: 1 SubType= 1 BuildTable= 1
Used Lambda table of kaon+
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
msc: for mu+ SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.05, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV deltaVI
BetheBloch : Emin= 200 keV Emax= 1 GeV deltaVI
MuBetheBloch : Emin= 1 GeV Emax= 10 TeV
muBrems: for mu+ SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
MuBrem : Emin= 0 eV Emax= 10 TeV
muPairProd: for mu+ SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 17x1001 from 1 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
muPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for mu+, integral: 1 SubType= 1 BuildTable= 1
Lambda table from threshold to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
msc: for mu- SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.05, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV deltaVI
BetheBloch : Emin= 200 keV Emax= 1 GeV deltaVI
MuBetheBloch : Emin= 1 GeV Emax= 10 TeV
muBrems: for mu- SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
MuBrem : Emin= 0 eV Emax= 10 TeV
muPairProd: for mu- SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 17x1001 from 1 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
muPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for mu-, integral: 1 SubType= 1 BuildTable= 1
Used Lambda table of mu+
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
msc: for pi+ SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
hIoni: for pi+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.05, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 297.505 keV deltaVI
BetheBloch : Emin= 297.505 keV Emax= 10 TeV deltaVI
hBrems: for pi+ SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
hBrem : Emin= 0 eV Emax= 10 TeV
hPairProd: for pi+ SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 16x1001 from 1.11656 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
hPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for pi+, integral: 1 SubType= 1 BuildTable= 1
Lambda table from threshold to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
msc: for pi- SubType= 10
RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 0, polarAngleLimit(deg)= 180
===== EM models for the G4Region DefaultRegionForTheWorld ======
WentzelVIUni : Emin= 0 eV Emax= 10 TeV Table with 220 bins Emin= 100 eV Emax= 10 TeV
hIoni: for pi- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
finalRange(mm)= 0.05, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 297.505 keV deltaVI
BetheBloch : Emin= 297.505 keV Emax= 10 TeV deltaVI
hBrems: for pi- SubType= 3
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
===== EM models for the G4Region DefaultRegionForTheWorld ======
hBrem : Emin= 0 eV Emax= 10 TeV
hPairProd: for pi- SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 16x1001 from 1.11656 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
hPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
Used Lambda table of pi+
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
========= Table of registered couples ==============================
Index : 0 used in the geometry : Yes
Material : G4_AIR
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 1 used in the geometry : Yes
Material : G4_Al
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 6.90363 keV e- 598.345 keV e+ 570.85 keV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 2 used in the geometry : Yes
Material : G4_Galactic
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 3 used in the geometry : Yes
Material : G4_Ta
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 101.501 keV e- 2.01928 MeV e+ 1.88805 MeV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 4 used in the geometry : Yes
Material : G4_KAPTON
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 2.98035 keV e- 419.056 keV e+ 405.209 keV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 5 used in the geometry : Yes
Material : Brass
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 24.2568 keV e- 1.32231 MeV e+ 1.24471 MeV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 6 used in the geometry : Yes
Material : G4_PLEXIGLASS
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 2.78665 keV e- 389.196 keV e+ 376.336 keV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 7 used in the geometry : Yes
Material : G4_Cu
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 24.7508 keV e- 1.39534 MeV e+ 1.31345 MeV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 8 used in the geometry : Yes
Material : G4_MYLAR
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 3.02067 keV e- 419.056 keV e+ 405.209 keV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 9 used in the geometry : Yes
Material : G4_WATER
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 2.94056 keV e- 351.877 keV e+ 342.545 keV proton 100 keV
Region(s) which use this couple :
DefaultRegionForTheWorld
Index : 10 used in the geometry : Yes
Material : G4_WATER
Range cuts : gamma 1 mm e- 1 mm e+ 1 mm proton 1 mm
Energy thresholds : gamma 2.94056 keV e- 351.877 keV e+ 342.545 keV proton 100 keV
Region(s) which use this couple :
DetectorLog
====================================================================
### Run 0 starts.
Run 0 starts ...
---> Begin of Event: 0
---> Begin of Event: 100
---> Begin of Event: 200
---> Begin of Event: 300
---> Begin of Event: 400
Run terminated.
Run Summary
Number of events processed : 500
User=5.49s Real=5.55s Sys=0.04s
Dose is being written to Dose.out
Graphics systems deleted.
Visualization Manager deleting...
G4 kernel has come to Quit state.
================== Deleting memory pools ===================
Number of memory pools allocated: 12 of which, static: 0
Dynamic pools deleted: 12 / Total memory freed: 0.6 MB
============================================================
RunManagerKernel is deleted. Good bye :)
examples/advanced/hadrontherapy/include/HadrontherapyModulator.hh
+51 -294
View File
@@ -23,12 +23,26 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// Hadrontherapy advanced example for Geant4
// See more at: https://twiki.cern.ch/twiki/bin/view/Geant4/AdvancedExamplesHadrontherapy
// This is the *BASIC* version of Hadrontherapy, a Geant4-based application
// See more at: http://g4advancedexamples.lngs.infn.it/Examples/hadrontherapy
//
// Visit the Hadrontherapy web site (http://www.lns.infn.it/link/Hadrontherapy) to request
// the *COMPLETE* version of this program, together with its documentation;
// Hadrontherapy (both basic and full version) are supported by the Italian INFN
// Institute in the framework of the MC-INFN Group
//
#ifndef HadrontherapyModulator_H
#define HadrontherapyModulator_H 1
#include "globals.hh"
#include <fstream>
#include "G4Material.hh"
#include "G4ThreeVector.hh"
#include "G4RotationMatrix.hh"
#include "HadrontherapyModulatorMessenger.hh"
// using namespace std;
class G4Tubs;
class G4LogicalVolume;
class G4VPhysicalVolume;
@@ -43,19 +57,27 @@ public:
void BuildModulator(G4VPhysicalVolume*);
void SetModulatorAngle(G4double);
void SetModulatorMaterial(G4String);
void SetModulatorPosition(G4ThreeVector);
void SetModulatorInnerRadius(G4double);
void SetModulatorOuterRadius(G4double);
void ModulatorDefaultProperties();
void ModulatorPropertiesFromFile(G4String);
void GetDataFromFile(G4String value);
void GetStepInformation();
void BuildSteps();
private:
std::ifstream File;
G4LogicalVolume * logicMotherMod ;
G4VPhysicalVolume* physiMotherMod;
G4Material* Mod0Mater;
G4Material* ModMater;
G4RotationMatrix* rm;
G4VPhysicalVolume* physiMotherMod;
G4Tubs* solidMod0;
G4LogicalVolume* logicMod0;
G4VPhysicalVolume* physiMod0;
G4Tubs* solidMod1;
G4LogicalVolume* logicMod1;
G4Tubs* solidMod1;
G4LogicalVolume* logicMod1;
G4VPhysicalVolume* physiMod1;
G4Tubs* solidMod2;
@@ -69,291 +91,26 @@ private:
G4Tubs* solidMod4;
G4LogicalVolume* logicMod4;
G4VPhysicalVolume* physiMod4;
G4double pi;
G4int StepNumbers;
G4double* Weight;
G4double* StepThickness;
G4double* StartingAngle;
G4double* SpanningAngle;
G4ThreeVector* PositionMod;
G4Tubs** solidMod;
G4LogicalVolume** logicMod;
G4VPhysicalVolume** physiMod;
G4Tubs* solidMod5;
G4LogicalVolume* logicMod5;
G4VPhysicalVolume* physiMod5;
G4RotationMatrix* rm;
G4Tubs* solidMod6;
G4LogicalVolume* logicMod6;
G4VPhysicalVolume* physiMod6;
G4Tubs* solidMod7;
G4LogicalVolume* logicMod7;
G4VPhysicalVolume* physiMod7;
G4Tubs* solidMod8;
G4LogicalVolume* logicMod8;
G4VPhysicalVolume* physiMod8;
G4Tubs* solidMod9;
G4LogicalVolume* logicMod9;
G4VPhysicalVolume* physiMod9;
G4Tubs* solidMod10;
G4LogicalVolume* logicMod10;
G4VPhysicalVolume* physiMod10;
G4Tubs* solidMod11;
G4LogicalVolume* logicMod11;
G4VPhysicalVolume* physiMod11;
G4Tubs* solidMod12;
G4LogicalVolume* logicMod12;
G4VPhysicalVolume* physiMod12;
G4Tubs* solidMod13;
G4LogicalVolume* logicMod13;
G4VPhysicalVolume* physiMod13;
G4Tubs* solidMod14;
G4LogicalVolume* logicMod14;
G4VPhysicalVolume* physiMod14;
G4Tubs* solidMod15;
G4LogicalVolume* logicMod15;
G4VPhysicalVolume* physiMod15;
G4Tubs* solidMod16;
G4LogicalVolume* logicMod16;
G4VPhysicalVolume* physiMod16;
G4Tubs* solidMod17;
G4LogicalVolume* logicMod17;
G4VPhysicalVolume* physiMod17;
G4Tubs* solidMod18;
G4LogicalVolume* logicMod18;
G4VPhysicalVolume* physiMod18;
G4Tubs* solidMod20;
G4LogicalVolume* logicMod20;
G4VPhysicalVolume* physiMod20;
G4String FileName;
HadrontherapyModulatorMessenger* ModulatorMessenger;
G4double innerRadiusOfTheTube ;
G4double outerRadiusOfTheTube ;
G4Tubs* solidMod21;
G4LogicalVolume* logicMod21;
G4VPhysicalVolume* physiMod21;
G4Tubs* solidMod22;
G4LogicalVolume* logicMod22;
G4VPhysicalVolume* physiMod22;
G4Tubs* solidMod23;
G4LogicalVolume* logicMod23;
G4VPhysicalVolume* physiMod23;
G4Tubs* solidMod24;
G4LogicalVolume* logicMod24;
G4VPhysicalVolume* physiMod24;
G4Tubs* solidMod25;
G4LogicalVolume* logicMod25;
G4VPhysicalVolume* physiMod25;
G4Tubs* solidMod26;
G4LogicalVolume* logicMod26;
G4VPhysicalVolume* physiMod26;
G4Tubs* solidMod27;
G4LogicalVolume* logicMod27;
G4VPhysicalVolume* physiMod27;
G4Tubs* solidMod28;
G4LogicalVolume* logicMod28;
G4VPhysicalVolume* physiMod28;
G4Tubs* solidMod29;
G4LogicalVolume* logicMod29;
G4VPhysicalVolume* physiMod29;
G4Tubs* solidMod30;
G4LogicalVolume* logicMod30;
G4VPhysicalVolume* physiMod30;
G4Tubs* solidMod31;
G4LogicalVolume* logicMod31;
G4VPhysicalVolume* physiMod31;
G4Tubs* solidMod32;
G4LogicalVolume* logicMod32;
G4VPhysicalVolume* physiMod32;
G4Tubs* solidMod33;
G4LogicalVolume* logicMod33;
G4VPhysicalVolume* physiMod33;
G4Tubs* solidMod34;
G4LogicalVolume* logicMod34;
G4VPhysicalVolume* physiMod34;
G4Tubs* solidMod35;
G4LogicalVolume* logicMod35;
G4VPhysicalVolume* physiMod35;
G4Tubs* solidMod36;
G4LogicalVolume* logicMod36;
G4VPhysicalVolume* physiMod36;
G4Tubs* solidMod37;
G4LogicalVolume* logicMod37;
G4VPhysicalVolume* physiMod37;
G4Tubs* solidMod38;
G4LogicalVolume* logicMod38;
G4VPhysicalVolume* physiMod38;
G4Tubs* solidMod40; // pointer to the
G4LogicalVolume* logicMod40;
G4VPhysicalVolume* physiMod40;
G4Tubs* solidMod41;
G4LogicalVolume* logicMod41;
G4VPhysicalVolume* physiMod41;
G4Tubs* solidMod42;
G4LogicalVolume* logicMod42;
G4VPhysicalVolume* physiMod42;
G4Tubs* solidMod43;
G4LogicalVolume* logicMod43;
G4VPhysicalVolume* physiMod43;
G4Tubs* solidMod44;
G4LogicalVolume* logicMod44;
G4VPhysicalVolume* physiMod44;
G4Tubs* solidMod45;
G4LogicalVolume* logicMod45;
G4VPhysicalVolume* physiMod45;
G4Tubs* solidMod46;
G4LogicalVolume* logicMod46;
G4VPhysicalVolume* physiMod46;
G4Tubs* solidMod47;
G4LogicalVolume* logicMod47;
G4VPhysicalVolume* physiMod47;
G4Tubs* solidMod48;
G4LogicalVolume* logicMod48;
G4VPhysicalVolume* physiMod48;
G4Tubs* solidMod49;
G4LogicalVolume* logicMod49;
G4VPhysicalVolume* physiMod49;
G4Tubs* solidMod50;
G4LogicalVolume* logicMod50;
G4VPhysicalVolume* physiMod50;
G4Tubs* solidMod51;
G4LogicalVolume* logicMod51;
G4VPhysicalVolume* physiMod51;
G4Tubs* solidMod52;
G4LogicalVolume* logicMod52;
G4VPhysicalVolume* physiMod52;
G4Tubs* solidMod53;
G4LogicalVolume* logicMod53;
G4VPhysicalVolume* physiMod53;
G4Tubs* solidMod54;
G4LogicalVolume* logicMod54;
G4VPhysicalVolume* physiMod54;
G4Tubs* solidMod55;
G4LogicalVolume* logicMod55;
G4VPhysicalVolume* physiMod55;
G4Tubs* solidMod56;
G4LogicalVolume* logicMod56;
G4VPhysicalVolume* physiMod56;
G4Tubs* solidMod57;
G4LogicalVolume* logicMod57;
G4VPhysicalVolume* physiMod57;
G4Tubs* solidMod58;
G4LogicalVolume* logicMod58;
G4VPhysicalVolume* physiMod58;
G4Tubs* solidMod60;
G4LogicalVolume* logicMod60;
G4VPhysicalVolume* physiMod60;
G4Tubs* solidMod61;
G4LogicalVolume* logicMod61;
G4VPhysicalVolume* physiMod61;
G4Tubs* solidMod62;
G4LogicalVolume* logicMod62;
G4VPhysicalVolume* physiMod62;
G4Tubs* solidMod63;
G4LogicalVolume* logicMod63;
G4VPhysicalVolume* physiMod63;
G4Tubs* solidMod64;
G4LogicalVolume* logicMod64;
G4VPhysicalVolume* physiMod64;
G4Tubs* solidMod65;
G4LogicalVolume* logicMod65;
G4VPhysicalVolume* physiMod65;
G4Tubs* solidMod66;
G4LogicalVolume* logicMod66;
G4VPhysicalVolume* physiMod66;
G4Tubs* solidMod67;
G4LogicalVolume* logicMod67;
G4VPhysicalVolume* physiMod67;
G4Tubs* solidMod68;
G4LogicalVolume* logicMod68;
G4VPhysicalVolume* physiMod68;
G4Tubs* solidMod69;
G4LogicalVolume* logicMod69;
G4VPhysicalVolume* physiMod69;
G4Tubs* solidMod70;
G4LogicalVolume* logicMod70;
G4VPhysicalVolume* physiMod70;
G4Tubs* solidMod71;
G4LogicalVolume* logicMod71;
G4VPhysicalVolume* physiMod71;
G4Tubs* solidMod72;
G4LogicalVolume* logicMod72;
G4VPhysicalVolume* physiMod72;
G4Tubs* solidMod73;
G4LogicalVolume* logicMod73;
G4VPhysicalVolume* physiMod73;
G4Tubs* solidMod74;
G4LogicalVolume* logicMod74;
G4VPhysicalVolume* physiMod74;
G4Tubs* solidMod75;
G4LogicalVolume* logicMod75;
G4VPhysicalVolume* physiMod75;
G4Tubs* solidMod76;
G4LogicalVolume* logicMod76;
G4VPhysicalVolume* physiMod76;
G4Tubs* solidMod77;
G4LogicalVolume* logicMod77;
G4VPhysicalVolume* physiMod77;
G4Tubs* solidMod78;
G4LogicalVolume* logicMod78;
G4VPhysicalVolume* physiMod78;
};
#endif
examples/extended/electromagnetic/TestEm10/include/Em10DetectorMessenger.hh → examples/advanced/hadrontherapy/include/HadrontherapyModulatorMessenger.hh
+34 -47
View File
@@ -23,73 +23,60 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file electromagnetic/TestEm10/include/Em10DetectorMessenger.hh
/// \brief Definition of the Em10DetectorMessenger class
// This is the *BASIC* version of Hadrontherapy, a Geant4-based application
// See more at: http://g4advancedexamples.lngs.infn.it/Examples/hadrontherapy
//
// Visit the Hadrontherapy web site (http://www.lns.infn.it/link/Hadrontherapy) to request
// the *COMPLETE* version of this program, together with its documentation;
// Hadrontherapy (both basic and full version) are supported by the Italian INFN
// Institute in the framework of the MC-INFN Group
//
// $Id: Em10DetectorMessenger.hh 66241 2012-12-13 18:34:42Z gunter $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
#ifndef Em10DetectorMessenger_h
#define Em10DetectorMessenger_h 1
#ifndef HadrontherapyModulatorMessenger_h
#define HadrontherapyModulatorMessenger_h 1
#include "globals.hh"
#include "G4UImessenger.hh"
class Em10DetectorConstruction;
class HadrontherapyModulator;
class G4UIdirectory;
class G4UIcmdWithAString;
class G4UIcmdWithAnInteger;
class G4UIcmdWithADoubleAndUnit;
class G4UIcmdWithoutParameter;
class G4UIcmdWithAString;
class G4UIcmdWith3VectorAndUnit;
class Em10DetectorMessenger: public G4UImessenger
class HadrontherapyModulatorMessenger: public G4UImessenger
{
public:
Em10DetectorMessenger(Em10DetectorConstruction* );
~Em10DetectorMessenger();
HadrontherapyModulatorMessenger(HadrontherapyModulator*);
~HadrontherapyModulatorMessenger();
void SetNewValue(G4UIcommand*, G4String);
void SetNewValue(G4UIcommand*, G4int);
private:
Em10DetectorConstruction* Em10Detector;
G4UIdirectory* Em10detDir;
private:
G4UIcmdWithAnInteger* ModelCmd;
G4UIcmdWithAnInteger* FoilNumCmd;
// Pointer to the modulator wheel
HadrontherapyModulator* Modulator;
G4UIcmdWithAString* AbsMaterCmd;
G4UIcmdWithAString* DetectorSetUpCmd;
G4UIcmdWithADoubleAndUnit* AbsThickCmd;
G4UIcmdWithADoubleAndUnit* AbsRadCmd;
G4UIdirectory* modulatorDir; // Control of the modulator
G4UIcmdWithADoubleAndUnit* modulatorAngleCmd;
// UI command to rotate the modulator wheel
G4UIcmdWithAString* RadiatorMaterCmd;
G4UIcmdWithADoubleAndUnit* RadiatorThickCmd;
G4UIcmdWithADoubleAndUnit* GasGapThickCmd;
G4UIcmdWithADoubleAndUnit* AbsZposCmd;
G4UIcmdWithAString* WorldMaterCmd;
G4UIcmdWithADoubleAndUnit* WorldZCmd;
G4UIcmdWithADoubleAndUnit* WorldRCmd;
G4UIcmdWithADoubleAndUnit* MagFieldCmd;
G4UIcmdWithoutParameter* UpdateCmd;
// G4UIcmdWithADoubleAndUnit* ElectronCutCmd;
// G4UIcmdWithADoubleAndUnit* PositronCutCmd;
// G4UIcmdWithADoubleAndUnit* GammaCutCmd;
G4UIcmdWithAString* modulatorMatCmd;
// UI command to set the material of the modulator wheel
G4UIcmdWithAString* modulatorExternalFile;
// UI command to set an external file for inputing modulator properties
G4UIcmdWith3VectorAndUnit* modulatorPositionCmd;
// UI command to change the position of the modulator in the the beam line
G4UIcmdWithADoubleAndUnit* modulatorOuterRadiusCmd;
// UI command to set the outer radius of the modulator wheel
G4UIcmdWithADoubleAndUnit* modulatorInnerRadiusCmd;
// UI command to set the inner radius of the modulator wheel
};
#endif
examples/advanced/hadrontherapy/macro/modulator.loop
+1 -1
View File
@@ -1,3 +1,3 @@
# macro to be run in loop
/modulator/angle 1 deg
/run/beamOn 100
/run/beamOn 10
examples/advanced/hadrontherapy/macro/modulatorMacro.mac
+46 -13
View File
@@ -42,15 +42,16 @@
# Visualisation
#
/vis/scene/create
/vis/open OGL
/vis/open OGLI
/vis/viewer/flush
/vis/viewer/set/viewpointThetaPhi 50 130 deg
/vis/viewer/zoom 3.5
/vis/viewer/pan -60 40 cm
/vis/scene/add/axes 0 0 0 0.1 m
/vis/viewer/zoom 1
/vis/viewer/panTo -80 40 cm
/vis/scene/add/trajectories
/vis/viewer/update
/vis/scene/add/trajectories
/vis/scene/endOfEventAction accumulate
/vis/viewer/set/hiddenMarker 1
#########################
# Set the primary particle type,
# energy and position along the X direction
@@ -58,40 +59,72 @@
#---------------------------gps-----------------
/gps/pos/shape Circle
/gps/pos/centre -310. 0. 0. cm ##-270
/gps/pos/centre -310. 0. 0. cm
/gps/pos/radius 0. mm
/gps/pos/sigma_r 2. mm ##3
/gps/pos/sigma_r 2.5 mm
/gps/particle proton
/gps/pos/type Beam
# the incident surface is in the y-z plane
/gps/pos/rot1 0 1 0
/gps/pos/rot2 0 0 1
# the beam is travelling along the x-axis without any angular dispersion (angular despersion set to 0.0)
#
/gps/ang/rot1 0 0 1
/gps/ang/rot2 0 1 0
/gps/ang/type beam1d
/gps/ang/sigma_r 0. deg
# the beam energy is in gaussian profile
#
/gps/ene/type Gauss
/gps/energy 62 MeV
/gps/ene/sigma 300 keV
/gps/direction 1 0 0
/gps/ene/mono 62 MeV
/gps/ene/sigma 0.3 MeV
##########################
# Set here the cut and the step max for the tracking.
# Suggested values of cut and step:
/run/setCut 0.1 mm
/Step/waterPhantomStepMax 0.01 mm
#
#/Physics/setDetectorCuts 0.001 mm
#/Physics/setCuts 1 mm
/Step/waterPhantomStepMax 0.005 mm
/changePhantom/size 40 40 40 cm
/changePhantom/position 20 0 0 cm
/changeDetector/size 4 4 4 cm
/changeDetector/voxelSize .1 40 40 mm
/changeDetector/displacement 0 18. 18. cm
/changePhantom/update
# IF YOU WANT A RANGE SHIFTER PLEASE CHANGE
# THE FOLLOWIG PARAMETERS
# SETTING FOR THE RANGE SHIFTER
/beamLine/RangeShifter/RSMat G4_AIR
/beamLine/RangeShifter/thickness 1 cm
# /beamLine/RangeShifter/G4_PLEXIGLASS
# /beamLine/RangeShifter/thickness 1 cm
##########################################################
### Set the modulator properties
/modulator/ReadData
# You can set as a parameter your data file in a right format instead if you left blank or input default, ..
# .. data will be read from the default file "ModulWeight.txt"
/modulator/RMWMat G4_PLEXIGLASS
/modulator/position -2160.5 30 50 mm
/modulator/innerRadius 2.5 cm
/modulator/outRadius 9.5 cm
############################################################
/event/printEventNumber 1000
# START OF THE MODULATOR ROTATION
# IT CONSISTS IN A COMPLETE ROTATION
examples/advanced/hadrontherapy/src/HadrontherapyModulator.cc
+398 -1914
View File
File diff suppressed because it is too large Load Diff
examples/advanced/hadrontherapy/src/HadrontherapyModulatorMessenger.cc
+131
View File
@@ -0,0 +1,131 @@
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// This is the *BASIC* version of Hadrontherapy, a Geant4-based application
// See more at: http://g4advancedexamples.lngs.infn.it/Examples/hadrontherapy
//
// Visit the Hadrontherapy web site (http://www.lns.infn.it/link/Hadrontherapy) to request
// the *COMPLETE* version of this program, together with its documentation;
// Hadrontherapy (both basic and full version) are supported by the Italian INFN
// Institute in the framework of the MC-INFN Group
//
#include "HadrontherapyModulatorMessenger.hh"
#include "HadrontherapyModulator.hh"
#include "G4UIdirectory.hh"
#include "G4UIcmdWithADoubleAndUnit.hh"
#include "G4UIcmdWithAString.hh"
#include "G4UIcmdWith3VectorAndUnit.hh"
HadrontherapyModulatorMessenger::HadrontherapyModulatorMessenger(HadrontherapyModulator* Mod)
:Modulator(Mod)
{
modulatorDir = new G4UIdirectory("/modulator/");
modulatorDir -> SetGuidance("Command to change the modulator wheel proprties");
modulatorMatCmd = new G4UIcmdWithAString("/modulator/RMWMat",this);
modulatorMatCmd -> SetGuidance("Set material of modulatorWheel");
modulatorMatCmd -> SetParameterName("Material",false);
modulatorMatCmd -> AvailableForStates(G4State_Idle);
modulatorExternalFile=new G4UIcmdWithAString("/modulator/ReadData",this);
modulatorExternalFile -> SetGuidance("set properties of modulator steps via a external file");
modulatorExternalFile -> SetParameterName("FileName",true,false);
modulatorExternalFile -> SetDefaultValue ("default");
modulatorExternalFile -> AvailableForStates(G4State_Idle);
modulatorPositionCmd = new G4UIcmdWith3VectorAndUnit("/modulator/position",this);
modulatorPositionCmd -> SetGuidance("Set position of modulato");
modulatorPositionCmd -> SetParameterName("PositionAlongX",
"PositionAlongY",
"PositionAlongZ",false);
modulatorPositionCmd -> SetDefaultUnit("mm");
modulatorPositionCmd -> SetUnitCandidates("mm cm m");
modulatorPositionCmd -> AvailableForStates(G4State_Idle);
modulatorOuterRadiusCmd = new G4UIcmdWithADoubleAndUnit("/modulator/outRadius",this);
modulatorOuterRadiusCmd -> SetGuidance("Set size of outer radius");
modulatorOuterRadiusCmd-> SetParameterName("Size",false);
modulatorOuterRadiusCmd -> SetDefaultUnit("mm");
modulatorOuterRadiusCmd-> SetUnitCandidates("mm cm m");
modulatorOuterRadiusCmd-> AvailableForStates(G4State_Idle);
modulatorInnerRadiusCmd = new G4UIcmdWithADoubleAndUnit("/modulator/innerRadius",this);
modulatorInnerRadiusCmd -> SetGuidance("Set size of inner radius");
modulatorInnerRadiusCmd-> SetParameterName("Size",false);
modulatorInnerRadiusCmd -> SetDefaultUnit("mm");
modulatorInnerRadiusCmd-> SetUnitCandidates("mm cm m");
modulatorInnerRadiusCmd-> AvailableForStates(G4State_Idle);
modulatorAngleCmd = new G4UIcmdWithADoubleAndUnit("/modulator/angle",this);
modulatorAngleCmd -> SetGuidance("Set Modulator Angle");
modulatorAngleCmd -> SetParameterName("Size",false);
modulatorAngleCmd -> SetRange("Size>=0.");
modulatorAngleCmd -> SetUnitCategory("Angle");
modulatorAngleCmd -> AvailableForStates(G4State_Idle);
}
HadrontherapyModulatorMessenger::~ HadrontherapyModulatorMessenger()
{
delete modulatorAngleCmd;
delete modulatorMatCmd;
delete modulatorPositionCmd;
delete modulatorInnerRadiusCmd;
delete modulatorOuterRadiusCmd;
delete modulatorDir;
}
void HadrontherapyModulatorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
{
if( command == modulatorAngleCmd )
{Modulator -> SetModulatorAngle
(modulatorAngleCmd -> GetNewDoubleValue(newValue));}
else if( command == modulatorMatCmd )
{Modulator -> SetModulatorMaterial(newValue);}
else if (command== modulatorExternalFile)
{Modulator->GetDataFromFile(newValue);}
else if( command == modulatorPositionCmd )
{ G4ThreeVector size = modulatorPositionCmd-> GetNew3VectorValue(newValue);
Modulator -> SetModulatorPosition(size);}
else if( command == modulatorOuterRadiusCmd )
{ Modulator -> SetModulatorOuterRadius(
modulatorOuterRadiusCmd -> GetNewDoubleValue(newValue));}
else if( command == modulatorInnerRadiusCmd )
{ Modulator -> SetModulatorInnerRadius(
modulatorInnerRadiusCmd -> GetNewDoubleValue(newValue));}
}
examples/advanced/human_phantom/History
+7 -1
View File
@@ -1,4 +1,4 @@
$Id: History 88764 2015-03-09 12:28:01Z gcosmo $
$Id: History 97053 2016-05-23 12:03:28Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -18,6 +18,12 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
May 23, 2016, G. Cosmo tag human_phantom-V10-02-01
- More compilation warnings in gcc-6.1 fixed...
May 19, 2016, G. Cosmo tag human_phantom-V10-02-00
- Fixed compilation warning on gcc-6.1 in G4CustomFemalBuilder.
Mar 7, 2015, A. Dotti tag human_phantom-V10-01-01
- Fixing compilaiton warning from previous tag on clang35
examples/advanced/human_phantom/human_phantom.out
+67 -50
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -37,16 +37,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -80,19 +82,19 @@ MotherVolume: physicalWorld
sensitivity : 0
Construct Head with mother physicalWorld
Checking overlaps for volume physicalHead ... OK!
Volume of Head = 4651.91 cm^3
Volume of Head = 4657.41 cm^3
Material of Head = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of Head = 4590.97 g
Mass of Head = 4596.39 g
MotherVolume: physicalHead
sensitivity : 0
Construct Skull with mother volume physicalHead
Checking overlaps for volume physicalSkull ... OK!
Skull created !!!!!!
Volume of Skull = 843.246 cm^3
Volume of Skull = 847.905 cm^3
Material of Skull = skeleton
Density of Material = 1.4862 g/cm^3
Mass of Skull = 1253.23 g
Mass of Skull = 1260.16 g
Construct Brain with mother physicalHead
Checking overlaps for volume physicalBrain ... OK!
Volume of Brain = 1470.27 cm^3
@@ -104,10 +106,10 @@ sensitivity : 0
Construct Trunk with mother volume physicalWorld
Checking overlaps for volume physicalTrunk ... OK!
Trunk created !!!!!!
Volume of Trunk = 43960.6 cm^3
Volume of Trunk = 43976.3 cm^3
Material of Trunk = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of Trunk = 43384.7 g
Mass of Trunk = 43400.2 g
MotherVolume: physicalWorld
sensitivity : 0
Construct LeftLeg with mother volume physicalWorld
@@ -131,7 +133,7 @@ sensitivity : 0
Construct LeftArmBone with mother physicalTrunk
Checking overlaps for volume physicalLeftArmBone ... OK!
LeftArmBone created !!!!!!
Volume of LeftArmBone = 819.271 cm^3
Volume of LeftArmBone = 819.272 cm^3
Material of LeftArmBone = skeleton
Density of Material = 1.4862 g/cm^3
Mass of LeftArmBone = 1217.6 g
@@ -167,28 +169,28 @@ sensitivity : 0
Construct UpperSpine with mother volume physicalHead
Checking overlaps for volume physicalUpperSpine ... OK!
UpperSpine created !!!!!!
Volume of UpperSpine = 126.456 cm^3
Volume of UpperSpine = 126.458 cm^3
Material of UpperSpine = skeleton
Density of Material = 1.4862 g/cm^3
Mass of UpperSpine = 187.938 g
Mass of UpperSpine = 187.942 g
MotherVolume: physicalTrunk
sensitivity : 0
Construct LeftScapula with mother volume physicalTrunk
Checking overlaps for volume physicalLeftScapula ... OK!
LeftScapula created !!!!!!
Volume of LeftScapula = 101.683 cm^3
Volume of LeftScapula = 100.812 cm^3
Material of LeftScapula = skeleton
Density of Material = 1.4862 g/cm^3
Mass of LeftScapula = 151.121 g
Mass of LeftScapula = 149.826 g
MotherVolume: physicalTrunk
sensitivity : 0
Construct RightScapula with mother volume physicalTrunk
Checking overlaps for volume physicalRightScapula ... OK!
RightScapula created !!!!!!
Volume of RightScapula = 100.468 cm^3
Volume of RightScapula = 103.388 cm^3
Material of RightScapula = skeleton
Density of Material = 1.4862 g/cm^3
Mass of RightScapula = 149.315 g
Mass of RightScapula = 153.656 g
Construct LeftAdrenal with mother physicalTrunk
Checking overlaps for volume physicalLeftAdrenal ... OK!
Left LeftAdrenal created !!!!!!
@@ -231,10 +233,10 @@ Mass of RightClavicle = 20.3099 g
Construct SmallIntestine with mother volume physicalTrunk
Checking overlaps for volume physicalSmallIntestine ... OK!
SmallIntestine created !!!!!!
Volume of SmallIntestine = 1020.98 cm^3
Volume of SmallIntestine = 1019.35 cm^3
Material of SmallIntestine = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of SmallIntestine = 1007.61 g
Mass of SmallIntestine = 1006 g
Construct RibCage with mother volume physicalTrunk
Checking overlaps for volume physicalRibCage ... OK!
Checking overlaps for volume physicalRib ... OK!
@@ -250,26 +252,26 @@ Checking overlaps for volume physicalRib ... OK!
Checking overlaps for volume physicalRib ... OK!
Checking overlaps for volume physicalRib ... OK!
RibCage created !!!!!!
Volume of RibCage = 693.291 cm^3
Volume of RibCage = 693.348 cm^3
Material of RibCage = skeleton
Density of Material = 1.4862 g/cm^3
Mass of RibCage = 1030.37 g
Mass of RibCage = 1030.45 g
MotherVolume: physicalTrunk
sensitivity : 0
Construct MiddleLowerSpine with mother volume physicalTrunk
Checking overlaps for volume physicalMiddleLowerSpine ... OK!
MiddleLowerSpine created !!!!!!
Volume of MiddleLowerSpine = 753.8 cm^3
Volume of MiddleLowerSpine = 753.626 cm^3
Material of MiddleLowerSpine = skeleton
Density of Material = 1.4862 g/cm^3
Mass of MiddleLowerSpine = 1120.3 g
Mass of MiddleLowerSpine = 1120.04 g
Construct Pelvis with mother volume physicalTrunk
Checking overlaps for volume physicalPelvis ... OK!
Pelvis created !!!!!!
Volume of Pelvis = 603.174 cm^3
Volume of Pelvis = 608.584 cm^3
Material of Pelvis = skeleton
Density of Material = 1.4862 g/cm^3
Mass of Pelvis = 896.437 g
Mass of Pelvis = 904.478 g
Construct Stomach with mother volume physicalTrunk
Checking overlaps for volume physicalStomach ... OK!
Stomach created !!!!!!
@@ -280,17 +282,17 @@ Mass of Stomach = 396.856 g
Construct UpperLargeIntestine with mother volume physicalTrunk
Checking overlaps for volume physicalUpperLargeIntestine ... OK!
UpperLargeIntestine created !!!!!!
Volume of UpperLargeIntestine = 435.511 cm^3
Volume of UpperLargeIntestine = 433.802 cm^3
Material of UpperLargeIntestine = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of UpperLargeIntestine = 429.805 g
Mass of UpperLargeIntestine = 428.119 g
Construct LowerLargeIntestine with mother volume physicalTrunk
Checking overlaps for volume physicalLowerLargeIntestine ... OK!
LowerLargeIntestine created !!!!!!
Volume of LowerLargeIntestine = 344.779 cm^3
Volume of LowerLargeIntestine = 344.258 cm^3
Material of LowerLargeIntestine = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of LowerLargeIntestine = 340.262 g
Mass of LowerLargeIntestine = 339.748 g
Construct Spleen with mother volume physicalTrunk
Checking overlaps for volume physicalSpleen ... OK!
Spleen created !!!!!!
@@ -301,40 +303,40 @@ Mass of Spleen = 173.625 g
Construct Pancreas with mother volume physicalTrunk
Checking overlaps for volume physicalPancreas ... OK!
Pancreas created !!!!!!
Volume of Pancreas = 61.0002 cm^3
Volume of Pancreas = 60.9478 cm^3
Material of Pancreas = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of Pancreas = 60.2011 g
Mass of Pancreas = 60.1494 g
Construct LeftKidney with mother volume physicalTrunk
Checking overlaps for volume physicalLeftKidney ... OK!
Left LeftKidney created !!!!!!
Volume of LeftKidney = 144.107 cm^3
Volume of LeftKidney = 143.922 cm^3
Material of LeftKidney = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of LeftKidney = 142.219 g
Mass of LeftKidney = 142.037 g
Construct RightKidney with mother volume physicalTrunk
Checking overlaps for volume physicalRightKidney ... OK!
RightKidney created !!!!!!
Volume of RightKidney = 143.9 cm^3
Volume of RightKidney = 144.181 cm^3
Material of RightKidney = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of RightKidney = 142.015 g
Mass of RightKidney = 142.293 g
Construct UrinaryBladder with mother volume physicalTrunk
Checking overlaps for volume physicalUrinaryBladder ... OK!
UrinaryBladder created !!!!!!
Volume of UrinaryBladder = 45.5462 cm^3
Volume of UrinaryBladder = 45.7506 cm^3
Material of UrinaryBladder = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of UrinaryBladder = 44.9496 g
Mass of UrinaryBladder = 45.1513 g
MotherVolume: physicalWorld
sensitivity : 0
Construct MaleGenitalia with mother volume physicalWorld
Checking overlaps for volume physicalMaleGenitalia ... OK!
MaleGenitalia created !!!!!!
Volume of MaleGenitalia = 229.385 cm^3
Volume of MaleGenitalia = 229.499 cm^3
Material of MaleGenitalia = soft_tissue
Density of Material = 0.9869 g/cm^3
Mass of MaleGenitalia = 226.38 g
Mass of MaleGenitalia = 226.493 g
MotherVolume: physicalWorld
sensitivity : 0
Construct LeftTeste with mother volume physicalMaleGenitalia
@@ -381,7 +383,8 @@ Mass of RightTeste = 18.5406 g
/run/beamOn 100
### === Deexcitation model UAtomDeexcitation is activated for 1 region:
DefaultRegionForTheWorld
DefaultRegionForTheWorld 1 0 0
### === Ignore cuts flag: 0
phot: for gamma SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 10 TeV in 154 bins
@@ -429,6 +432,13 @@ eBrem: for e- SubType= 3
eBremSB : Emin= 0 eV Emax= 1 GeV AngularGen2BS
eBremLPM : Emin= 1 GeV Emax= 10 TeV AngularGen2BS
ePairProd: for e- SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 21x1001 from 0.1 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
muPairProd : Emin= 0 eV Emax= 10 TeV
CoulombScat: for e-, integral: 1 SubType= 1 BuildTable= 1
Lambda table from 100 MeV to 10 TeV, 20 bins per decade, spline: 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
@@ -457,6 +467,13 @@ eBrem: for e+ SubType= 3
eBremSB : Emin= 0 eV Emax= 1 GeV AngularGen2BS
eBremLPM : Emin= 1 GeV Emax= 10 TeV AngularGen2BS
ePairProd: for e+ SubType= 4
dE/dx and range tables from 100 eV to 10 TeV in 220 bins
Lambda tables from threshold to 10 TeV, 20 bins per decade, spline: 1
Sampling table 21x1001 from 0.1 GeV to 10 TeV
===== EM models for the G4Region DefaultRegionForTheWorld ======
muPairProd : Emin= 0 eV Emax= 10 TeV
annihil: for e+, integral: 1 SubType= 5 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
eplus2gg : Emin= 0 eV Emax= 10 TeV
@@ -802,31 +819,31 @@ Index : 2 used in the geometry : Yes
### Run 0 start.
Number of events = 100
Energy Total in Run:logicalBrain, ID: 0, Energy Deposition (MeV): 0
Energy Total in Run:logicalHead, ID: 1, Energy Deposition (MeV): 5.79233
Energy Total in Run:logicalHead, ID: 1, Energy Deposition (MeV): 2.16829
Energy Total in Run:logicalHeart, ID: 2, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftAdrenal, ID: 3, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftArmBone, ID: 4, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftBreast, ID: 5, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftClavicle, ID: 6, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftKidney, ID: 7, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftLeg, ID: 8, Energy Deposition (MeV): 6.4932
Energy Total in Run:logicalLeftLeg, ID: 8, Energy Deposition (MeV): 11.3888
Energy Total in Run:logicalLeftLegBone, ID: 9, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftLung, ID: 10, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftOvary, ID: 11, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftScapula, ID: 12, Energy Deposition (MeV): 0
Energy Total in Run:logicalLeftTeste, ID: 13, Energy Deposition (MeV): 0
Energy Total in Run:logicalLowerLargeIntestine, ID: 14, Energy Deposition (MeV): 0
Energy Total in Run:logicalMaleGenitalia, ID: 15, Energy Deposition (MeV): 3.84814
Energy Total in Run:logicalMaleGenitalia, ID: 15, Energy Deposition (MeV): 0
Energy Total in Run:logicalMiddleLowerSpine, ID: 16, Energy Deposition (MeV): 0
Energy Total in Run:logicalPancreas, ID: 17, Energy Deposition (MeV): 0
Energy Total in Run:logicalPelvis, ID: 18, Energy Deposition (MeV): 0
Energy Total in Run:logicalRibCage, ID: 19, Energy Deposition (MeV): 1.12601
Energy Total in Run:logicalRibCage, ID: 19, Energy Deposition (MeV): 0.286366
Energy Total in Run:logicalRightAdrenal, ID: 20, Energy Deposition (MeV): 0
Energy Total in Run:logicalRightArmBone, ID: 21, Energy Deposition (MeV): 0
Energy Total in Run:logicalRightBreast, ID: 22, Energy Deposition (MeV): 0
Energy Total in Run:logicalRightClavicle, ID: 23, Energy Deposition (MeV): 0
Energy Total in Run:logicalRightKidney, ID: 24, Energy Deposition (MeV): 0
Energy Total in Run:logicalRightLeg, ID: 25, Energy Deposition (MeV): 8.04831
Energy Total in Run:logicalRightLeg, ID: 25, Energy Deposition (MeV): 10.3309
Energy Total in Run:logicalRightLegBone, ID: 26, Energy Deposition (MeV): 0
Energy Total in Run:logicalRightLung, ID: 27, Energy Deposition (MeV): 0
Energy Total in Run:logicalRightOvary, ID: 28, Energy Deposition (MeV): 0
@@ -838,11 +855,11 @@ Energy Total in Run:logicalSpleen, ID: 33, Energy Deposition (MeV): 0
Energy Total in Run:logicalStomach, ID: 34, Energy Deposition (MeV): 0
Energy Total in Run:logicalThymus, ID: 35, Energy Deposition (MeV): 0
Energy Total in Run:logicalThyroid, ID: 36, Energy Deposition (MeV): 0
Energy Total in Run:logicalTrunk, ID: 37, Energy Deposition (MeV): 35.6123
Energy Total in Run:logicalTrunk, ID: 37, Energy Deposition (MeV): 27.8108
Energy Total in Run:logicalUpperLargeIntestine, ID: 38, Energy Deposition (MeV): 0
Energy Total in Run:logicalUpperSpine, ID: 39, Energy Deposition (MeV): 0
Energy Total in Run:logicalUrinaryBladder, ID: 40, Energy Deposition (MeV): 0
Energy Total in Run:logicalUterus, ID: 41, Energy Deposition (MeV): 0
Total Energy deposit in the body is: 60.9203 MeV
Total Energy deposit in the body is: 51.9853 MeV
Graphics systems deleted.
Visualization Manager deleting...
examples/advanced/human_phantom/src/G4CustomFemaleBuilder.cc
+2 -3
View File
@@ -54,7 +54,6 @@ void G4CustomFemaleBuilder::BuildUterus(const G4String& colourName, G4bool solid
{
if (trunkVolume == 0)
G4Exception("G4CustomFemaleBuilder::BuildUterus()", "human_phantom0001", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Uterus",trunkVolume, colourName, solidVis, sensitivity); }
@@ -62,8 +61,8 @@ if (trunkVolume == 0)
void G4CustomFemaleBuilder::BuildLeftOvary(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
{
if (trunkVolume == 0)
G4Exception("G4CustomFemaleBuilder::BuildLeftOvary()", "human_phantom0002", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4CustomFemaleBuilder::BuildLeftOvary()", "human_phantom0002", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("LeftOvary",trunkVolume, colourName,
solidVis, sensitivity);
examples/advanced/human_phantom/src/G4FemaleBuilder.cc
+9 -10
View File
@@ -52,16 +52,17 @@ G4FemaleBuilder::~G4FemaleBuilder()
void G4FemaleBuilder::BuildUterus(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
{
if (trunkVolume == 0)
G4Exception("G4FemaleBuilder::BuildUterus()", "human_phantom0006", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4FemaleBuilder::BuildUterus()", "human_phantom0006", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Uterus",trunkVolume, colourName, solidVis, sensitivity); }
body -> CreateOrgan("Uterus",trunkVolume, colourName, solidVis, sensitivity);
}
void G4FemaleBuilder::BuildLeftOvary(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
{
if (trunkVolume == 0)
G4Exception("G4FemaleBuilder::BuildLeftOvary()", "human_phantom0007", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4FemaleBuilder::BuildLeftOvary()", "human_phantom0007", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("LeftOvary",trunkVolume, colourName,
solidVis, sensitivity);
@@ -70,8 +71,8 @@ if (trunkVolume == 0)
void G4FemaleBuilder::BuildRightOvary(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
{
if (trunkVolume == 0)
G4Exception("G4FemaleBuilder::BuildRightOvary()", "human_phantom0008", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4FemaleBuilder::BuildRightOvary()", "human_phantom0008", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("RightOvary",trunkVolume, colourName,
solidVis, sensitivity);
@@ -87,7 +88,6 @@ void G4FemaleBuilder::BuildLeftBreast(const G4String& colourName,
solidVis, sensitivity);
}
void G4FemaleBuilder::BuildRightBreast(const G4String& colourName,
G4bool solidVis,
G4bool sensitivity)
@@ -96,6 +96,5 @@ void G4FemaleBuilder::BuildRightBreast(const G4String& colourName,
G4Exception("G4FemaleBuilder::BuildRightBreast()", "human_phantom0010", FatalException, "The world volume is missing !!!!!");
body -> CreateOrgan("RightBreast",motherVolume, colourName,
solidVis, sensitivity);
solidVis, sensitivity);
}
examples/advanced/human_phantom/src/G4PhantomBuilder.cc
+48 -49
View File
@@ -214,39 +214,38 @@ void G4PhantomBuilder::BuildPelvis(const G4String& colourName, G4bool solidVis,
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildPelvis()", "human_phantom0029", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan( "Pelvis",trunkVolume,
colourName, solidVis, sensitivity);
body -> CreateOrgan( "Pelvis",trunkVolume, colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildBrain(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (headVolume == 0)
G4Exception("G4PhantomBuilder::BuildBrain()", "human_phantom0030", FatalException, "The head volume is missing !!!!!");
if (headVolume == 0)
G4Exception("G4PhantomBuilder::BuildBrain()", "human_phantom0030", FatalException, "The head volume is missing !!!!!");
body -> CreateOrgan("Brain",headVolume, colourName, solidVis, sensitivity);
body -> CreateOrgan("Brain",headVolume, colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildHeart(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildHeart()", "human_phantom0031", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Heart", trunkVolume,colourName, solidVis, sensitivity);
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildHeart()", "human_phantom0031", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Heart", trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildLeftLung(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildLeftLung()", "human_phantom0032", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildLeftLung()", "human_phantom0032", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("LeftLung",trunkVolume,colourName,solidVis, sensitivity);
body -> CreateOrgan("LeftLung",trunkVolume,colourName,solidVis, sensitivity);
}
void G4PhantomBuilder::BuildRightLung(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildRightLung()", "human_phantom0033", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildRightLung()", "human_phantom0033", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("RightLung",trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("RightLung",trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildStomach(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
@@ -254,31 +253,31 @@ void G4PhantomBuilder::BuildStomach(const G4String& colourName, G4bool solidVis,
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildStomach()", "human_phantom0034", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Stomach",trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("Stomach",trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildRibCage(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildRibCage()", "human_phantom0035", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildRibCage()", "human_phantom0035", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("RibCage",trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("RibCage",trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildSpleen(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildSpleen()", "human_phantom0036", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildSpleen()", "human_phantom0036", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Spleen", trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("Spleen", trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildUpperLargeIntestine(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildUpperLargeIntestine()", "human_phantom0037", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildUpperLargeIntestine()", "human_phantom0037", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("UpperLargeIntestine",trunkVolume, colourName, solidVis, sensitivity);
body -> CreateOrgan("UpperLargeIntestine",trunkVolume, colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildLowerLargeIntestine(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
@@ -286,7 +285,7 @@ void G4PhantomBuilder::BuildLowerLargeIntestine(const G4String& colourName, G4bo
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildLowerLargeIntestine()", "human_phantom0038", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("LowerLargeIntestine", trunkVolume, colourName,solidVis, sensitivity);
body -> CreateOrgan("LowerLargeIntestine", trunkVolume, colourName,solidVis, sensitivity);
}
void G4PhantomBuilder::BuildSmallIntestine(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
@@ -299,17 +298,17 @@ void G4PhantomBuilder::BuildSmallIntestine(const G4String& colourName, G4bool so
void G4PhantomBuilder::BuildLeftKidney(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildLeftKidney()", "human_phantom0040", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildLeftKidney()", "human_phantom0040", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("LeftKidney", trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("LeftKidney", trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildRightKidney(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildRightKidney()", "human_phantom0041", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildRightKidney()", "human_phantom0041", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("RightKidney",trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("RightKidney",trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildLeftAdrenal(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
@@ -317,7 +316,7 @@ void G4PhantomBuilder::BuildLeftAdrenal(const G4String& colourName, G4bool solid
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildLeftAdrenal()", "human_phantom0042", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("LeftAdrenal", trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("LeftAdrenal", trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildRightAdrenal(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
@@ -325,7 +324,7 @@ void G4PhantomBuilder::BuildRightAdrenal(const G4String& colourName, G4bool soli
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildRightAdrenal()", "human_phantom0043", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("RightAdrenal", trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("RightAdrenal", trunkVolume,colourName, solidVis, sensitivity);
}
@@ -334,14 +333,14 @@ void G4PhantomBuilder::BuildLiver(const G4String& colourName, G4bool solidVis, G
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildLiver()", "human_phantom0044", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Liver", trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("Liver", trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildPancreas(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
{
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildPancreas()", "human_phantom0045", FatalException, "The trunk volume is missing !!!!!");
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildPancreas()", "human_phantom0045", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Pancreas",trunkVolume,colourName, solidVis, sensitivity);
body -> CreateOrgan("Pancreas",trunkVolume,colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildUrinaryBladder(const G4String& colourName, G4bool solidVis, G4bool sensitivity)
@@ -349,15 +348,15 @@ void G4PhantomBuilder::BuildUrinaryBladder(const G4String& colourName, G4bool so
if (trunkVolume == 0)
G4Exception("G4PhantomBuilder::BuildUrinaryBladder()", "human_phantom0046", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("UrinaryBladder",trunkVolume, colourName, solidVis, sensitivity);
body -> CreateOrgan("UrinaryBladder",trunkVolume, colourName, solidVis, sensitivity);
}
void G4PhantomBuilder::BuildThyroid(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
{
if (headVolume == 0)
G4Exception("G4PhantomBuilder::BuildThyroid()", "human_phantom0047", FatalException, "The trunk volume is missing !!!!!");
if (headVolume == 0)
G4Exception("G4PhantomBuilder::BuildThyroid()", "human_phantom0047", FatalException, "The trunk volume is missing !!!!!");
body -> CreateOrgan("Thyroid",headVolume, colourName,solidVis, sensitivity);
body -> CreateOrgan("Thyroid",headVolume, colourName,solidVis, sensitivity);
}
void G4PhantomBuilder::BuildThymus(const G4String& colourName, G4bool solidVis, G4bool sensitivity )
@@ -386,21 +385,21 @@ void G4PhantomBuilder::SetModel(G4String modelFlag)
if(model=="MIRD" || model =="MIX") body = new G4MIRDBodyFactory();
if(model=="ORNLFemale")
{
{
#ifdef G4LIB_USE_GDML
body = new G4ORNLFemaleBodyFactory();
body = new G4ORNLFemaleBodyFactory();
#else
G4cout << model << " Working with GDML only! set G4LIB_USE_GDML 1" << G4endl;
G4cout << model << " Working with GDML only! set G4LIB_USE_GDML 1" << G4endl;
#endif
}
}
if(model=="ORNLMale")
{
{
#ifdef G4LIB_USE_GDML
body = new G4ORNLMaleBodyFactory();
body = new G4ORNLMaleBodyFactory();
#else
G4cout << model << " Working with GDML only! set G4LIB_USE_GDML 1" << G4endl;
G4cout << model << " Working with GDML only! set G4LIB_USE_GDML 1" << G4endl;
#endif
}
}
}
examples/advanced/lAr_calorimeter/lAr_calorimeter.out
+301 -286
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -45,16 +45,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -71,6 +73,14 @@ Constructing materials...... done
******** Number of Rods in FCAL1 : 2351
********* Number of Rods in FCAL2 : 2546
TBSetupSD is not found in /FCALTB/
=======================================================================
====== Pre-compound/De-excitation Physics Parameters ========
=======================================================================
Type of pre-compound inverse x-section 3
Type of de-excitation inverse x-section 3
Min excitation energy (keV) 0.1
Level density (1/MeV) 0.1
=======================================================================
### Adding tracking cuts for neutron TimeCut(ns)= 10000 KinEnergyCut(MeV)= 0
phot: for gamma SubType= 12 BuildTable= 0
@@ -188,7 +198,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -202,7 +212,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -311,7 +321,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -344,7 +354,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -470,6 +480,11 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
---------------------------------------------------
Hadronic Processes for He3
Process: hadElastic
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
Cr_sctns: Glauber-Gribov nucleus nucleus: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: He3Inelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 4 GeV/n
Model: FTFP: 2 GeV/n ---> 100 TeV/n
@@ -853,14 +868,14 @@ Start closing geometry.
G4GeometryManager::ReportVoxelStats -- Voxel Statistics
Total memory consumed for geometry optimisation: 389 kByte
Total CPU time elapsed for geometry optimisation: 0.62 seconds
Total CPU time elapsed for geometry optimisation: 0.28 seconds
Voxelisation: top CPU users:
Percent Total CPU System CPU Memory Volume
------- ---------- ---------- -------- ----------
83.87 0.52 0.00 148k EmModuleLogical
14.52 0.09 0.00 236k HadModuleLogical
1.61 0.01 0.00 4k Mother
85.71 0.24 0.00 148k EmModuleLogical
14.29 0.04 0.00 236k HadModuleLogical
0.00 0.00 0.00 4k Mother
0.00 0.00 0.00 0k CryostatLogical
0.00 0.00 0.00 0k LArgLogical
0.00 0.00 0.00 0k FCALEnvelopeLogical
@@ -870,9 +885,9 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
Voxelisation: top memory users:
Percent Memory Heads Nodes Pointers Total CPU Volume
------- -------- ------ ------ -------- ---------- ----------
60.56 235k 1361 2360 3772 0.09 HadModuleLogical
38.11 148k 1077 1143 2440 0.52 EmModuleLogical
0.94 3k 8 42 146 0.01 Mother
60.56 235k 1361 2360 3772 0.04 HadModuleLogical
38.11 148k 1077 1143 2440 0.24 EmModuleLogical
0.94 3k 8 42 146 0.00 Mother
0.11 0k 1 6 8 0.00 SolidWLogical
0.11 0k 1 6 8 0.00 CuPlateLogical
0.08 0k 1 4 6 0.00 LArgLogical
@@ -887,352 +902,352 @@ Read 2001 events from file data-tracks/tracks-20GeV.dat
---> Begin of event: 1
**** Primary : 1
Vertex : (5.55552,7.16569,32740)
Number of F1 Tiles with Positive energy : 46
Number of F1 Tiles with Positive energy : 45
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
3.7309 1.62166 1.62899
3.48505 1.62166 1.62689
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
1.71665
3.43493
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 1
N Scondaries 182
EmEdep is=19802.8 MeV
HadEdep is=7.95843 MeV
Edep in FCAL1 FCAl2 : 19802.8 7.95843
N Scondaries 181
EmEdep is=19765.8 MeV
HadEdep is=6.92275 MeV
Edep in FCAL1 FCAl2 : 19765.8 6.92275
**** Primary : 2
Vertex : (-3.76032,10.9751,32740)
Number of F1 Tiles with Positive energy : 53
Number of F1 Tiles with Positive energy : 62
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.83597 1.94264 1.50459
1.87747 3.00764 1.90479
Visible Energy in Hole Counter (MeV)
0 80.6978
0 55.2579
Visible Energy in Upstream Dead Materials
646.17
322.017
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 32
N Scondaries 144
EmEdep is=18406.2 MeV
HadEdep is=0.0965517 MeV
Edep in FCAL1 FCAl2 : 18406.2 0.0965517
N Tracks out of world 35
N Scondaries 279
EmEdep is=18429 MeV
HadEdep is=1.97733 MeV
Edep in FCAL1 FCAl2 : 18429 1.97733
**** Primary : 3
Vertex : (13.1951,2.677,32740)
Number of F1 Tiles with Positive energy : 45
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.65028 1.58665 1.70866
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
7.05612
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 5
N Scondaries 330
EmEdep is=19823.6 MeV
HadEdep is=8.7006 MeV
Edep in FCAL1 FCAl2 : 19823.6 8.7006
**** Primary : 4
Vertex : (-8.66148,-8.80731,32740)
Number of F1 Tiles with Positive energy : 44
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.78576 1.75444 1.93937
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
26.5713
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 4
N Scondaries 104
EmEdep is=19774.2 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 19774.2 0
**** Primary : 5
Vertex : (4.75859,7.01622,32740)
Number of F1 Tiles with Positive energy : 40
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.80104 2.28266 1.88805
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
3.05957
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 2
N Scondaries 177
EmEdep is=19863.2 MeV
HadEdep is=0.970362 MeV
Edep in FCAL1 FCAl2 : 19863.2 0.970362
**** Primary : 6
Vertex : (1.94335,14.9228,32740)
Number of F1 Tiles with Positive energy : 53
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
3.4806 1.789 1.78269
Visible Energy in Hole Counter (MeV)
0 103.757
Visible Energy in Upstream Dead Materials
1934.94
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 94
N Scondaries 124
EmEdep is=16054.7 MeV
HadEdep is=0.401497 MeV
Edep in FCAL1 FCAl2 : 16054.7 0.401497
**** Primary : 7
Vertex : (-10.9878,-6.7949,32740)
Number of F1 Tiles with Positive energy : 41
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.59688 1.97212 2.24716
Visible Energy in Hole Counter (MeV)
0 3.78771
Visible Energy in Upstream Dead Materials
5.01568
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 0
N Scondaries 211
EmEdep is=19847.2 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 19847.2 0
**** Primary : 8
Vertex : (10.9757,-1.49585,32740)
Number of F1 Tiles with Positive energy : 44
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
2.05023 2.33886 3.18456
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
3.70808
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 2
N Scondaries 303
EmEdep is=19692.5 MeV
HadEdep is=4.42613 MeV
Edep in FCAL1 FCAl2 : 19692.5 4.42613
**** Primary : 9
Vertex : (-27.7734,3.36444,32740)
Number of F1 Tiles with Positive energy : 46
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.58411 2.0136 2.00442
Visible Energy in Hole Counter (MeV)
0 19.5528
Visible Energy in Upstream Dead Materials
833.825
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 20
N Scondaries 289
EmEdep is=18949.8 MeV
HadEdep is=40.8421 MeV
Edep in FCAL1 FCAl2 : 18949.8 40.8421
**** Primary : 10
Vertex : (-22.5474,4.1006,32740)
Number of F1 Tiles with Positive energy : 44
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.8657 1.5967 2.11814
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
3.10068
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 0
N Scondaries 196
EmEdep is=19779.7 MeV
HadEdep is=1.77093 MeV
Edep in FCAL1 FCAl2 : 19779.7 1.77093
---> Begin of event: 11
**** Primary : 11
Vertex : (-6.31939,21.5056,32740)
Number of F1 Tiles with Positive energy : 51
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
2.09274 1.81881 2.02494
1.7931 1.77616 1.51819
Visible Energy in Hole Counter (MeV)
0 50.3173
0 3.81877
Visible Energy in Upstream Dead Materials
1639.9
6.89076
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 44
N Scondaries 181
EmEdep is=17635.9 MeV
HadEdep is=2.59717 MeV
Edep in FCAL1 FCAl2 : 17635.9 2.59717
**** Primary : 12
Vertex : (17.1015,6.30557,32740)
Number of F1 Tiles with Positive energy : 49
N Tracks out of world 2
N Scondaries 260
EmEdep is=19774.5 MeV
HadEdep is=8.85437 MeV
Edep in FCAL1 FCAl2 : 19774.5 8.85437
**** Primary : 4
Vertex : (-8.66148,-8.80731,32740)
Number of F1 Tiles with Positive energy : 42
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.57147 1.80331 1.6894
1.56372 1.93944 2.1539
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
11.1044
9.36411
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 3
N Scondaries 131
EmEdep is=19814 MeV
N Scondaries 243
EmEdep is=19798.4 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 19814 0
**** Primary : 13
Vertex : (-24.9484,11.8659,32740)
Number of F1 Tiles with Positive energy : 26
Edep in FCAL1 FCAl2 : 19798.4 0
**** Primary : 5
Vertex : (4.75859,7.01622,32740)
Number of F1 Tiles with Positive energy : 45
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.73453 1.49721 1.87651
Visible Energy in Hole Counter (MeV)
0 99.5947
Visible Energy in Upstream Dead Materials
18207.3
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 183
N Scondaries 198
EmEdep is=666.275 MeV
HadEdep is=0.171848 MeV
Edep in FCAL1 FCAl2 : 666.275 0.171848
**** Primary : 14
Vertex : (-0.133696,18.3151,32740)
Number of F1 Tiles with Positive energy : 46
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.79176 2.18136 1.77149
1.79322 1.92606 1.68965
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
17.8862
Visible Energy in Tail Catcher Scintillator
0.00535789 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0.00043071 0 0 0 0 0
N Tracks out of world 10
N Scondaries 175
EmEdep is=19737.3 MeV
HadEdep is=5.57951 MeV
Edep in FCAL1 FCAl2 : 19737.3 5.57951
**** Primary : 15
Vertex : (17.3196,17.6617,32740)
Number of F1 Tiles with Positive energy : 43
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.74957 1.99628 5.50112
Visible Energy in Hole Counter (MeV)
0 16.2559
Visible Energy in Upstream Dead Materials
446.052
8.0115
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 18
N Scondaries 99
EmEdep is=19091.1 MeV
HadEdep is=5.80928 MeV
Edep in FCAL1 FCAl2 : 19091.1 5.80928
**** Primary : 16
Vertex : (-20.8489,10.8988,32740)
Number of F1 Tiles with Positive energy : 72
N Tracks out of world 3
N Scondaries 263
EmEdep is=19857.6 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 19857.6 0
**** Primary : 6
Vertex : (1.94335,14.9228,32740)
Number of F1 Tiles with Positive energy : 54
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.81555 2.09768 1.9666
1.56139 1.62271 2.24421
Visible Energy in Hole Counter (MeV)
0 75.5765
0 124.41
Visible Energy in Upstream Dead Materials
8543.5
2120.79
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 179
N Scondaries 251
EmEdep is=8706.39 MeV
HadEdep is=0.910092 MeV
Edep in FCAL1 FCAl2 : 8706.39 0.910092
**** Primary : 17
Vertex : (-9.96316,-9.33478,32740)
N Tracks out of world 70
N Scondaries 153
EmEdep is=16501.5 MeV
HadEdep is=4.94389 MeV
Edep in FCAL1 FCAl2 : 16501.5 4.94389
**** Primary : 7
Vertex : (-10.9878,-6.7949,32740)
Number of F1 Tiles with Positive energy : 41
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.68297 2.49599 3.28517
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
2.67162
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 3
N Scondaries 135
EmEdep is=19756.6 MeV
HadEdep is=12.6452 MeV
Edep in FCAL1 FCAl2 : 19756.6 12.6452
**** Primary : 8
Vertex : (10.9757,-1.49585,32740)
Number of F1 Tiles with Positive energy : 42
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.54617 1.65147 1.7379
1.65533 1.70223 1.59614
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
26.6858
3.54318
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 4
N Scondaries 176
EmEdep is=19684 MeV
HadEdep is=11.4692 MeV
Edep in FCAL1 FCAl2 : 19684 11.4692
**** Primary : 18
Vertex : (-9.96316,-9.33478,32740)
Number of F1 Tiles with Positive energy : 39
N Scondaries 146
EmEdep is=19746.4 MeV
HadEdep is=4.81416 MeV
Edep in FCAL1 FCAl2 : 19746.4 4.81416
**** Primary : 9
Vertex : (-27.7734,3.36444,32740)
Number of F1 Tiles with Positive energy : 58
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.59613 1.79237 1.64091
1.73258 1.6682 1.58885
Visible Energy in Hole Counter (MeV)
0 39.8739
Visible Energy in Upstream Dead Materials
2627.89
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 95
N Scondaries 126
EmEdep is=15923.2 MeV
HadEdep is=5.36136 MeV
Edep in FCAL1 FCAl2 : 15923.2 5.36136
**** Primary : 10
Vertex : (-22.5474,4.1006,32740)
Number of F1 Tiles with Positive energy : 50
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.77707 2.02905 2.45935
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
4.84822
34.4522
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 13
N Scondaries 244
EmEdep is=19543.9 MeV
HadEdep is=1.83443 MeV
Edep in FCAL1 FCAl2 : 19543.9 1.83443
---> Begin of event: 11
**** Primary : 11
Vertex : (-6.31939,21.5056,32740)
Number of F1 Tiles with Positive energy : 55
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.62793 1.55405 1.72148
Visible Energy in Hole Counter (MeV)
0 53.6366
Visible Energy in Upstream Dead Materials
2043.18
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 91
N Scondaries 257
EmEdep is=17040.1 MeV
HadEdep is=6.09444 MeV
Edep in FCAL1 FCAl2 : 17040.1 6.09444
**** Primary : 12
Vertex : (17.1015,6.30557,32740)
Number of F1 Tiles with Positive energy : 47
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.61346 1.76309 1.64371
Visible Energy in Hole Counter (MeV)
0 6.68393
Visible Energy in Upstream Dead Materials
12.7261
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 3
N Scondaries 123
EmEdep is=19608.5 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 19608.5 0
**** Primary : 13
Vertex : (-24.9484,11.8659,32740)
Number of F1 Tiles with Positive energy : 23
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.80199 1.75734 3.86934
Visible Energy in Hole Counter (MeV)
0 58.68
Visible Energy in Upstream Dead Materials
18278
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 152
N Scondaries 212
EmEdep is=973.436 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 973.436 0
**** Primary : 14
Vertex : (-0.133696,18.3151,32740)
Number of F1 Tiles with Positive energy : 47
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.6357 1.85863 1.71535
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
6.45463
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 1
N Scondaries 250
EmEdep is=19771.7 MeV
N Scondaries 178
EmEdep is=19810 MeV
HadEdep is=4.42048 MeV
Edep in FCAL1 FCAl2 : 19810 4.42048
**** Primary : 15
Vertex : (17.3196,17.6617,32740)
Number of F1 Tiles with Positive energy : 48
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.91062 1.96584 2.38438
Visible Energy in Hole Counter (MeV)
0 0
Visible Energy in Upstream Dead Materials
6.55679
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 1
N Scondaries 193
EmEdep is=19721 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 19771.7 0
Edep in FCAL1 FCAl2 : 19721 0
**** Primary : 16
Vertex : (-20.8489,10.8988,32740)
Number of F1 Tiles with Positive energy : 64
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.51353 2.06861 1.56018
Visible Energy in Hole Counter (MeV)
0 88.3802
Visible Energy in Upstream Dead Materials
6814.56
Visible Energy in Tail Catcher Scintillator
0.0156614 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 125
N Scondaries 101
EmEdep is=11525.7 MeV
HadEdep is=0.173292 MeV
Edep in FCAL1 FCAl2 : 11525.7 0.173292
**** Primary : 17
Vertex : (-9.96316,-9.33478,32740)
Number of F1 Tiles with Positive energy : 45
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.70981 1.58852 1.53449
Visible Energy in Hole Counter (MeV)
0 6.53144
Visible Energy in Upstream Dead Materials
285.119
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 8
N Scondaries 158
EmEdep is=19586 MeV
HadEdep is=0 MeV
Edep in FCAL1 FCAl2 : 19586 0
**** Primary : 18
Vertex : (-9.96316,-9.33478,32740)
Number of F1 Tiles with Positive energy : 64
Number of F2 tiles with Positive energy : 0
Visisble Energy in S1 , S2 , S3 in (MeV)
1.73615 1.8147 1.63016
Visible Energy in Hole Counter (MeV)
0 49.9364
Visible Energy in Upstream Dead Materials
1997.98
Visible Energy in Tail Catcher Scintillator
0 0 0 0 0 0 0
Visible Energy in Tail Catcher Absorber
0 0 0 0 0 0
N Tracks out of world 70
N Scondaries 168
EmEdep is=16178.3 MeV
HadEdep is=8.05005 MeV
Edep in FCAL1 FCAl2 : 16178.3 8.05005
Run terminated.
Run Summary
Number of events processed : 18
User=22.69s Real=22.7s Sys=0.01s
User=12.18s Real=12.2s Sys=0s
Graphics systems deleted.
Visualization Manager deleting...
G4 kernel has come to Quit state.
@@ -1245,21 +1260,21 @@ RunManager is deleting RunManagerKernel.
G4SDManager deleted.
EventManager deleted.
Units table cleared.
Total navigation history collections cleaned: 293
Total navigation history collections cleaned: 310
================== Deleting memory pools ===================
Pool ID '20G4NavigationLevelRep', size : 0.404 MB
Pool ID '20G4NavigationLevelRep', size : 0.408 MB
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
Pool ID '17G4DynamicParticle', size : 0.11 MB
Pool ID '17G4DynamicParticle', size : 0.117 MB
Pool ID '7G4Event', size : 0.000961 MB
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
Pool ID '7G4Track', size : 0.218 MB
Pool ID '18G4TouchableHistory', size : 0.0356 MB
Pool ID '7G4Track', size : 0.234 MB
Pool ID '18G4TouchableHistory', size : 0.0375 MB
Pool ID '15G4CountedObjectIvE', size : 0.00481 MB
Pool ID '10G4Fragment', size : 0.00192 MB
Number of memory pools allocated: 11 of which, static: 0
Dynamic pools deleted: 11 / Total memory freed: 0.78 MB
Dynamic pools deleted: 11 / Total memory freed: 0.81 MB
============================================================
G4Allocator objects are deleted.
UImanager deleted.
examples/advanced/microbeam/History
+3
View File
@@ -9,6 +9,9 @@ $Id: History 70524 2013-05-31 16:36:26Z gcosmo $
Package History file
--------------------
02 Mar 2016 - S.Incerti - tag microbeam-V10-02-00
- removed exp
28 Aug 2015 - S.Incerti - tag microbeam-V10-01-03
- added stronger constraints on SetMinimumEpsilonStep
and SetMaximumEpsilonStep
examples/advanced/microbeam/microbeam.out
+22 -21
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -345,16 +345,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -367,7 +369,8 @@ Available colours:
### === Deexcitation model UAtomDeexcitation is activated for 1 region:
DefaultRegionForTheWorld
DefaultRegionForTheWorld 1 0 0
### === Ignore cuts flag: 0
phot: for gamma SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 10 TeV in 154 bins
@@ -809,7 +812,7 @@ Index : 12 used in the geometry : Yes
====================================================================
##### Create analysis manager 0x24db110
##### Create analysis manager 0x15b8e70
Using Root analysis manager
All Ntuples have been created
-> Event # 1 generated
@@ -820,29 +823,27 @@ All Ntuples have been created
-> Event # 3 generated
===> The incident alpha particle has reached the targeted cell :
-----> total absorbed dose within Nucleus is (Gy) = 0.29893655392339
-----> total absorbed dose within Cytoplasm is (Gy) = 0.05895416661847
-----> total absorbed dose within Nucleus is (Gy) = 0.32778372413202
-----> total absorbed dose within Cytoplasm is (Gy) = 0.044733067737592
-> Event # 4 generated
===> The incident alpha particle has reached the targeted cell :
-----> total absorbed dose within Nucleus is (Gy) = 0.297542698664
-----> total absorbed dose within Cytoplasm is (Gy) = 0.016812349299169
-----> total absorbed dose within Nucleus is (Gy) = 0.29451485847676
-----> total absorbed dose within Cytoplasm is (Gy) = 0.01845536721255
-> Event # 5 generated
===> Sorry, the incident alpha particle has missed the targeted cell !
-> Event # 6 generated
===> The incident alpha particle has reached the targeted cell :
-----> total absorbed dose within Nucleus is (Gy) = 0.30403628497508
-----> total absorbed dose within Cytoplasm is (Gy) = 0.051504478309795
===> Sorry, the incident alpha particle has missed the targeted cell !
-> Event # 7 generated
===> The incident alpha particle has reached the targeted cell :
-----> total absorbed dose within Nucleus is (Gy) = 0.32679569925554
-----> total absorbed dose within Cytoplasm is (Gy) = 0.042253362060202
===> Sorry, the incident alpha particle has missed the targeted cell !
-> Event # 8 generated
===> Sorry, the incident alpha particle has missed the targeted cell !
===> The incident alpha particle has reached the targeted cell :
-----> total absorbed dose within Nucleus is (Gy) = 0.32808202093148
-----> total absorbed dose within Cytoplasm is (Gy) = 0.012292198793424
-> Event # 9 generated
===> Sorry, the incident alpha particle has missed the targeted cell !
@@ -850,7 +851,7 @@ All Ntuples have been created
-> Event # 10 generated
===> Sorry, the incident alpha particle has missed the targeted cell !
-> Total number of particles detected by the gas detector : 5
-> Total number of particles detected by the gas detector : 3
Graphics systems deleted.
Visualization Manager deleting...
examples/advanced/microbeam/src/EMField.cc
+16 -15
View File
@@ -34,6 +34,7 @@
#include "EMField.hh"
#include "G4SystemOfUnits.hh"
#include "G4Exp.hh"
EMField::EMField()
{
@@ -107,8 +108,8 @@ if ( (z >= limitMinEntrance) && (z < limitMaxEntrance) )
dsdx = 0;
largeS = wc0 + wc1*ws + wc2*ws*ws + wc3*ws*ws*ws;
h = 1./(1.+std::exp(largeS));
dhdlargeS = -std::exp(largeS)*h*h;
h = 1./(1.+G4Exp(largeS));
dhdlargeS = -G4Exp(largeS)*h*h;
dlargeSds = wc1+ 2*wc2*ws + 3*wc3*ws*ws;
dhds = dhdlargeS * dlargeSds;
@@ -150,8 +151,8 @@ if (
dsdx = (1/D)*(x-xcenter)/std::sqrt((z-zcenter)*(z-zcenter)+(x-xcenter)*(x-xcenter));
largeS = wc0 + wc1*ws + wc2*ws*ws + wc3*ws*ws*ws;
h = 1./(1.+std::exp(largeS));
dhdlargeS = -std::exp(largeS)*h*h;
h = 1./(1.+G4Exp(largeS));
dhdlargeS = -G4Exp(largeS)*h*h;
dlargeSds = wc1+ 2*wc2*ws + 3*wc3*ws*ws;
dhds = dhdlargeS * dlargeSds;
@@ -344,23 +345,23 @@ if (z>=-1400*mm && z <-200*mm)
P2 = 2*c2[i]/a0[i]/a0[i];
cte = 1 + std::exp(c0[i]);
cte = 1 + G4Exp(c0[i]);
K1 = -cte*P1*std::exp(P0)/( (1+std::exp(P0))*(1+std::exp(P0)) );
K1 = -cte*P1*G4Exp(P0)/( (1+G4Exp(P0))*(1+G4Exp(P0)) );
K2 = -cte*std::exp(P0)*(
P2/( (1+std::exp(P0))*(1+std::exp(P0)) )
+2*P1*K1/(1+std::exp(P0))/cte
+P1*P1/(1+std::exp(P0))/(1+std::exp(P0))
K2 = -cte*G4Exp(P0)*(
P2/( (1+G4Exp(P0))*(1+G4Exp(P0)) )
+2*P1*K1/(1+G4Exp(P0))/cte
+P1*P1/(1+G4Exp(P0))/(1+G4Exp(P0))
);
K3 = -cte*std::exp(P0)*(
(3*P2*P1+P1*P1*P1)/(1+std::exp(P0))/(1+std::exp(P0))
+4*K1*(P1*P1+P2)/(1+std::exp(P0))/cte
+2*P1*(K1*K1/cte/cte+K2/(1+std::exp(P0))/cte)
K3 = -cte*G4Exp(P0)*(
(3*P2*P1+P1*P1*P1)/(1+G4Exp(P0))/(1+G4Exp(P0))
+4*K1*(P1*P1+P2)/(1+G4Exp(P0))/cte
+2*P1*(K1*K1/cte/cte+K2/(1+G4Exp(P0))/cte)
);
G0 = gradient[i]*cte/(1+std::exp(P0));
G0 = gradient[i]*cte/(1+G4Exp(P0));
G1 = gradient[i]*K1;
G2 = gradient[i]*K2;
G3 = gradient[i]*K3;
examples/advanced/microelectronics/History
+4
View File
@@ -9,6 +9,10 @@ $Id: History,v 1.24 2010-11-18 11:48:21 allison Exp $
Package History file
--------------------
4 June 2016 - V.Ivanchenko - microelectronics-V10-02-01
4 June 2016 - V.Ivanchenko - microelectronics-V10-02-00
- Fix msc definition in PhysicsList
1 November 2014 - L. Garnier from M. Raine - microelectronics-V10-00-03
- Fix a warning "'ui' may be used uninitialized in this function"
examples/advanced/microelectronics/microelectronics.out
+29 -23
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -40,16 +40,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -62,10 +64,12 @@ Available colours:
### === Deexcitation model UAtomDeexcitation is activated for 2 regions:
DefaultRegionForTheWorld
Target
DefaultRegionForTheWorld 1 1 1
Target 1 1 1
### === G4UAtomicDeexcitation::InitialiseForNewRun()
### === Auger cascade flag: 0
### === Ignore cuts flag: 0
### === PIXE model for hadrons: Empirical
### === PIXE model for e+-: Livermore
@@ -83,7 +87,7 @@ eIoni: for e- SubType= 2
===== EM models for the G4Region DefaultRegionForTheWorld ======
MollerBhabha : Emin= 0 eV Emax= 10 TeV
===== EM models for the G4Region Target ======
MollerBhabha : Emin= 99.99 MeV Emax= 10 TeV
MollerBhabha : Emin= 100 MeV Emax= 10 TeV
e-_G4MicroElecElastic: for e- SubType= 51 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
@@ -111,13 +115,14 @@ hIoni: for proton SubType= 2
BetheBloch : Emin= 2 MeV Emax= 10 TeV
===== EM models for the G4Region Target ======
Bragg : Emin= 0 eV Emax= 2 MeV
BetheBloch : Emin= 990 MeV Emax= 100 GeV
BetheBloch : Emin= 10 GeV Emax= 10 TeV
p_G4MicroElecInelastic: for proton SubType= 53 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
DummyModel : Emin= 0 eV Emax= 10 TeV
===== EM models for the G4Region Target ======
MicroElecInelasticModel : Emin= 0 eV Emax= 10 GeV deltaVI FluoActive
MicroElecInelasticModel : Emin= 50 keV Emax= 10 GeV deltaVI FluoActive
DummyModel : Emin= 10 GeV Emax= 10 TeV
msc: for GenericIon SubType= 10
RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 0
@@ -127,20 +132,21 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
BetheBloch : Emin= 2 MeV Emax= 10 TeV
===== EM models for the G4Region Target ======
BraggIon : Emin= 0 eV Emax= 2 MeV
BetheBloch : Emin= 990 MeV Emax= 100 GeV
BetheBloch : Emin= 10 GeV Emax= 10 TeV
ion_G4MicroElecInelastic: for GenericIon SubType= 53 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
DummyModel : Emin= 0 eV Emax= 10 TeV
===== EM models for the G4Region Target ======
MicroElecInelasticModel : Emin= 0 eV Emax= 10 GeV deltaVI FluoActive
MicroElecInelasticModel : Emin= 50 keV Emax= 10 GeV deltaVI FluoActive
DummyModel : Emin= 10 GeV Emax= 10 TeV
Region <DefaultRegionForTheWorld> -- -- appears in <World> world volume
This region is in the mass world.
@@ -186,18 +192,18 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
Total memory consumed for geometry optimisation: 0 kByte
Total CPU time elapsed for geometry optimisation: 0 seconds
### Run 0 starts.
##### Create analysis manager 0x1ad99e0
##### Create analysis manager 0x179f680
Using Root analysis manager
... open Root analysis file : microelectronics.root - done
Run terminated.
Run Summary
Number of events processed : 1
User=0.35s Real=0.35s Sys=0s
User=0.2s Real=0.2s Sys=0s
... write Root file : microelectronics.root - done
Number and type of particles created outside region "Target" :
_______________________
Number and type of particles created in region "Target" :
N e- : 24
N e- : 4
Region <DefaultRegionForTheWorld> -- -- appears in <World> world volume
This region is in the mass world.
@@ -238,7 +244,7 @@ Index : 1 used in the geometry : Yes
====================================================================
### Run 1 starts.
##### Create analysis manager 0x1ad99e0
##### Create analysis manager 0x179f680
Using Root analysis manager
... open Root analysis file : microelectronics.root - done
Run terminated.
@@ -249,7 +255,7 @@ Run Summary
Number and type of particles created outside region "Target" :
_______________________
Number and type of particles created in region "Target" :
N e- : 24
N e- : 4
Graphics systems deleted.
Visualization Manager deleting...
G4 kernel has come to Quit state.
@@ -268,12 +274,12 @@ Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
Pool ID '7G4Event', size : 0.000961 MB
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
Pool ID '17G4DynamicParticle', size : 0.00288 MB
Pool ID '7G4Track', size : 0.00481 MB
Pool ID '17G4DynamicParticle', size : 0.000961 MB
Pool ID '7G4Track', size : 0.00192 MB
Pool ID '18G4TouchableHistory', size : 0.000961 MB
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
Number of memory pools allocated: 9 of which, static: 0
Dynamic pools deleted: 9 / Total memory freed: 0.021 MB
Dynamic pools deleted: 9 / Total memory freed: 0.016 MB
============================================================
G4Allocator objects are deleted.
UImanager deleted.
examples/advanced/microelectronics/src/PhysicsList.cc
+23 -12
View File
@@ -147,7 +147,8 @@ void PhysicsList::ConstructEM()
// STANDARD msc is active in the world
G4eMultipleScattering* msc = new G4eMultipleScattering();
pmanager->AddProcess(msc, -1, 1, 1);
msc->AddEmModel(1, new G4UrbanMscModel());
pmanager->AddProcess(msc, -1, 1, -1);
// STANDARD ionisation is active in the world
G4eIonisation* eion = new G4eIonisation();
@@ -172,7 +173,8 @@ void PhysicsList::ConstructEM()
// STANDARD msc is active in the world
G4hMultipleScattering* msc = new G4hMultipleScattering();
pmanager->AddProcess(msc, -1, 1, 1);
msc->AddEmModel(1, new G4UrbanMscModel());
pmanager->AddProcess(msc, -1, 1, -1);
// STANDARD ionisation is active in the world
G4hIonisation* hion = new G4hIonisation();
@@ -187,7 +189,9 @@ void PhysicsList::ConstructEM()
} else if (particleName == "GenericIon") {
// STANDARD msc is active in the world
pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
G4hMultipleScattering* msc = new G4hMultipleScattering();
msc->AddEmModel(1, new G4UrbanMscModel());
pmanager->AddProcess(new G4hMultipleScattering, -1, 1, -1);
// STANDARD ionisation is active in the world
G4ionIonisation* hion = new G4ionIonisation();
@@ -221,7 +225,7 @@ void PhysicsList::ConstructEM()
em_config->SetExtraEmModel("e-","msc",msc,"Target");
mod = new G4MollerBhabhaModel();
mod->SetActivationLowEnergyLimit(99.99*MeV);
mod->SetActivationLowEnergyLimit(100*MeV);
em_config->SetExtraEmModel("e-","eIoni",mod,"Target",0.0,10*TeV, new G4UniversalFluctuation());
// ---> MicroElec processes activated
@@ -240,16 +244,19 @@ void PhysicsList::ConstructEM()
// Inactivate following STANDARD processes
mod = new G4BraggModel();
mod->SetActivationHighEnergyLimit(0.499);
mod->SetActivationHighEnergyLimit(50*keV);
em_config->SetExtraEmModel("proton","hIoni",mod,"Target",0.0,2*MeV, new G4IonFluctuations());
mod = new G4BetheBlochModel();
mod->SetActivationLowEnergyLimit(0.99*GeV);
em_config->SetExtraEmModel("proton","hIoni",mod,"Target",2*MeV,100*GeV, new G4IonFluctuations());
mod->SetActivationLowEnergyLimit(10*GeV);
em_config->SetExtraEmModel("proton","hIoni",mod,"Target",2*MeV,10*TeV, new G4IonFluctuations());
// ---> MicroElec processes activated
mod = new G4MicroElecInelasticModel();
em_config->SetExtraEmModel("proton","p_G4MicroElecInelastic",mod,"Target",50*keV,10*GeV);
mod->SetActivationLowEnergyLimit(50*keV);
em_config->SetExtraEmModel("proton","p_G4MicroElecInelastic",mod,"Target",0.0,10*GeV);
em_config->SetExtraEmModel("proton","p_G4MicroElecInelastic",new G4DummyModel,
"Target",10*GeV,10*TeV);
// *** ion
@@ -259,16 +266,20 @@ void PhysicsList::ConstructEM()
// Inactivate following STANDARD processes
mod = new G4BraggIonModel();
mod->SetActivationHighEnergyLimit(49.9*keV);
mod->SetActivationHighEnergyLimit(50*keV);
em_config->SetExtraEmModel("GenericIon","ionIoni",mod,"Target",0.0,2*MeV, new G4IonFluctuations());
mod = new G4BetheBlochModel();
mod->SetActivationLowEnergyLimit(0.99*GeV);
em_config->SetExtraEmModel("GenericIon","ionIoni",mod,"Target",2*MeV,100*GeV, new G4IonFluctuations());
mod->SetActivationLowEnergyLimit(10*GeV);
em_config->SetExtraEmModel("GenericIon","ionIoni",mod,"Target",2*MeV,10*TeV, new G4IonFluctuations());
// ---> MicroElec processes activated
mod = new G4MicroElecInelasticModel();
em_config->SetExtraEmModel("GenericIon","ion_G4MicroElecInelastic",mod,"Target",50*keV,10*GeV);
mod->SetActivationLowEnergyLimit(50*keV);
em_config->SetExtraEmModel("GenericIon","ion_G4MicroElecInelastic",mod,
"Target",0.0,10*GeV);
em_config->SetExtraEmModel("GenericIon","ion_G4MicroElecInelastic",new G4DummyModel,
"Target",10*GeV,10*TeV);
// Deexcitation
//
examples/advanced/nanobeam/History
+4 -1
View File
@@ -1,5 +1,5 @@
-------------------------------------------------------------------
$Id: History 93477 2015-10-23 07:40:20Z gcosmo $
$Id: History 95952 2016-03-03 10:48:42Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -9,6 +9,9 @@ $Id: History 93477 2015-10-23 07:40:20Z gcosmo $
Package History file
--------------------
02 Mar 2016 - S.Incerti - tag nanobeam-V10-02-00
- removed exp
22 Oct 2015 - tag nanobeam-V10-01-00 - S. Incerti
- upgraded plot.C to ROOT 6
examples/advanced/nanobeam/src/TabulatedField3D.cc
+12 -11
View File
@@ -29,6 +29,7 @@
#include "TabulatedField3D.hh"
#include "G4SystemOfUnits.hh"
#include "G4Exp.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -481,23 +482,23 @@ if (fModel==3)
P2 = 2*c2[i]/a0[i]/a0[i]; // d2P/fDz2
cte = 1 + std::exp(c0[i]); // (1+e^c0)
cte = 1 + G4Exp(c0[i]); // (1+e^c0)
K1 = -cte*P1*std::exp(P0)/( (1+std::exp(P0))*(1+std::exp(P0)) ); // see (11) p1397 TNS 51
K1 = -cte*P1*G4Exp(P0)/( (1+G4Exp(P0))*(1+G4Exp(P0)) ); // see (11) p1397 TNS 51
K2 = -cte*std::exp(P0)*( // see (12) p1397 TNS 51
P2/( (1+std::exp(P0))*(1+std::exp(P0)) )
+2*P1*K1/(1+std::exp(P0))/cte
+P1*P1/(1+std::exp(P0))/(1+std::exp(P0))
K2 = -cte*G4Exp(P0)*( // see (12) p1397 TNS 51
P2/( (1+G4Exp(P0))*(1+G4Exp(P0)) )
+2*P1*K1/(1+G4Exp(P0))/cte
+P1*P1/(1+G4Exp(P0))/(1+G4Exp(P0))
);
K3 = -cte*std::exp(P0)*( // see (13) p1397 TNS 51
(3*P2*P1+P1*P1*P1)/(1+std::exp(P0))/(1+std::exp(P0))
+4*K1*(P1*P1+P2)/(1+std::exp(P0))/cte
+2*P1*(K1*K1/cte/cte+K2/(1+std::exp(P0))/cte)
K3 = -cte*G4Exp(P0)*( // see (13) p1397 TNS 51
(3*P2*P1+P1*P1*P1)/(1+G4Exp(P0))/(1+G4Exp(P0))
+4*K1*(P1*P1+P2)/(1+G4Exp(P0))/cte
+2*P1*(K1*K1/cte/cte+K2/(1+G4Exp(P0))/cte)
);
G0 = gradient[i]*cte/(1+std::exp(P0)); // G = G0*K(z) see (7) p1397 TNS 51
G0 = gradient[i]*cte/(1+G4Exp(P0)); // G = G0*K(z) see (7) p1397 TNS 51
G1 = gradient[i]*K1; // dG/fDz
G2 = gradient[i]*K2; // d2G/fDz2
G3 = gradient[i]*K3; // d3G/fDz3
examples/advanced/purging_magnet/purging_magnet.out
+10 -8
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -37,16 +37,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -320,7 +322,7 @@ Total number of event = 5000
--------- Ranecu engine status ---------
Initial seed (index) = 0
Current couple of seeds = 950871954, 826394968
Current couple of seeds = 1315859993, 1966623602
----------------------------------------
Graphics systems deleted.
Visualization Manager deleting...
examples/advanced/radioprotection/radioprotection.out
+71 -57
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -37,16 +37,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -73,28 +75,38 @@ Checking overlaps for volume GoldCylinder1_phys ... OK!
Checking overlaps for volume GoldCylinder2_phys ... OK!
Checking overlaps for volume GoldCylinder3_phys ... OK!
### G4EmConfigurator::AddModels n= 0
/mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5
@@@ G4ParticleHPInelastic instantiated for particle neutron data directory variable is G4NEUTRONHPDATA pointing to /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic
@@@ G4ParticleHPInelasticData instantiated for particle neutron data directory variable is G4NEUTRONHPDATA pointing to /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5
NeutronHP: /Capture file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/8_17_Oxygen
NeutronHP: /Elastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/8_17_Oxygen
NeutronHP: /Inelastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/8_17_Oxygen
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
=======================================================================
====== Pre-compound/De-excitation Physics Parameters ========
=======================================================================
Type of pre-compound inverse x-section 3
Type of de-excitation inverse x-section 3
Min excitation energy (keV) 0.1
Level density (1/MeV) 0.1
=======================================================================
/mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5
@@@ G4ParticleHPInelastic instantiated for particle neutron data directory variable is G4NEUTRONHPDATA pointing to /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic
@@@ G4ParticleHPInelasticData instantiated for particle neutron data directory variable is G4NEUTRONHPDATA pointing to /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5
NeutronHP: /Capture file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/8_17_Oxygen
NeutronHP: /Elastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/8_17_Oxygen
NeutronHP: /Inelastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/8_17_Oxygen
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
PhysicsList::SetCuts:CutLength : 10 nm
### === Deexcitation model UAtomDeexcitation is activated for 1 region:
DefaultRegionForTheWorld
DefaultRegionForTheWorld 1 1 0
### === Auger cascade flag: 0
### === Ignore cuts flag: 0
phot: for gamma SubType= 12 BuildTable= 0
LambdaPrime table from 200 keV to 10 TeV in 154 bins
@@ -227,9 +239,6 @@ nuclearStopping: for GenericIon SubType= 8 BuildTable= 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU49NucStopping : Emin= 0 eV Emax= 1 MeV
### === Deexcitation model UAtomDeexcitation is activated for 1 region:
DefaultRegionForTheWorld
msc: for alpha SubType= 10
RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 0
===== EM models for the G4Region DefaultRegionForTheWorld ======
@@ -405,33 +414,33 @@ CoulombScat: for mu-, integral: 1 SubType= 1 BuildTable= 1
180 < Theta(degree) < 180 pLimit(GeV^1)= 0.139531
===== EM models for the G4Region DefaultRegionForTheWorld ======
eCoulombScattering : Emin= 0 eV Emax= 10 TeV
NeutronHP: /Capture file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/8_17_Oxygen
NeutronHP: /Elastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/8_17_Oxygen
NeutronHP: /Inelastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/8_17_Oxygen
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/8_17_Oxygen
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
/mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5
@@@ G4ParticleHPInelastic instantiated for particle neutron data directory variable is G4NEUTRONHPDATA pointing to /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Inelastic
NeutronHP: /Capture file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/8_17_Oxygen
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc49/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/UseGranularCLHEP/10-02-ref-00_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/8_17_Oxygen
NeutronHP: /Elastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/8_17_Oxygen
NeutronHP: /Inelastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/8_17_Oxygen
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Inelastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/8_17_Oxygen
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
NeutronHP: /Elastic file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Elastic/CrossSection/6_nat_Carbon
/mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5
@@@ G4ParticleHPInelastic instantiated for particle neutron data directory variable is G4NEUTRONHPDATA pointing to /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Inelastic
NeutronHP: /Capture file for Z = 8, A = 18 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/8_17_Oxygen
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 12 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
NeutronHP: /Capture file for Z = 6, A = 13 is not found and NeutronHP will use /mnt/build/jenkins/workspace/g4-slc6/COMPILER/gcc48/LABEL/slc6/THREAD/Seq/release/RelWithDebInfo/10-02-ref-06_branch/build/data/G4NDL4.5/Capture/CrossSection/6_nat_Carbon
msc: for pi+ SubType= 10
RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 0
@@ -504,6 +513,11 @@ hPairProd: for pi- SubType= 4
---------------------------------------------------
Hadronic Processes for He3
Process: hadElastic
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
Cr_sctns: Glauber-Gribov nucleus nucleus: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: He3Inelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 4 GeV/n
Model: FTFP: 2 GeV/n ---> 100 TeV/n
@@ -675,7 +689,7 @@ hPairProd: for pi- SubType= 4
Model: QGSP: 12 GeV ---> 100 TeV
Model: FTFP: 9.5 GeV ---> 25 GeV
Model: Binary Cascade: 19.9 MeV ---> 9.9 GeV
Model: ParticleHPInelastic: 0 eV ---> 20 MeV
Model: NeutronHPInelastic: 0 eV ---> 20 MeV
Cr_sctns: NeutronHPInelasticXS: 0 eV ---> 20 MeV
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
Cr_sctns: Barashenkov-Glauber: 0 eV ---> 100 TeV
examples/advanced/underground_physics/History
+4 -1
View File
@@ -1,5 +1,5 @@
-------------------------------------------------------------------
$Id: History 93897 2015-11-03 08:38:30Z gcosmo $
$Id: History 97922 2016-06-23 09:30:28Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -9,6 +9,9 @@ $Id: History 93897 2015-11-03 08:38:30Z gcosmo $
Category History file
---------------------
22.06.2016 - V. Ivanchenko (DMX-V10-02-00)
DMXPhysicsList: migrated EM physics to G4EmParameters.
02.11.2015 - A. Ribon (DMX-V10-01-01)
DMXPhysicsList: migrated to ParticleHP.
examples/advanced/underground_physics/src/DMXPhysicsList.cc
+17 -16
View File
@@ -264,16 +264,27 @@ void DMXPhysicsList::AddTransportation() {
#include "G4IonParametrisedLossModel.hh"
//em process options to allow msc step-limitation to be switched off
#include "G4EmProcessOptions.hh"
#include "G4EmParameters.hh"
#include "G4VAtomDeexcitation.hh"
#include "G4UAtomicDeexcitation.hh"
#include "G4LossTableManager.hh"
void DMXPhysicsList::ConstructEM() {
//set a finer grid of the physic tables in order to improve precision
//former LowEnergy models have 200 bins up to 100 GeV
G4EmProcessOptions opt;
opt.SetMaxEnergy(100*GeV);
opt.SetDEDXBinning(200);
opt.SetLambdaBinning(200);
G4EmParameters* param = G4EmParameters::Instance();
param->SetMaxEnergy(100*GeV);
param->SetNumberOfBinsPerDecade(20);
param->SetMscStepLimitType(fMinimal);
param->SetFluo(true);
param->SetPixe(true);
param->SetAuger(true);
G4LossTableManager* man = G4LossTableManager::Instance();
G4VAtomDeexcitation* ad = man->AtomDeexcitation();
if(!ad) {
man->SetAtomDeexcitation(new G4UAtomicDeexcitation());
}
theParticleIterator->reset();
while( (*theParticleIterator)() ){
@@ -287,7 +298,6 @@ void DMXPhysicsList::ConstructEM() {
{
//gamma
G4RayleighScattering* theRayleigh = new G4RayleighScattering();
theRayleigh->SetEmModel(new G4LivermoreRayleighModel()); //not strictly necessary
pmanager->AddDiscreteProcess(theRayleigh);
G4PhotoElectricEffect* thePhotoElectricEffect = new G4PhotoElectricEffect();
@@ -310,7 +320,7 @@ void DMXPhysicsList::ConstructEM() {
// Multiple scattering
G4eMultipleScattering* msc = new G4eMultipleScattering();
msc->SetStepLimitType(fUseDistanceToBoundary);
pmanager->AddProcess(msc,-1, 1, 1);
pmanager->AddProcess(msc,-1, 1, -1);
// Ionisation
G4eIonisation* eIonisation = new G4eIonisation();
@@ -412,15 +422,6 @@ void DMXPhysicsList::ConstructEM() {
}
}
// turn off msc step-limitation - especially as electron cut 1nm
opt.SetMscStepLimitation(fMinimal);
// switch on fluorescence, PIXE and Auger:
opt.SetFluo(true);
opt.SetPIXE(true);
opt.SetAuger(true);
}
examples/advanced/underground_physics/underground_physics.out
+339 -354
View File
File diff suppressed because it is too large Load Diff
examples/advanced/xray_fluorescence/xray_fluorescence.out
+20 -15
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -12,7 +12,6 @@
Using the sequential Run Manager
XrayFluoAnalysisManager created
### NIST DataBase for Materials is used
G4NistMaterialBuilder::FindOrBuildMaterial WARNING: material <MadaBasaltMain> is not found out
G4NistMaterialBuilder::FindOrBuildMaterial WARNING: material <MadaBasaltTraces> is not found out
G4NistMaterialBuilder::FindOrBuildMaterial WARNING: material <IceBasaltMain> is not found out
@@ -2319,16 +2318,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -2359,6 +2360,8 @@ The Anode is a slice 1e-05mm thick of G4_Ni
World is registered to the default region.
XrayFluoSD created
physicsList->Construct() start.
### WARNING: G4EmProcessOptions class is obsolete and will be removed in the next public release
Please, try to use G4EmParameters class and/or UI interface to EM parameters
physicsList->CheckParticleList() start.
physicsList->setCut() start.
PhysicsList::SetCuts:CutLength : 1 mm
@@ -2391,9 +2394,11 @@ PhysicsList::SetCuts:CutLength : 10 um
/run/beamOn 10
### === Deexcitation model UAtomDeexcitation is activated for 1 region:
DefaultRegionForTheWorld
DefaultRegionForTheWorld 1 1 1
### === G4UAtomicDeexcitation::InitialiseForNewRun()
### === Auger cascade flag: 0
### === Ignore cuts flag: 0
### === PIXE model for hadrons: ECPSSR_FormFactor
### === PIXE model for e+-: Livermore
@@ -2862,7 +2867,7 @@ Created histos
Run terminated.
Run Summary
Number of events processed : 10
User=1.5s Real=1.51s Sys=0s
User=0.93s Real=0.94s Sys=0s
Going to save histograms
... write Root file : xrayfluo.root - done
/vis/viewer/update
@@ -2883,21 +2888,21 @@ XrayFluoSD deleted
G4SDManager deleted.
EventManager deleted.
Units table cleared.
Total navigation history collections cleaned: 7
Total navigation history collections cleaned: 8
================== Deleting memory pools ===================
Pool ID '20G4NavigationLevelRep', size : 0.00673 MB
Pool ID '20G4NavigationLevelRep', size : 0.00865 MB
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
Pool ID '7G4Event', size : 0.000961 MB
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
Pool ID '16G4HitsCollection', size : 0.000961 MB
Pool ID '17G4DynamicParticle', size : 0.319 MB
Pool ID '7G4Track', size : 0.638 MB
Pool ID '17G4DynamicParticle', size : 0.323 MB
Pool ID '7G4Track', size : 0.645 MB
Pool ID '18G4TouchableHistory', size : 0.000961 MB
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
Number of memory pools allocated: 11 of which, static: 0
Dynamic pools deleted: 11 / Total memory freed: 0.97 MB
Dynamic pools deleted: 11 / Total memory freed: 0.98 MB
============================================================
G4Allocator objects are deleted.
UImanager deleted.
examples/advanced/xray_telescope/xray_telescope.out
+14 -12
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -37,16 +37,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -153,7 +155,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -167,7 +169,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -219,7 +221,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -246,7 +248,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -378,7 +380,7 @@ Opening output file xraytel ... done
Run terminated.
Run Summary
Number of events processed : 1000
User=0.08s Real=0.08s Sys=0s
User=0.03s Real=0.03s Sys=0s
##########################################
WARNING: command "/vis/viewer/update" could not be applied: no current viewer.
Graphics systems deleted.
examples/basic/.README.txt
+1 -1
View File
@@ -1,4 +1,4 @@
// $Id: .README.txt 94710 2015-12-03 16:15:05Z gunter $
// $Id: .README.txt 94957 2016-01-08 13:27:26Z gcosmo $
///\file "basic/.README.txt"
///\brief Geant4 Basic Examples README page
examples/basic/B1/.README.txt
+3 -3
View File
@@ -1,4 +1,4 @@
//$Id: .README.txt 94710 2015-12-03 16:15:05Z gunter $
//$Id: .README.txt 94957 2016-01-08 13:27:26Z gcosmo $
///\file "B1/.README.txt"
///\brief Example B1 README page
@@ -36,8 +36,8 @@
<a href="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides
/InstallationGuide/html/ch03s03.html">
Geant4 Installation Guide, Chapter 3.3: Note On Geant4 Datasets </a>.
The following datasets: G4LEDATA, G4LEVELGAMMADATA, G4NEUTRONXSDATA and
G4SAIDXSDATA are mandatory for this example.
The following datasets: G4LEDATA, G4LEVELGAMMADATA, G4NEUTRONXSDATA,
G4SAIDXSDATA and G4ENSDFSTATEDATA are mandatory for this example.
In addition the build-in interactive command:
\verbatim
examples/basic/B1/README
+3 -3
View File
@@ -1,4 +1,4 @@
$Id: README 93886 2015-11-03 08:28:26Z gcosmo $
$Id: README 94957 2016-01-08 13:27:26Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -36,8 +36,8 @@ $Id: README 93886 2015-11-03 08:28:26Z gcosmo $
Chapter 3.3: Note On Geant4 Datasets:
http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides
/InstallationGuide/html/ch03s03.html
The following datasets: G4LEDATA, G4LEVELGAMMADATA, G4NEUTRONXSDATA and
G4SAIDXSDATA are mandatory for this example.
The following datasets: G4LEDATA, G4LEVELGAMMADATA, G4NEUTRONXSDATA,
G4SAIDXSDATA and G4ENSDFSTATEDATA are mandatory for this example.
In addition the build-in interactive command:
/process/(in)activate processName
examples/basic/B1/exampleB1.out
+28 -13
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -38,16 +38,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -61,6 +63,14 @@ Available colours:
Checking overlaps for volume Envelope ... OK!
Checking overlaps for volume Shape1 ... OK!
Checking overlaps for volume Shape2 ... OK!
=======================================================================
====== Pre-compound/De-excitation Physics Parameters ========
=======================================================================
Type of pre-compound inverse x-section 3
Type of de-excitation inverse x-section 3
Min excitation energy (keV) 0.1
Level density (1/MeV) 0.1
=======================================================================
### Adding tracking cuts for neutron TimeCut(ns)= 10000 KinEnergyCut(MeV)= 0
phot: for gamma SubType= 12 BuildTable= 0
@@ -178,7 +188,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -192,7 +202,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -301,7 +311,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -334,7 +344,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -461,6 +471,11 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
---------------------------------------------------
Hadronic Processes for He3
Process: hadElastic
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
Cr_sctns: Glauber-Gribov nucleus nucleus: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: He3Inelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 4 GeV/n
Model: FTFP: 2 GeV/n ---> 100 TeV/n
@@ -743,7 +758,7 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
--------------------End of Global Run-----------------------
The run consists of 1000 gamma of 6 MeV
Cumulated dose per run, in scoring volume : 41.8432 picoGy rms = 3.86439 picoGy
Cumulated dose per run, in scoring volume : 45.3847 picoGy rms = 3.97502 picoGy
------------------------------------------------------------
### Run 1 starts.
@@ -760,7 +775,7 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
--------------------End of Global Run-----------------------
The run consists of 1000 proton of 210 MeV
Cumulated dose per run, in scoring volume : 4.9029 nanoGy rms = 145.489 picoGy
Cumulated dose per run, in scoring volume : 5.09132 nanoGy rms = 145.967 picoGy
------------------------------------------------------------
Graphics systems deleted.
examples/basic/B2/.README.txt
+3 -3
View File
@@ -1,4 +1,4 @@
//$Id: .README.txt 94710 2015-12-03 16:15:05Z gunter $
//$Id: .README.txt 94957 2016-01-08 13:27:26Z gcosmo $
///\file "B2/.README.txt"
///\brief Example B2 README page
@@ -44,8 +44,8 @@ This example simulates a simplified fixed target experiment.
See more on installation of the datasets in
<a href="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/InstallationGuide/html/ch03s03.html">
Geant4 Installation Guide, Chapter 3.3: Note On Geant4 Datasets </a>.
The following datasets: G4LEDATA, G4LEVELGAMMADATA and G4SAIDXSDATA are
mandatory for this example.
The following datasets: G4LEDATA, G4LEVELGAMMADATA, G4SAIDXSDATA and
G4ENSDFSTATEDATA are mandatory for this example.
In addition, the build-in interactive command:
\verbatim
examples/basic/B2/B2a/exampleB2a.out
+1876 -5535
View File
File diff suppressed because it is too large Load Diff
examples/basic/B2/B2a/src/B2PrimaryGeneratorAction.cc
+1 -1
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: B2PrimaryGeneratorAction.cc 68058 2013-03-13 14:47:43Z gcosmo $
// $Id: B2PrimaryGeneratorAction.cc 97979 2016-06-30 09:36:20Z gcosmo $
//
/// \file B2PrimaryGeneratorAction.cc
/// \brief Implementation of the B2PrimaryGeneratorAction class
examples/basic/B2/B2b/exampleB2b.out
+2303 -2111
View File
File diff suppressed because it is too large Load Diff
examples/basic/B2/README
+3 -3
View File
@@ -1,4 +1,4 @@
$Id: README 78001 2013-12-02 08:24:53Z gcosmo $
$Id: README 94957 2016-01-08 13:27:26Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -46,8 +46,8 @@ $Id: README 78001 2013-12-02 08:24:53Z gcosmo $
See more on installation of the datasets in Geant4 Installation Guide,
Chapter 3.3: Note On Geant4 Datasets:
http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/InstallationGuide/html/ch03s03.html
The following datasets: G4LEDATA, G4LEVELGAMMADATA and G4SAIDXSDATA are
mandatory for this example.
The following datasets: G4LEDATA, G4LEVELGAMMADATA, G4SAIDXSDATA and
G4ENSDFSTATEDATA are mandatory for this example.
In addition, the build-in interactive command:
/process/(in)activate processName
examples/basic/B3/.README.txt
+3 -1
View File
@@ -1,4 +1,4 @@
//$Id: .README.txt 94093 2015-11-05 15:16:06Z gcosmo $
//$Id: .README.txt 94957 2016-01-08 13:27:26Z gcosmo $
///\file "B3/.README.txt"
///\brief Example B3 README page
@@ -38,6 +38,8 @@
This physics list requires data files for:
- low energy electromagnetic processes which path is defined via
the G4LEDATA envirnoment variable
- data files for nuclides properties which path is defined via
the G4ENSDFSTATEDATA envirnoment variable
- radioactive decay hadronic processes which path is defined via
the G4RADIOACTIVEDATA envirnoment variable.
examples/basic/B3/B3a/.README
+186
View File
@@ -0,0 +1,186 @@
//$Id: .README 94957 2016-01-08 13:27:26Z gcosmo $
///\file "B3/.README"
///\brief Example B3 README page
/*! \page ExampleB3 Example B3
This example simulates schematically a Positron Emitted Tomography system.
\section B3_s1 GEOMETRY DEFINITION
The support of gamma detection are scintillating crystals. A small number
of such crystals are optically grouped in a matrix of crystals. In
this example, individual crystals are not described; only the matrix of
crystals is and it is still called 'Crystal' hereafter.
Crystals are circularly arranged to form a ring. Few rings make up the full
detector (gamma camera). This is done by positionning Crystals in
Ring with an appropriate rotation matrix. Several copies of Ring are
then placed in the full detector.
The head of a patient is schematised as a homogeneous cylinder of brain
tissue, placed at the center of full detector.
The Crystal material, Lu2SiO5, is not included in the G4Nist database.
Therefore, it is explicitly built in DefineMaterials().
\section B3_s2 PHYSICS LIST
The physics list contains standard electromagnetic processes and the
radioactiveDecay module for GenericIon. It is defined in the B3PhysicsList
class as a Geant4 modular physics list with registered physics builders
provided in Geant4:
- G4DecayPhysics - defines all particles and their decay processes
- G4RadioactiveDecayPhysics - defines radioactiveDecay for GenericIon
- G4EmStandardPhysics - defines all EM standard processes
This physics list requires data files for:
- low energy electromagnetic processes which path is defined via
the G4LEDATA envirnoment variable
- radioactive decay hadronic processes which path is defined via
the G4RADIOACTIVEDATA envirnoment variable.
See more on installation of the datasets in
<a href="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides
/InstallationGuide/html/ch03s03.html">
Geant4 Installation Guide, Chapter 3.3: Note On Geant4 Datasets </a>.
\section B3_s3 ACTION INITALIZATION
A newly introduced class, B1ActionInitialization, instantiates and registers
to Geant4 kernel all user action classes.
While in sequential mode the action classes are instatiated just once,
via invoking the method:
B3ActionInitialization::Build()
in multi-threading mode the same method is invoked for each thread worker
and so all user action classes are defined thread-local.
A run action class is instantiated both thread-local
and global that's why its instance is created also in the method
B3ActionInitialization::BuildForMaster()
which is invoked only in multi-threading mode.
\section B3_s4 PRIMARY GENERATOR
The default particle beam is an ion (F18), at rest, randomly distributed
within a zone inside a patient and is defined in
B3PrimaryGeneratorAction::GeneratePrimaries().
The type of a primary particle can be changed with G4ParticleGun commands
(see run2.mac).
\section B3_s5 DETECTOR RESPONSE : scorers
A 'good' event is an event in which an identical energy of 511 keV is
deposited in two separate Crystals. A count of the number of such events
corresponds to a measure of the efficiency of the PET system.
The total dose deposited in a patient during a run is also computed.
Scorers are defined in DetectorConstruction::ConstructSDandField(). There are
two G4MultiFunctionalDetector objects: one for the Crystal (EnergyDeposit),
and one for the Patient (DoseDeposit)
B3Run::RecordEvent() collects informations event per event
from the hits collections, and accumulates statistic for
RunAction::EndOfRunAction().
In multi-threading mode the statistics accumulated per workers is merged
to the master in Run::Merge().
\section B3_s6 STACKING ACTION
Beta decay of Fluor generates a neutrino. One wishes not to track this
neutrino; therefore one kills it immediately, before created particles
are put in a stack.
The function B3StackingAction::ClassifyNewTrack() is invoked by G4 kernel
each time a new particle is created.
<hr>
The following paragraphs are common to all basic examples
\section B3_A VISUALISATION
The visualization manager is set via the G4VisExecutive class
in the main () function in exampleB3.cc.
The initialisation of the drawing is done via a set of /vis/ commands
in the macro vis.mac. This macro is automatically read from
the main function when the example is used in interactive running mode.
By default, vis.mac opens an OpenGL viewer (/vis/open OGL).
The user can change the initial viewer by commenting out this line
and instead uncommenting one of the other /vis/open statements, such as
HepRepFile or DAWNFILE (which produce files that can be viewed with the
HepRApp and DAWN viewers, respectively). Note that one can always
open new viewers at any time from the command line. For example, if
you already have a view in, say, an OpenGL window with a name
"viewer-0", then
\verbatim
/vis/open DAWNFILE
\endverbatim
then to get the same view
\verbatim
/vis/viewer/copyView viewer-0
\endverbatim
or to get the same view *plus* scene-modifications
\verbatim
/vis/viewer/set/all viewer-0
\endverbatim
then to see the result
\verbatim
/vis/viewer/flush
\endverbatim
The DAWNFILE, HepRepFile drivers are always available
(since they require no external libraries), but the OGL driver requires
that the Geant4 libraries have been built with the OpenGL option.
For more information on visualization, including information on how to
install and run DAWN, OpenGL and HepRApp, see the visualization tutorials,
for example,\n
- <a href="http://geant4.slac.stanford.edu/Presentations/vis/G4OpenGLTutorial/G4OpenGLTutorial.html">
OpenGL Tutorial </a>
- <a href="http://geant4.slac.stanford.edu/Presentations/vis/G4DAWNTutorial/G4DAWNTutorial.html">
DAWN Tutorial </a>
- <a href="http://geant4.slac.stanford.edu/Presentations/vis/G4HepRAppTutorial/G4HepRAppTutorial.html">
HepRApp Tutorial </a>
The tracks are automatically drawn at the end of each event, accumulated
for all events and erased at the beginning of the next run.
\section B3_B USER INTERFACES
The user command interface is set via the G4UIExecutive class
in the main () function in exampleB3.cc
The selection of the user command interface is then done automatically
according to the Geant4 configuration or it can be done explicitly via
the third argument of the G4UIExecutive constructor (see exampleB4a.cc).
\section B3_C HOW TO RUN
- Execute exampleB3 in the 'interactive mode' with visualization
\verbatim
% exampleB3
and type in the commands from run1.mac line by line:
Idle> /control/verbose 2
Idle> /tracking/verbose 2
Idle> /run/beamOn 1
Idle> ...
Idle> exit
\endverbatim
or
\verbatim
Idle> /control/execute run1.mac
....
Idle> exit
\endverbatim
- Execute exampleB3 in the 'batch' mode from macro files
(without visualization)
\verbatim
% exampleB3 run2.mac
% exampleB3 exampleB3.in > exampleB3.out
\endverbatim
*/
examples/basic/B3/B3a/History
-90
View File
@@ -1,90 +0,0 @@
$Id: History 89902 2015-05-04 09:30:08Z ihrivnac $
--------------------------------------------------
=========================================================
Geant4 - an Object-Oriented Toolkit for Simulation in HEP
=========================================================
Example B3 History file
-----------------------
This file should be used by the G4 example coordinator to briefly
summarize all major modifications introduced in the code and keep
track of all tags.
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
04/05/15 I. Hrivnacova (exampleB3-V10-01-00)
- Coding guidelines: removed empty lines
29/11/14 I. Hrivnacova
- Use G4endl instead of \n in G4cout;
this makes each new line in the output on threads preceded with
G4WTN >
06/11/14 I. Hrivnacova
- Finalized modifications in previous tag (01):
- Removed G4UI_USE/G4VIS_USE tests and init.mac macro (not needed)
- Moved G4UIExecutive at the beginning of main() in all examples
- Perform run initialization in macros instead of main()
04/11/14 L. Garnier (exampleB3-V10-00-01)
- Remove old G4UI_USE/G4VIS_USE
- Move G4UIExecutive at the beginning of main()
29/10/13 I. Hrivnacova (exampleB3-V09-06-06)
- Removed SetNumberOfThreads(4) from main (use Geant4 default)
- Updated README
09/09/13 M.Asai (exampleB3-V09-06-05)
- B3PrimaryGeneratorAction.cc : Change G4ParticleTable::GetIon() to
G4IonTable::GetIon(), as the former method becomes obsolete.
13/06/13 mma (exampleB3-V09-06-04)
Fixes for MT:
- Set sensitive detector via SetSensitiveDetector(..)
- Get hits collection IDs in B3Run::RecordEvent (and not B3Run constructor)
- Add a test for primary generator action in B3RunAction::EndOfRunAction()
as it does not exist on master
05/06/13 mma (exampleB3-V09-06-03)
- add section about ACTION INITALIZATION to README and .README
01/06/13 mma (exampleB3-V09-06-02)
- Migration for MT:
forgotten to add B3Run
31/05/13 mma (exampleB3-V09-06-01)
- Migration for MT:
Added B3ActionInitialization, B3Run
Removed B3EventAction
and updated actions classes accordingly.
README files still need to be updated.
28/02/13 I. Hrivnacova
- When building materials with NistManager
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.
21/11/11 I. Hrivnacova
- Improved vis.mac
- Removed alternative detector construction class
14/11/11 I. Hrivnacova
- The first tagged version of the new B3 example
(tagged in basic).
11-11-11 (mma)
- EventAction: printModulo 10000
01-11-11 (mma)
- DetectorConstruction2: - add an offset when replicate dPhi
29-09-11 (mma)
- DetectorConstruction: - replace crystal shape Trd by Box
- add a gap for wrapping
27-06-11 michel maire
- Created.
examples/basic/B3/B3a/exampleB3a.out
+13 -11
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -37,16 +37,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -203,16 +205,16 @@ Checking overlaps for volume Patient ... OK!
G4SDManager::AddNewCollection : the collection <crystal/edep> is registered at 1
New sensitive detector <crystal> is registored at /
New sensitive detector <crystal> is registered at /
G4SDManager::AddNewCollection : the collection <patient/dose> is registered at 2
New sensitive detector <patient> is registored at /
New sensitive detector <patient> is registered at /
#
/run/beamOn 10000
### Run 0 start.
--------------------End of Global Run-----------------------
The run was 10000 events Nb of 'good' e+ annihilations: 1294
Total dose in patient : 291.523 picoGy
The run was 10000 events Nb of 'good' e+ annihilations: 1249
Total dose in patient : 290.467 picoGy
------------------------------------------------------------
Graphics systems deleted.
examples/basic/B3/B3a/src/B3aEventAction.cc
+12 -13
View File
@@ -45,8 +45,8 @@
B3aEventAction::B3aEventAction(B3aRunAction* runAction)
: G4UserEventAction(),
fRunAction(runAction),
fCollID_cryst(0),
fCollID_patient(0)
fCollID_cryst(-1),
fCollID_patient(-1)
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -56,16 +56,8 @@ B3aEventAction::~B3aEventAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void B3aEventAction::BeginOfEventAction(const G4Event* evt )
{
G4int evtNb = evt->GetEventID();
if (evtNb == 0) {
G4SDManager* SDMan = G4SDManager::GetSDMpointer();
fCollID_cryst = SDMan->GetCollectionID("crystal/edep");
fCollID_patient = SDMan->GetCollectionID("patient/dose");
}
}
void B3aEventAction::BeginOfEventAction(const G4Event* /*evt*/)
{ }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -76,6 +68,13 @@ void B3aEventAction::EndOfEventAction(const G4Event* evt )
G4HCofThisEvent* HCE = evt->GetHCofThisEvent();
if(!HCE) return;
// Get hits collections IDs
if (fCollID_cryst < 0) {
G4SDManager* SDMan = G4SDManager::GetSDMpointer();
fCollID_cryst = SDMan->GetCollectionID("crystal/edep");
fCollID_patient = SDMan->GetCollectionID("patient/dose");
}
//Energy in crystals : identify 'good events'
//
const G4double eThreshold = 500*keV;
@@ -103,7 +102,7 @@ void B3aEventAction::EndOfEventAction(const G4Event* evt )
///G4int copyNb = (itr->first);
dose = *(itr->second);
}
if (dose > 0.) fRunAction->SumDose(dose);
if (dose > 0.) fRunAction->SumDose(dose);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/basic/B3/B3b/.README
+186
View File
@@ -0,0 +1,186 @@
//$Id: .README 94957 2016-01-08 13:27:26Z gcosmo $
///\file "B3/.README"
///\brief Example B3 README page
/*! \page ExampleB3 Example B3
This example simulates schematically a Positron Emitted Tomography system.
\section B3_s1 GEOMETRY DEFINITION
The support of gamma detection are scintillating crystals. A small number
of such crystals are optically grouped in a matrix of crystals. In
this example, individual crystals are not described; only the matrix of
crystals is and it is still called 'Crystal' hereafter.
Crystals are circularly arranged to form a ring. Few rings make up the full
detector (gamma camera). This is done by positionning Crystals in
Ring with an appropriate rotation matrix. Several copies of Ring are
then placed in the full detector.
The head of a patient is schematised as a homogeneous cylinder of brain
tissue, placed at the center of full detector.
The Crystal material, Lu2SiO5, is not included in the G4Nist database.
Therefore, it is explicitly built in DefineMaterials().
\section B3_s2 PHYSICS LIST
The physics list contains standard electromagnetic processes and the
radioactiveDecay module for GenericIon. It is defined in the B3PhysicsList
class as a Geant4 modular physics list with registered physics builders
provided in Geant4:
- G4DecayPhysics - defines all particles and their decay processes
- G4RadioactiveDecayPhysics - defines radioactiveDecay for GenericIon
- G4EmStandardPhysics - defines all EM standard processes
This physics list requires data files for:
- low energy electromagnetic processes which path is defined via
the G4LEDATA envirnoment variable
- radioactive decay hadronic processes which path is defined via
the G4RADIOACTIVEDATA envirnoment variable.
See more on installation of the datasets in
<a href="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides
/InstallationGuide/html/ch03s03.html">
Geant4 Installation Guide, Chapter 3.3: Note On Geant4 Datasets </a>.
\section B3_s3 ACTION INITALIZATION
A newly introduced class, B1ActionInitialization, instantiates and registers
to Geant4 kernel all user action classes.
While in sequential mode the action classes are instatiated just once,
via invoking the method:
B3ActionInitialization::Build()
in multi-threading mode the same method is invoked for each thread worker
and so all user action classes are defined thread-local.
A run action class is instantiated both thread-local
and global that's why its instance is created also in the method
B3ActionInitialization::BuildForMaster()
which is invoked only in multi-threading mode.
\section B3_s4 PRIMARY GENERATOR
The default particle beam is an ion (F18), at rest, randomly distributed
within a zone inside a patient and is defined in
B3PrimaryGeneratorAction::GeneratePrimaries().
The type of a primary particle can be changed with G4ParticleGun commands
(see run2.mac).
\section B3_s5 DETECTOR RESPONSE : scorers
A 'good' event is an event in which an identical energy of 511 keV is
deposited in two separate Crystals. A count of the number of such events
corresponds to a measure of the efficiency of the PET system.
The total dose deposited in a patient during a run is also computed.
Scorers are defined in DetectorConstruction::ConstructSDandField(). There are
two G4MultiFunctionalDetector objects: one for the Crystal (EnergyDeposit),
and one for the Patient (DoseDeposit)
B3Run::RecordEvent() collects informations event per event
from the hits collections, and accumulates statistic for
RunAction::EndOfRunAction().
In multi-threading mode the statistics accumulated per workers is merged
to the master in Run::Merge().
\section B3_s6 STACKING ACTION
Beta decay of Fluor generates a neutrino. One wishes not to track this
neutrino; therefore one kills it immediately, before created particles
are put in a stack.
The function B3StackingAction::ClassifyNewTrack() is invoked by G4 kernel
each time a new particle is created.
<hr>
The following paragraphs are common to all basic examples
\section B3_A VISUALISATION
The visualization manager is set via the G4VisExecutive class
in the main () function in exampleB3.cc.
The initialisation of the drawing is done via a set of /vis/ commands
in the macro vis.mac. This macro is automatically read from
the main function when the example is used in interactive running mode.
By default, vis.mac opens an OpenGL viewer (/vis/open OGL).
The user can change the initial viewer by commenting out this line
and instead uncommenting one of the other /vis/open statements, such as
HepRepFile or DAWNFILE (which produce files that can be viewed with the
HepRApp and DAWN viewers, respectively). Note that one can always
open new viewers at any time from the command line. For example, if
you already have a view in, say, an OpenGL window with a name
"viewer-0", then
\verbatim
/vis/open DAWNFILE
\endverbatim
then to get the same view
\verbatim
/vis/viewer/copyView viewer-0
\endverbatim
or to get the same view *plus* scene-modifications
\verbatim
/vis/viewer/set/all viewer-0
\endverbatim
then to see the result
\verbatim
/vis/viewer/flush
\endverbatim
The DAWNFILE, HepRepFile drivers are always available
(since they require no external libraries), but the OGL driver requires
that the Geant4 libraries have been built with the OpenGL option.
For more information on visualization, including information on how to
install and run DAWN, OpenGL and HepRApp, see the visualization tutorials,
for example,\n
- <a href="http://geant4.slac.stanford.edu/Presentations/vis/G4OpenGLTutorial/G4OpenGLTutorial.html">
OpenGL Tutorial </a>
- <a href="http://geant4.slac.stanford.edu/Presentations/vis/G4DAWNTutorial/G4DAWNTutorial.html">
DAWN Tutorial </a>
- <a href="http://geant4.slac.stanford.edu/Presentations/vis/G4HepRAppTutorial/G4HepRAppTutorial.html">
HepRApp Tutorial </a>
The tracks are automatically drawn at the end of each event, accumulated
for all events and erased at the beginning of the next run.
\section B3_B USER INTERFACES
The user command interface is set via the G4UIExecutive class
in the main () function in exampleB3.cc
The selection of the user command interface is then done automatically
according to the Geant4 configuration or it can be done explicitly via
the third argument of the G4UIExecutive constructor (see exampleB4a.cc).
\section B3_C HOW TO RUN
- Execute exampleB3 in the 'interactive mode' with visualization
\verbatim
% exampleB3
and type in the commands from run1.mac line by line:
Idle> /control/verbose 2
Idle> /tracking/verbose 2
Idle> /run/beamOn 1
Idle> ...
Idle> exit
\endverbatim
or
\verbatim
Idle> /control/execute run1.mac
....
Idle> exit
\endverbatim
- Execute exampleB3 in the 'batch' mode from macro files
(without visualization)
\verbatim
% exampleB3 run2.mac
% exampleB3 exampleB3.in > exampleB3.out
\endverbatim
*/
examples/basic/B3/B3b/History
-90
View File
@@ -1,90 +0,0 @@
$Id: History 89902 2015-05-04 09:30:08Z ihrivnac $
--------------------------------------------------
=========================================================
Geant4 - an Object-Oriented Toolkit for Simulation in HEP
=========================================================
Example B3 History file
-----------------------
This file should be used by the G4 example coordinator to briefly
summarize all major modifications introduced in the code and keep
track of all tags.
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
04/05/15 I. Hrivnacova (exampleB3-V10-01-00)
- Coding guidelines: removed empty lines
29/11/14 I. Hrivnacova
- Use G4endl instead of \n in G4cout;
this makes each new line in the output on threads preceded with
G4WTN >
06/11/14 I. Hrivnacova
- Finalized modifications in previous tag (01):
- Removed G4UI_USE/G4VIS_USE tests and init.mac macro (not needed)
- Moved G4UIExecutive at the beginning of main() in all examples
- Perform run initialization in macros instead of main()
04/11/14 L. Garnier (exampleB3-V10-00-01)
- Remove old G4UI_USE/G4VIS_USE
- Move G4UIExecutive at the beginning of main()
29/10/13 I. Hrivnacova (exampleB3-V09-06-06)
- Removed SetNumberOfThreads(4) from main (use Geant4 default)
- Updated README
09/09/13 M.Asai (exampleB3-V09-06-05)
- B3PrimaryGeneratorAction.cc : Change G4ParticleTable::GetIon() to
G4IonTable::GetIon(), as the former method becomes obsolete.
13/06/13 mma (exampleB3-V09-06-04)
Fixes for MT:
- Set sensitive detector via SetSensitiveDetector(..)
- Get hits collection IDs in B3Run::RecordEvent (and not B3Run constructor)
- Add a test for primary generator action in B3RunAction::EndOfRunAction()
as it does not exist on master
05/06/13 mma (exampleB3-V09-06-03)
- add section about ACTION INITALIZATION to README and .README
01/06/13 mma (exampleB3-V09-06-02)
- Migration for MT:
forgotten to add B3Run
31/05/13 mma (exampleB3-V09-06-01)
- Migration for MT:
Added B3ActionInitialization, B3Run
Removed B3EventAction
and updated actions classes accordingly.
README files still need to be updated.
28/02/13 I. Hrivnacova
- When building materials with NistManager
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.
21/11/11 I. Hrivnacova
- Improved vis.mac
- Removed alternative detector construction class
14/11/11 I. Hrivnacova
- The first tagged version of the new B3 example
(tagged in basic).
11-11-11 (mma)
- EventAction: printModulo 10000
01-11-11 (mma)
- DetectorConstruction2: - add an offset when replicate dPhi
29-09-11 (mma)
- DetectorConstruction: - replace crystal shape Trd by Box
- add a gap for wrapping
27-06-11 michel maire
- Created.
examples/basic/B3/B3b/exampleB3b.out
+13 -11
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -37,16 +37,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -203,9 +205,9 @@ Checking overlaps for volume Patient ... OK!
G4SDManager::AddNewCollection : the collection <crystal/edep> is registered at 1
New sensitive detector <crystal> is registored at /
New sensitive detector <crystal> is registered at /
G4SDManager::AddNewCollection : the collection <patient/dose> is registered at 2
New sensitive detector <patient> is registored at /
New sensitive detector <patient> is registered at /
#
/run/beamOn 10000
### Run 0 start.
@@ -213,8 +215,8 @@ New sensitive detector <patient> is registored at /
---> end of event: 0
--------------------End of Global Run-----------------------
The run was 10000 events Nb of 'good' e+ annihilations: 1294
Total dose in patient : 291.523 picoGy
The run was 10000 events Nb of 'good' e+ annihilations: 1249
Total dose in patient : 290.467 picoGy
------------------------------------------------------------
Graphics systems deleted.
examples/basic/B3/History
+9 -1
View File
@@ -1,4 +1,4 @@
$Id: History 94093 2015-11-05 15:16:06Z gcosmo $
$Id: History 97070 2016-05-24 08:49:17Z gcosmo $
--------------------------------------------------
=========================================================
@@ -15,6 +15,14 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
24/05/16 I. Hrivnacova (exampleB3-V10-02-01)
- Fixed compiler warning introduced in the previous update
20/05/16 I. Hrivnacova (exampleB3-V10-02-00)
- Fixed initialization of the hits collections IDs in B3aEventAction
(this fixes the problem report #1862)
- Removed History files from B3a and B3b
05/11/15 I. Hrivnacova (exampleB3-V10-01-01)
- Splitting example in two variants of merging data:
-B3a (new) with the code based on G4Parameter
examples/basic/B3/README
+3 -1
View File
@@ -1,4 +1,4 @@
$Id: README 94093 2015-11-05 15:16:06Z gcosmo $
$Id: README 94957 2016-01-08 13:27:26Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -41,6 +41,8 @@ $Id: README 94093 2015-11-05 15:16:06Z gcosmo $
This physics list requires data files for:
- low energy electromagnetic processes which path is defined via
the G4LEDATA envirnoment variable
- nuclides properties which path is defined via
the G4ENSDFSTATEDATA envirnoment variable
- radioactive decay hadronic processes which path is defined via
the G4RADIOACTIVEDATA envirnoment variable.
examples/basic/B4/.README.txt
+3 -3
View File
@@ -1,4 +1,4 @@
//$Id: .README.txt 94710 2015-12-03 16:15:05Z gunter $
//$Id: .README.txt 94957 2016-01-08 13:27:26Z gcosmo $
///\file "B4/.README.txt"
///\brief Example B4 README page
@@ -66,8 +66,8 @@
See more on installation of the datasets in
<a href="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/InstallationGuide/html/ch03s03.html">
Geant4 Installation Guide, Chapter 3.3: Note On Geant4 Datasets </a>.
The following datasets: G4LEDATA, G4LEVELGAMMADATA and G4SAIDXSDATA are
mandatory for this example.
The following datasets: G4LEDATA, G4LEVELGAMMADATA, G4SAIDXSDATA and
G4ENSDFSTATEDATA are mandatory for this example.
In addition the build-in interactive command:
\verbatim
examples/basic/B4/B4a/exampleB4a.cc
+2 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: exampleB4a.cc 86065 2014-11-07 08:51:15Z gcosmo $
// $Id: exampleB4a.cc 94808 2015-12-10 08:22:26Z gcosmo $
//
/// \file exampleB4a.cc
/// \brief Main program of the B4a example
@@ -91,7 +91,7 @@ int main(int argc,char** argv)
//
G4UIExecutive* ui = 0;
if ( ! macro.size() ) {
ui = new G4UIExecutive(argc, argv);
ui = new G4UIExecutive(argc, argv, session);
}
// Choose the Random engine
examples/basic/B4/B4a/exampleB4a.out
+52 -37
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -40,16 +40,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -101,6 +103,14 @@ Checking overlaps for volume Gap ... OK!
------------------------------------------------------------
---> The calorimeter is 10 layers of: [ 10mm of G4_Pb + 5mm of liquidArgon ]
------------------------------------------------------------
=======================================================================
====== Pre-compound/De-excitation Physics Parameters ========
=======================================================================
Type of pre-compound inverse x-section 3
Type of de-excitation inverse x-section 3
Min excitation energy (keV) 0.1
Level density (1/MeV) 0.1
=======================================================================
### Adding tracking cuts for neutron TimeCut(ns)= 10000 KinEnergyCut(MeV)= 0
phot: for gamma SubType= 12 BuildTable= 0
@@ -218,7 +228,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -232,7 +242,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -341,7 +351,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -374,7 +384,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -500,6 +510,11 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
---------------------------------------------------
Hadronic Processes for He3
Process: hadElastic
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
Cr_sctns: Glauber-Gribov nucleus nucleus: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: He3Inelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 4 GeV/n
Model: FTFP: 2 GeV/n ---> 100 TeV/n
@@ -774,15 +789,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 271.624 MeV total track length: 19.3544 cm
Gap: total energy: 18.0399 MeV total track length: 8.76581 cm
Absorber: total energy: 288.973 MeV total track length: 20.951 cm
Gap: total energy: 7.92508 MeV total track length: 3.60411 cm
----> print histograms statistic for the entire run
EAbs : mean = 271.624 MeV rms = 0 eV
EGap : mean = 18.0399 MeV rms = 0 eV
LAbs : mean = 19.3544 cm rms = 0 fm
LGap : mean = 8.76581 cm rms = 0 fm
EAbs : mean = 288.973 MeV rms = 0 eV
EGap : mean = 7.92508 MeV rms = 0 eV
LAbs : mean = 20.951 cm rms = 0 fm
LGap : mean = 3.60411 cm rms = 0 fm
... write Root file : B4.root - done
Transportation, msc, hIoni, ionIoni
hBrems, hPairProd, CoulombScat, eIoni
@@ -915,7 +930,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -929,7 +944,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -1038,7 +1053,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1071,7 +1086,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1163,15 +1178,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 277.786 MeV total track length: 19.8555 cm
Gap: total energy: 16.3756 MeV total track length: 7.83325 cm
Absorber: total energy: 257.259 MeV total track length: 18.7821 cm
Gap: total energy: 19.9473 MeV total track length: 10.1826 cm
----> print histograms statistic for the entire run
EAbs : mean = 277.786 MeV rms = 0 eV
EGap : mean = 16.3756 MeV rms = 0 eV
LAbs : mean = 19.8555 cm rms = 0 fm
LGap : mean = 7.83325 cm rms = 0 fm
EAbs : mean = 257.259 MeV rms = 0 eV
EGap : mean = 19.9473 MeV rms = 0 eV
LAbs : mean = 18.7821 cm rms = 0 fm
LGap : mean = 10.1826 cm rms = 0 fm
... write Root file : B4.root - done
phot: for gamma SubType= 12 BuildTable= 0
@@ -1289,7 +1304,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -1303,7 +1318,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -1412,7 +1427,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1445,7 +1460,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1537,15 +1552,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 418.811 MeV total track length: 30.1035 cm
Gap: total energy: 16.2571 MeV total track length: 8.25361 cm
Absorber: total energy: 457.539 MeV total track length: 32.8939 cm
Gap: total energy: 22.9868 MeV total track length: 11.5387 cm
----> print histograms statistic for the entire run
EAbs : mean = 418.811 MeV rms = 0 eV
EGap : mean = 16.2571 MeV rms = 0 eV
LAbs : mean = 30.1035 cm rms = 0 fm
LGap : mean = 8.25361 cm rms = 0 fm
EAbs : mean = 457.539 MeV rms = 0 eV
EGap : mean = 22.9868 MeV rms = 0 eV
LAbs : mean = 32.8939 cm rms = 0 fm
LGap : mean = 11.5387 cm rms = 0 fm
... write Root file : B4.root - done
Graphics systems deleted.
Visualization Manager deleting...
examples/basic/B4/B4a/include/B4PrimaryGeneratorAction.hh
+1 -3
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: B4PrimaryGeneratorAction.hh 68058 2013-03-13 14:47:43Z gcosmo $
// $Id: B4PrimaryGeneratorAction.hh 94808 2015-12-10 08:22:26Z gcosmo $
//
/// \file B4PrimaryGeneratorAction.hh
/// \brief Definition of the B4PrimaryGeneratorAction class
@@ -62,5 +62,3 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/basic/B4/B4b/exampleB4b.cc
+2 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: exampleB4b.cc 86065 2014-11-07 08:51:15Z gcosmo $
// $Id: exampleB4b.cc 94808 2015-12-10 08:22:26Z gcosmo $
//
/// \file exampleB4b.cc
/// \brief Main program of the B4b example
@@ -91,7 +91,7 @@ int main(int argc,char** argv)
//
G4UIExecutive* ui = 0;
if ( ! macro.size() ) {
ui = new G4UIExecutive(argc, argv);
ui = new G4UIExecutive(argc, argv, session);
}
// Choose the Random engine
examples/basic/B4/B4b/exampleB4b.out
+52 -37
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -40,16 +40,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -101,6 +103,14 @@ Checking overlaps for volume Gap ... OK!
------------------------------------------------------------
---> The calorimeter is 10 layers of: [ 10mm of G4_Pb + 5mm of liquidArgon ]
------------------------------------------------------------
=======================================================================
====== Pre-compound/De-excitation Physics Parameters ========
=======================================================================
Type of pre-compound inverse x-section 3
Type of de-excitation inverse x-section 3
Min excitation energy (keV) 0.1
Level density (1/MeV) 0.1
=======================================================================
### Adding tracking cuts for neutron TimeCut(ns)= 10000 KinEnergyCut(MeV)= 0
phot: for gamma SubType= 12 BuildTable= 0
@@ -218,7 +228,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -232,7 +242,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -341,7 +351,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -374,7 +384,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -500,6 +510,11 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
---------------------------------------------------
Hadronic Processes for He3
Process: hadElastic
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
Cr_sctns: Glauber-Gribov nucleus nucleus: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: He3Inelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 4 GeV/n
Model: FTFP: 2 GeV/n ---> 100 TeV/n
@@ -775,15 +790,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 271.624 MeV total track length: 19.3544 cm
Gap: total energy: 18.0399 MeV total track length: 8.76581 cm
Absorber: total energy: 288.973 MeV total track length: 20.951 cm
Gap: total energy: 7.92508 MeV total track length: 3.60411 cm
----> print histograms statistic for the entire run
EAbs : mean = 271.624 MeV rms = 0 eV
EGap : mean = 18.0399 MeV rms = 0 eV
LAbs : mean = 19.3544 cm rms = 0 fm
LGap : mean = 8.76581 cm rms = 0 fm
EAbs : mean = 288.973 MeV rms = 0 eV
EGap : mean = 7.92508 MeV rms = 0 eV
LAbs : mean = 20.951 cm rms = 0 fm
LGap : mean = 3.60411 cm rms = 0 fm
... write Root file : B4.root - done
Transportation, msc, hIoni, ionIoni
hBrems, hPairProd, CoulombScat, eIoni
@@ -916,7 +931,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -930,7 +945,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -1039,7 +1054,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1072,7 +1087,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1165,15 +1180,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 277.786 MeV total track length: 19.8555 cm
Gap: total energy: 16.3756 MeV total track length: 7.83325 cm
Absorber: total energy: 257.259 MeV total track length: 18.7821 cm
Gap: total energy: 19.9473 MeV total track length: 10.1826 cm
----> print histograms statistic for the entire run
EAbs : mean = 277.786 MeV rms = 0 eV
EGap : mean = 16.3756 MeV rms = 0 eV
LAbs : mean = 19.8555 cm rms = 0 fm
LGap : mean = 7.83325 cm rms = 0 fm
EAbs : mean = 257.259 MeV rms = 0 eV
EGap : mean = 19.9473 MeV rms = 0 eV
LAbs : mean = 18.7821 cm rms = 0 fm
LGap : mean = 10.1826 cm rms = 0 fm
... write Root file : B4.root - done
phot: for gamma SubType= 12 BuildTable= 0
@@ -1291,7 +1306,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -1305,7 +1320,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -1414,7 +1429,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1447,7 +1462,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1540,15 +1555,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 418.811 MeV total track length: 30.1035 cm
Gap: total energy: 16.2571 MeV total track length: 8.25361 cm
Absorber: total energy: 457.539 MeV total track length: 32.8939 cm
Gap: total energy: 22.9868 MeV total track length: 11.5387 cm
----> print histograms statistic for the entire run
EAbs : mean = 418.811 MeV rms = 0 eV
EGap : mean = 16.2571 MeV rms = 0 eV
LAbs : mean = 30.1035 cm rms = 0 fm
LGap : mean = 8.25361 cm rms = 0 fm
EAbs : mean = 457.539 MeV rms = 0 eV
EGap : mean = 22.9868 MeV rms = 0 eV
LAbs : mean = 32.8939 cm rms = 0 fm
LGap : mean = 11.5387 cm rms = 0 fm
... write Root file : B4.root - done
Graphics systems deleted.
Visualization Manager deleting...
examples/basic/B4/B4b/include/B4PrimaryGeneratorAction.hh
+1 -3
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: B4PrimaryGeneratorAction.hh 68058 2013-03-13 14:47:43Z gcosmo $
// $Id: B4PrimaryGeneratorAction.hh 94808 2015-12-10 08:22:26Z gcosmo $
//
/// \file B4PrimaryGeneratorAction.hh
/// \brief Definition of the B4PrimaryGeneratorAction class
@@ -62,5 +62,3 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/basic/B4/B4c/exampleB4c.cc
+2 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: exampleB4c.cc 86065 2014-11-07 08:51:15Z gcosmo $
// $Id: exampleB4c.cc 94808 2015-12-10 08:22:26Z gcosmo $
//
/// \file exampleB4c.cc
/// \brief Main program of the B4c example
@@ -91,7 +91,7 @@ int main(int argc,char** argv)
//
G4UIExecutive* ui = 0;
if ( ! macro.size() ) {
ui = new G4UIExecutive(argc, argv);
ui = new G4UIExecutive(argc, argv, session);
}
// Choose the Random engine
examples/basic/B4/B4c/exampleB4c.out
+52 -37
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-02-ref-00 (4-December-2015)
Geant4 version Name: geant4-10-03-beta-01 (30-June-2016)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -40,16 +40,18 @@ Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByCharge
drawByParticleID
drawByOriginVolume
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByTouchedVolume
Registered filter factories:
chargeFilter
particleFilter
originVolumeFilter
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
touchedVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
@@ -101,6 +103,14 @@ Checking overlaps for volume Gap ... OK!
------------------------------------------------------------
---> The calorimeter is 10 layers of: [ 10mm of G4_Pb + 5mm of liquidArgon ]
------------------------------------------------------------
=======================================================================
====== Pre-compound/De-excitation Physics Parameters ========
=======================================================================
Type of pre-compound inverse x-section 3
Type of de-excitation inverse x-section 3
Min excitation energy (keV) 0.1
Level density (1/MeV) 0.1
=======================================================================
### Adding tracking cuts for neutron TimeCut(ns)= 10000 KinEnergyCut(MeV)= 0
phot: for gamma SubType= 12 BuildTable= 0
@@ -218,7 +228,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -232,7 +242,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -341,7 +351,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -374,7 +384,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -500,6 +510,11 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
---------------------------------------------------
Hadronic Processes for He3
Process: hadElastic
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
Cr_sctns: Glauber-Gribov nucleus nucleus: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: He3Inelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 4 GeV/n
Model: FTFP: 2 GeV/n ---> 100 TeV/n
@@ -774,15 +789,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 271.624 MeV total track length: 19.3544 cm
Gap: total energy: 18.0399 MeV total track length: 8.76581 cm
Absorber: total energy: 288.973 MeV total track length: 20.951 cm
Gap: total energy: 7.92508 MeV total track length: 3.60411 cm
----> print histograms statistic for the entire run
EAbs : mean = 271.624 MeV rms = 0 eV
EGap : mean = 18.0399 MeV rms = 0 eV
LAbs : mean = 19.3544 cm rms = 0 fm
LGap : mean = 8.76581 cm rms = 0 fm
EAbs : mean = 288.973 MeV rms = 0 eV
EGap : mean = 7.92508 MeV rms = 0 eV
LAbs : mean = 20.951 cm rms = 0 fm
LGap : mean = 3.60411 cm rms = 0 fm
... write Root file : B4.root - done
Transportation, msc, hIoni, ionIoni
hBrems, hPairProd, CoulombScat, eIoni
@@ -915,7 +930,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -929,7 +944,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -1038,7 +1053,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1071,7 +1086,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1163,15 +1178,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 277.786 MeV total track length: 19.8555 cm
Gap: total energy: 16.3756 MeV total track length: 7.83325 cm
Absorber: total energy: 257.259 MeV total track length: 18.7821 cm
Gap: total energy: 19.9473 MeV total track length: 10.1826 cm
----> print histograms statistic for the entire run
EAbs : mean = 277.786 MeV rms = 0 eV
EGap : mean = 16.3756 MeV rms = 0 eV
LAbs : mean = 19.8555 cm rms = 0 fm
LGap : mean = 7.83325 cm rms = 0 fm
EAbs : mean = 257.259 MeV rms = 0 eV
EGap : mean = 19.9473 MeV rms = 0 eV
LAbs : mean = 18.7821 cm rms = 0 fm
LGap : mean = 10.1826 cm rms = 0 fm
... write Root file : B4.root - done
phot: for gamma SubType= 12 BuildTable= 0
@@ -1289,7 +1304,7 @@ msc: for GenericIon SubType= 10
ionIoni: for GenericIon SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
Stopping Power data for 17 ion/material pairs
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 2 MeV
@@ -1303,7 +1318,7 @@ msc: for alpha SubType= 10
ionIoni: for alpha SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 0.01, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.02
===== EM models for the G4Region DefaultRegionForTheWorld ======
BraggIon : Emin= 0 eV Emax= 7.9452 MeV
BetheBloch : Emin= 7.9452 MeV Emax= 10 TeV
@@ -1412,7 +1427,7 @@ msc: for mu+ SubType= 10
muIoni: for mu+ SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
Bragg : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1445,7 +1460,7 @@ msc: for mu- SubType= 10
muIoni: for mu- SubType= 2
dE/dx and range tables from 100 eV to 10 TeV in 77 bins
Lambda tables from threshold to 10 TeV, 7 bins per decade, spline: 1
finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
finalRange(mm)= 0.1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
===== EM models for the G4Region DefaultRegionForTheWorld ======
ICRU73QO : Emin= 0 eV Emax= 200 keV
BetheBloch : Emin= 200 keV Emax= 1 GeV
@@ -1537,15 +1552,15 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
... open Root analysis file : B4.root - done
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 418.811 MeV total track length: 30.1035 cm
Gap: total energy: 16.2571 MeV total track length: 8.25361 cm
Absorber: total energy: 457.539 MeV total track length: 32.8939 cm
Gap: total energy: 22.9868 MeV total track length: 11.5387 cm
----> print histograms statistic for the entire run
EAbs : mean = 418.811 MeV rms = 0 eV
EGap : mean = 16.2571 MeV rms = 0 eV
LAbs : mean = 30.1035 cm rms = 0 fm
LGap : mean = 8.25361 cm rms = 0 fm
EAbs : mean = 457.539 MeV rms = 0 eV
EGap : mean = 22.9868 MeV rms = 0 eV
LAbs : mean = 32.8939 cm rms = 0 fm
LGap : mean = 11.5387 cm rms = 0 fm
... write Root file : B4.root - done
Graphics systems deleted.
Visualization Manager deleting...
examples/basic/B4/B4c/include/B4PrimaryGeneratorAction.hh
+1 -3
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: B4PrimaryGeneratorAction.hh 68058 2013-03-13 14:47:43Z gcosmo $
// $Id: B4PrimaryGeneratorAction.hh 94808 2015-12-10 08:22:26Z gcosmo $
//
/// \file B4PrimaryGeneratorAction.hh
/// \brief Definition of the B4PrimaryGeneratorAction class
@@ -62,5 +62,3 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/basic/B4/B4d/exampleB4d.cc
+2 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: exampleB4d.cc 86065 2014-11-07 08:51:15Z gcosmo $
// $Id: exampleB4d.cc 94808 2015-12-10 08:22:26Z gcosmo $
//
/// \file exampleB4d.cc
/// \brief Main program of the B4d example
@@ -92,7 +92,7 @@ int main(int argc,char** argv)
//
G4UIExecutive* ui = 0;
if ( ! macro.size() ) {
ui = new G4UIExecutive(argc, argv);
ui = new G4UIExecutive(argc, argv, session);
}
// Choose the Random engine

Some files were not shown because too many files have changed in this diff Show More