Import Geant4 5.0.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-08 16:57:27 +02:00
parent 330b82b769
commit 37fff30d2e
5733 changed files with 263867 additions and 74574 deletions
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.7 2002/06/05 12:13:03 maire Exp $
# $Id: GNUmakefile,v 1.8 2002/12/12 11:19:32 maire Exp $
# --------------------------------------------------------------
# GNUmakefile for examples module. Gabriele Cosmo, 06/04/98.
# --------------------------------------------------------------
@@ -21,8 +21,8 @@ ifdef G4NOHIST
CPPFLAGS += -DG4NOHIST
else
# for the aida-config command see the README file
CPPFLAGS += `aida-config --useHBook --include`
LDFLAGS += `aida-config --useHBook --lib`
CPPFLAGS += `aida-config --include`
LDFLAGS += `aida-config --lib`
endif
include $(G4INSTALL)/config/binmake.gmk
@@ -1,4 +1,4 @@
$Id: History,v 1.18 2002/06/05 12:13:03 maire Exp $
$Id: History,v 1.20 2002/12/12 11:19:32 maire Exp $
-------------------------------------------------------------------
=========================================================
@@ -15,8 +15,15 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
05-12-02 mma (testem3-V04-01-01)
- migration to aida 3.0
- UI directory /testem/
05-12-02 cosmo (testem3-V04-01-00)
- Fixes to runAction for porting on gcc-3.2 compiler.
03-06-02 mma (testem3-V04-00-01)
-old histograming package clhep/hist replaced by AIDA 2.2/anaphe
- old histograming package clhep/hist replaced by AIDA 2.2/anaphe
14-02-02 mma (testem3-V04-00-00)
- macros for em_exercices
@@ -1,4 +1,4 @@
$Id: README,v 1.7 2002/06/05 12:13:04 maire Exp $
$Id: README,v 1.8 2002/12/12 11:19:32 maire Exp $
-------------------------------------------------------------------
=========================================================
@@ -128,21 +128,18 @@ $Id: README,v 1.7 2002/06/05 12:13:04 maire Exp $
Note that histograms are disabled via the flag G4NOHIST in the GNUmakefile.
8- Using the Anaphe implementation of the AIDA 2.2 histograms:
8- Using the Anaphe implementation of the AIDA 3.0 histograms:
--------------------------------------------------------------
In order to use the Anaphe implementation of the AIDA 2.2 interfaces,
prepare some environment variables by source-ing one of the following
startup scripts (depending on your compiler version):
In order to use the Anaphe implementation of the AIDA 3.0 interfaces,
the 'aida-config' command (which is used in the GNUmakefile) is
available at:
/afs/cern.ch/sw/lhcxx/share/LHCXX/latest/scripts/aida-config
# gcc-2.95.2
source $LHCXXTOP/share/LHCXX/4.0.1/install/sharedstart.sh or .csh
In order to run the executable, you need to source the following
script (once):
$HOME/bin/setupAnaphe.csh (or $HOME/bin/setupAnaphe)
# egcs_1.1.2 (aka gcc 2.91.66)
source $LHCXXTOP/share/LHCXX/4.0.1-sec/install/sharedstart.sh or .csh
At CERN, $LHCXXTOP is /afs/cern.ch/sw/lhcxx, you may want to use a
more recent release, check http:/cern.ch/anaphe for more information.
After this, you will have access to the 'aida-config' command which
is used in the GNUmakefile.
At cern 'setupAnaphe' is available at:
/afs/cern.ch/sw/lhcxx/share/LHCXX/latest/scripts/setupAnaphe.csh
(or /afs/cern.ch/sw/lhcxx/share/LHCXX/latest/scripts/setupAnaphe)
@@ -22,7 +22,7 @@
//
//
// $Id: TestEm3.cc,v 1.7 2001/10/22 10:58:40 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -1,4 +1,4 @@
# $Id: TestEm3.in,v 1.4 2001/11/28 17:54:46 maire Exp $
# $Id: TestEm3.in,v 1.5 2002/12/12 11:19:32 maire Exp $
#
# Macro file for "exampleN03.cc"
# (can be run in batch, without graphic)
@@ -10,7 +10,7 @@
/run/initialize
#
/run/verbose 2
/event/printModulo 50
/testem/event/printModulo 50
#
/gun/particle e-
/gun/energy 1 GeV
@@ -1,6 +1,6 @@
**********************************************
Geant4 version $Name: geant4-04-01 $
(28-Feb-2002)
Geant4 version $Name: geant4-05-00 $
(13-Dec-2002)
Copyright : Geant4 Collaboration
**********************************************
Visualization Manager instantiating...
@@ -13,13 +13,14 @@ Current available graphics systems are:
DAWNFILE (DAWNFILE)
GAGTree (GAGTree)
G4HepRepFile (HepRepFile)
G4HepRep (HepRepXML)
RayTracer (RayTracer)
VRML1FILE (VRML1FILE)
VRML2FILE (VRML2FILE)
#
/run/initialize
***** Table : Nb of materials = 20 *****
***** Table : Nb of materials = 21 *****
Material: liquidH2 density: 70.800 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 8.905 m
---> Element: liquidH2 Z = 1.0 N = 1.0 A = 1.01 g/mole fractionMass: 100.00 % Abundance 100.00 %
@@ -73,6 +74,10 @@ Current available graphics systems are:
---> Element: Nitrogen N Z = 7.0 N = 14.0 A = 14.01 g/mole fractionMass: 70.00 % Abundance 72.71 %
---> Element: Oxygen O Z = 8.0 N = 16.0 A = 16.00 g/mole fractionMass: 30.00 % Abundance 27.29 %
Material: Air20 density: 1.205 mg/cm3 temperature: 293.00 K pressure: 1.00 atm RadLength: 305.277 m
---> Element: Nitrogen N Z = 7.0 N = 14.0 A = 14.01 g/mole fractionMass: 70.00 % Abundance 72.71 %
---> Element: Oxygen O Z = 8.0 N = 16.0 A = 16.00 g/mole fractionMass: 30.00 % Abundance 27.29 %
Material: Aerogel density: 200.000 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 1.493 m
---> Element: Silicon Si Z = 14.0 N = 28.1 A = 28.09 g/mole fractionMass: 29.22 % Abundance 11.12 %
---> Element: Oxygen O Z = 8.0 N = 16.0 A = 16.00 g/mole fractionMass: 66.50 % Abundance 44.42 %
@@ -177,6 +182,7 @@ Cut in range
quartz 500 mum 500 mum
NemaG10 500 mum 500 mum
Air 500 mum 500 mum
Air20 500 mum 500 mum
Aerogel 500 mum 500 mum
CarbonicGas 500 mum 500 mum
WaterSteam 500 mum 500 mum
@@ -198,6 +204,7 @@ Cut in energy
quartz 4.01 keV 330 keV
NemaG10 3.07 keV 292 keV
Air 990 eV 990 eV
Air20 990 eV 990 eV
Aerogel 1.27 keV 79.2 keV
CarbonicGas 990 eV 8.52 keV
WaterSteam 990 eV 990 eV
@@ -206,7 +213,7 @@ Cut in energy
===================================================
#
/run/verbose 2
/event/printModulo 50
/testem/event/printModulo 50
#
/gun/particle e-
/gun/energy 1 GeV
@@ -221,19 +228,19 @@ Start closing geometry.
G4GeometryManager::ReportVoxelStats -- Voxel Statistics
Total memory consumed for geometry optimisation: 1 kByte
Total CPU time elapsed for geometry optimisation: 0 seconds
Total CPU time elapsed for geometry optimisation: 0.01 seconds
Voxelisation: top CPU users:
Percent Total CPU System CPU Memory Volume
------- ---------- ---------- -------- ----------
100.00 0.01 0.01 0k Layer
0.00 0.00 0.00 2k Calorimeter
0.00 0.00 0.00 0k Layer
Voxelisation: top memory users:
Percent Memory Heads Nodes Pointers Total CPU Volume
------- -------- ------ ------ -------- ---------- ----------
91.70 1k 1 50 50 0.00 Calorimeter
8.30 0k 1 3 4 0.00 Layer
8.30 0k 1 3 4 0.01 Layer
Start Run processing.
---> Begin Of Event: 0
@@ -242,19 +249,19 @@ Start Run processing.
Run terminated.
Run Summary
Number of events processed : 100
User=43.96s Real=73.89s Sys=8.8s
User=42.38s Real=52.44s Sys=8.28s
-------------------------------------------------------------
total energy dep total tracklen
Absorber0 ( Lead) : 812.93 MeV +- 14.83 MeV 57.12 cm +- 1.15 cm
Absorber1 ( liquidArgon) : 176.46 MeV +- 13.64 MeV 88.10 cm +- 7.16 cm
Absorber0 ( Lead) : 815.39 MeV +- 16.99 MeV 57.36 cm +- 1.32 cm
Absorber1 ( liquidArgon) : 172.19 MeV +- 14.85 MeV 85.98 cm +- 7.64 cm
-------------------------------------------------------------
--------- Ranecu engine status ---------
Initial seed (index) = 0
Current couple of seeds = 1367155280, 999623368
Current couple of seeds = 666545083, 1319593894
----------------------------------------
Graphics systems deleted.
Visualization Manager deleting...
@@ -1,4 +1,4 @@
# $Id: exo3q1.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo3q1.mac,v 1.2 2002/12/12 11:19:32 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -9,14 +9,14 @@
/run/particle/setCut 2 cm
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Aluminium 10 cm
/calor/setSizeYZ 10 cm
/calor/setField 5 tesla
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Aluminium 10 cm
/testem/det/setSizeYZ 10 cm
/testem/det/setField 5 tesla
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -27,7 +27,7 @@
/process/inactivate phot
/process/inactivate annihil
#
/tracking/stepMax 1 mm
/testem/tracking/stepMax 1 mm
#
/gun/particle gamma
/gun/energy 200 MeV
@@ -1,4 +1,4 @@
# $Id: exo3q2.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo3q2.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -8,14 +8,14 @@
#
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Aluminium 10 cm
/calor/setSizeYZ 10 cm
/calor/setField 5 tesla
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Aluminium 10 cm
/testem/det/setSizeYZ 10 cm
/testem/det/setField 5 tesla
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -26,7 +26,7 @@
/process/inactivate compt
/process/inactivate phot
#
/tracking/stepMax 1 cm
/testem/tracking/stepMax 1 cm
#
/gun/particle e-
/gun/energy 200 MeV
@@ -1,4 +1,4 @@
# $Id: exo3q3.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo3q3.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -8,14 +8,14 @@
#
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Aluminium 10 cm
/calor/setSizeYZ 10 cm
/calor/setField 5 tesla
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Aluminium 10 cm
/testem/det/setSizeYZ 10 cm
/testem/det/setField 5 tesla
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -27,16 +27,16 @@
/run/particle/setCut 50 cm
/run/initialize
#
/tracking/stepMax 1 mm
/testem/tracking/stepMax 1 mm
#
/gun/particle gamma
/gun/energy 200 MeV
#
#/run/beamOn 1
#
#/calor/setAbsor 0 Aluminium 20 cm
#/calor/setSizeYZ 20 cm
#/calor/update
#/testem/det/setAbsor 0 Aluminium 20 cm
#/testem/det/setSizeYZ 20 cm
#/testem/det/update
#
#/gun/position -12 0 0 cm
#
@@ -1,4 +1,4 @@
# $Id: exo4q1.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo4q1.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -9,13 +9,13 @@
/run/particle/setCut 2 cm
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Water 10 cm
/calor/setSizeYZ 10 cm
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Water 10 cm
/testem/det/setSizeYZ 10 cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -23,7 +23,7 @@
/process/inactivate msc
/process/inactivate eBrem
#
/gun/rndm 0.9
/testem/gun/rndm 0.9
#
/gun/particle e-
/gun/energy 16 MeV
@@ -1,4 +1,4 @@
# $Id: exo4q3.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo4q3.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -9,13 +9,13 @@
/run/particle/setCut 10 mum
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Aluminium 1 cm
/calor/setSizeYZ 1 cm
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Aluminium 1 cm
/testem/det/setSizeYZ 1 cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -1,4 +1,4 @@
# $Id: exo5q1.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo5q1.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -9,13 +9,13 @@
/run/particle/setCut 5 cm
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Aluminium 10 cm
/calor/setSizeYZ 10 cm
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Aluminium 10 cm
/testem/det/setSizeYZ 10 cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -1,4 +1,4 @@
# $Id: exo5q2.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo5q2.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -9,17 +9,17 @@
/run/particle/setCut 5 cm
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Tungsten 50 mum
/calor/setSizeYZ 70 mum
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Tungsten 50 mum
/testem/det/setSizeYZ 70 mum
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
/gun/particle e-
/gun/energy 600 keV
#
/tracking/stepMax 1 mum
/testem/tracking/stepMax 1 mum
@@ -1,4 +1,4 @@
# $Id: exo6q1.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo6q1.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -9,14 +9,14 @@
/run/particle/setCut 7 cm
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Iron 10 m
/calor/setSizeYZ 10 m
/calor/setField 5 tesla
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Iron 10 m
/testem/det/setSizeYZ 10 m
/testem/det/setField 5 tesla
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -1,4 +1,4 @@
# $Id: exo6q2.mac,v 1.1 2002/02/14 14:20:45 maire Exp $
# $Id: exo6q2.mac,v 1.2 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
#
@@ -9,13 +9,13 @@
/run/particle/setCut 10 cm
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 1
/calor/setAbsor 0 Iron 10 m
/calor/setSizeYZ 10 m
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Iron 10 m
/testem/det/setSizeYZ 10 m
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/control/execute vis.mac
#
@@ -22,7 +22,7 @@
//
//
// $Id: Em3CalorHit.hh,v 1.4 2001/10/22 10:58:46 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3CalorimeterSD.hh,v 1.4 2001/10/22 10:58:47 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3DetectorConstruction.hh,v 1.5 2001/10/22 10:58:47 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3DetectorMessenger.hh,v 1.5 2001/10/22 10:58:48 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3DetectorMessenger.hh,v 1.6 2002/12/12 11:19:37 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -55,7 +55,7 @@ class Em3DetectorMessenger: public G4UImessenger
private:
Em3DetectorConstruction* Em3Detector;
G4UIdirectory* Em3detDir;
G4UIdirectory* testemDir;
G4UIcmdWithADoubleAndUnit* SizeYZCmd;
G4UIcmdWithAnInteger* NbLayersCmd;
@@ -22,7 +22,7 @@
//
//
// $Id: Em3EventAction.hh,v 1.5 2001/10/22 10:58:48 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3EventActionMessenger.hh,v 1.4 2001/10/22 10:58:48 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3PhysicsList.hh,v 1.6 2002/02/14 14:20:46 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3PhysicsListMessenger.hh,v 1.3 2001/10/22 10:58:49 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3PrimaryGeneratorAction.hh,v 1.6 2001/10/22 10:58:50 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3PrimaryGeneratorMessenger.hh,v 1.5 2001/10/22 10:58:50 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3RunAction.hh,v 1.10 2002/06/05 12:13:04 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3RunAction.hh,v 1.11 2002/12/12 11:19:37 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -43,9 +43,11 @@ class G4Run;
class Em3RunActionMessenger;
#ifndef G4NOHIST
namespace AIDA {
class ITree;
class IHistogramFactory;
class IHistogram1D;
}
#endif
class Em3RunAction : public G4UserRunAction
@@ -61,7 +63,7 @@ class Em3RunAction : public G4UserRunAction
void fillPerEvent(G4int,G4double,G4double);
#ifndef G4NOHIST
IHistogram1D* GetHisto(G4int id) {return histo[id];}
AIDA::IHistogram1D* GetHisto(G4int id) {return histo[id];}
#endif
void SetHisto (G4int id, G4int nbins, G4double vmin, G4double vmax);
@@ -80,9 +82,9 @@ class Em3RunAction : public G4UserRunAction
Em3RunActionMessenger* runMessenger;
#ifndef G4NOHIST
ITree* tree;
IHistogramFactory* hf;
IHistogram1D* histo[MaxAbsor];
AIDA::ITree* tree;
AIDA::IHistogramFactory* hf;
AIDA::IHistogram1D* histo[MaxAbsor];
#endif
};
@@ -22,7 +22,7 @@
//
//
// $Id: Em3RunActionMessenger.hh,v 1.7 2001/11/28 17:54:46 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3SteppingAction.hh,v 1.5 2001/10/22 10:58:51 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3SteppingVerbose.hh,v 1.7 2001/10/22 10:58:52 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// This class manages the verbose outputs in G4SteppingManager.
// It inherits from G4SteppingVerbose.
@@ -22,7 +22,7 @@
//
//
// $Id: Em3VisManager.hh,v 1.4 2001/10/22 10:58:53 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -1,4 +1,4 @@
# $Id: run02.mac,v 1.4 2001/11/05 15:28:39 maire Exp $
# $Id: run02.mac,v 1.5 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -10,16 +10,16 @@
/run/particle/setCut 100 mum
/run/initialize
#
/calor/setNbOfLayers 50
/calor/setNbOfAbsor 2
/calor/setAbsor 0 Tungsten 2 mm
/calor/setAbsor 1 Silicium 0.3 mm
/calor/update
/testem/det/setNbOfLayers 50
/testem/det/setNbOfAbsor 2
/testem/det/setAbsor 0 Tungsten 2 mm
/testem/det/setAbsor 1 Silicium 0.3 mm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/printModulo 100
/testem/event/printModulo 100
#
/gun/particle e-
/gun/energy 1 GeV
@@ -1,4 +1,4 @@
# $Id: run03.mac,v 1.4 2001/11/05 15:28:39 maire Exp $
# $Id: run03.mac,v 1.5 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -13,17 +13,17 @@
/run/particle/setCut 1 mm
/run/initialize
#
/calor/setNbOfLayers 15
/calor/setNbOfAbsor 2
/calor/setAbsor 0 Iron 23.08 mm
/calor/setAbsor 1 Silicium 0.4 mm
/calor/setSizeYZ 40. cm
/calor/update
/testem/det/setNbOfLayers 15
/testem/det/setNbOfAbsor 2
/testem/det/setAbsor 0 Iron 23.08 mm
/testem/det/setAbsor 1 Silicium 0.4 mm
/testem/det/setSizeYZ 40. cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/printModulo 10
/testem/event/printModulo 10
#
/gun/particle e-
/gun/energy 6 GeV
@@ -1,4 +1,4 @@
# $Id: run04.mac,v 1.4 2001/11/05 15:28:39 maire Exp $
# $Id: run04.mac,v 1.5 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -13,18 +13,18 @@
/run/particle/setCut 1 mm
/run/initialize
#
/calor/setNbOfLayers 15
/calor/setNbOfAbsor 3
/calor/setAbsor 0 Lead 13.00 mm
/calor/setAbsor 1 Iron 10.08 mm
/calor/setAbsor 2 Silicium 0.4 mm
/calor/setSizeYZ 40. cm
/calor/update
/testem/det/setNbOfLayers 15
/testem/det/setNbOfAbsor 3
/testem/det/setAbsor 0 Lead 13.00 mm
/testem/det/setAbsor 1 Iron 10.08 mm
/testem/det/setAbsor 2 Silicium 0.4 mm
/testem/det/setSizeYZ 40. cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/printModulo 10
/testem/event/printModulo 10
#
/gun/particle e-
/gun/energy 6 GeV
@@ -1,4 +1,4 @@
# $Id: run05.mac,v 1.4 2001/11/05 15:28:39 maire Exp $
# $Id: run05.mac,v 1.5 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -12,19 +12,19 @@
/run/particle/setCut 1 mm
/run/initialize
#
/calor/setNbOfLayers 10
/calor/setNbOfAbsor 4
/calor/setAbsor 0 Lead 19.0 mm
/calor/setAbsor 1 NemaG10 0.2 mm
/calor/setAbsor 2 Silicium 0.4 mm
/calor/setAbsor 3 NemaG10 1.0 mm
/calor/setSizeYZ 16. cm
/calor/update
/testem/det/setNbOfLayers 10
/testem/det/setNbOfAbsor 4
/testem/det/setAbsor 0 Lead 19.0 mm
/testem/det/setAbsor 1 NemaG10 0.2 mm
/testem/det/setAbsor 2 Silicium 0.4 mm
/testem/det/setAbsor 3 NemaG10 1.0 mm
/testem/det/setSizeYZ 16. cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/printModulo 10
/testem/event/printModulo 10
#
/gun/particle e-
/gun/energy 6 GeV
@@ -1,4 +1,4 @@
# $Id: run06.mac,v 1.4 2001/11/05 15:28:39 maire Exp $
# $Id: run06.mac,v 1.5 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -12,20 +12,20 @@
/run/particle/setCut 1 mm
/run/initialize
#
/calor/setNbOfLayers 10
/calor/setNbOfAbsor 4
/calor/setAbsor 0 Iron 35.7 mm
/calor/setAbsor 1 NemaG10 0.2 mm
/calor/setAbsor 2 Silicium 0.4 mm
/calor/setAbsor 3 NemaG10 1.0 mm
/calor/setSizeYZ 16. cm
/calor/update
/testem/det/setNbOfLayers 10
/testem/det/setNbOfAbsor 4
/testem/det/setAbsor 0 Iron 35.7 mm
/testem/det/setAbsor 1 NemaG10 0.2 mm
/testem/det/setAbsor 2 Silicium 0.4 mm
/testem/det/setAbsor 3 NemaG10 1.0 mm
/testem/det/setSizeYZ 16. cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/drawTracks none
/event/printModulo 10
/testem/event/drawTracks none
/testem/event/printModulo 10
#
/gun/particle e-
/gun/energy 6 GeV
@@ -1,4 +1,4 @@
# $Id: run07.mac,v 1.5 2002/02/14 14:20:45 maire Exp $
# $Id: run07.mac,v 1.6 2002/12/12 11:19:33 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -10,19 +10,19 @@
/run/particle/setCut 1.5 mm
/run/initialize
#
/calor/setNbOfLayers 2
/calor/setNbOfAbsor 2
/calor/setAbsor 0 liquidArgon 4 mm
/calor/setAbsor 1 Lead 4 mm
/calor/setSizeYZ 16 mm
/calor/update
/testem/det/setNbOfLayers 2
/testem/det/setNbOfAbsor 2
/testem/det/setAbsor 0 liquidArgon 4 mm
/testem/det/setAbsor 1 Lead 4 mm
/testem/det/setSizeYZ 16 mm
/testem/det/update
#
/process/inactivate msc
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/printModulo 100
/testem/event/printModulo 100
#
/gun/particle proton
/gun/energy 500 MeV
@@ -0,0 +1,29 @@
# $Id: run08.mac,v 1.2 2002/12/12 11:19:34 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
#
# Iron 1 layer; proton 500 MeV
#
/control/verbose 2
#
/run/particle/setCut 1 mm
/run/initialize
#
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 1
/testem/det/setAbsor 0 Iron 5 cm
/testem/det/setSizeYZ 4 cm
/testem/det/update
#
/process/inactivate msc
#
/testem/gun/setDefault
#
/run/verbose 2
/testem/event/printModulo 100
/testem/tracking/stepMax 2 cm
#
/gun/particle proton
/gun/energy 500 MeV
/run/beamOn 100
@@ -1,4 +1,4 @@
# $Id: run12.draw,v 1.3 2001/11/05 15:28:39 maire Exp $
# $Id: run12.draw,v 1.4 2002/12/12 11:19:34 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -11,14 +11,14 @@
/run/particle/setCut 1 mm
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 2
/calor/setAbsor 0 Iron 1 cm
/calor/setAbsor 1 Scintillator 1 cm
/calor/setSizeYZ 2 cm
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 2
/testem/det/setAbsor 0 Iron 1 cm
/testem/det/setAbsor 1 Scintillator 1 cm
/testem/det/setSizeYZ 2 cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/tracking/verbose 1
@@ -1,4 +1,4 @@
# $Id: run15.mac,v 1.4 2001/11/05 15:28:39 maire Exp $
# $Id: run15.mac,v 1.5 2002/12/12 11:19:34 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -10,22 +10,22 @@
/run/particle/setCut 10 mum
/run/initialize
#
/calor/setNbOfLayers 20
/calor/setNbOfAbsor 2
/calor/setAbsor 0 Iron 14 mm
/calor/setAbsor 1 Scintillator 3 mm
/calor/setSizeYZ 30 cm
/calor/update
/testem/det/setNbOfLayers 20
/testem/det/setNbOfAbsor 2
/testem/det/setAbsor 0 Iron 14 mm
/testem/det/setAbsor 1 Scintillator 3 mm
/testem/det/setSizeYZ 30 cm
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/printModulo 1000
/testem/event/printModulo 1000
#
/gun/particle mu+
/gun/energy 20 GeV
#
/run/setHisto 0 100 0. 1.e-1
/run/setHisto 1 100 0. 5.e-3
/testem/run/setHisto 0 100 0. 1.e-1
/testem/run/setHisto 1 100 0. 5.e-3
#
/run/beamOn 20000
@@ -1,4 +1,4 @@
# $Id: run16.mac,v 1.4 2001/11/05 15:28:40 maire Exp $
# $Id: run16.mac,v 1.5 2002/12/12 11:19:34 maire Exp $
#
# Macro file for "TestEm3.cc"
# (can be run in batch, without graphic)
@@ -12,22 +12,23 @@
/run/particle/setCut 1 mum
/run/initialize
#
/calor/setNbOfLayers 1
/calor/setNbOfAbsor 3
/calor/setAbsor 0 Aluminium 170 mum
/calor/setAbsor 1 Gold 23 mum
/calor/setAbsor 2 Aluminium 850 mum
/calor/setSizeYZ 1050 mum
/calor/update
/testem/det/setNbOfLayers 1
/testem/det/setNbOfAbsor 3
/testem/det/setAbsor 0 Aluminium 170 mum
/testem/det/setAbsor 1 Gold 23 mum
/testem/det/setAbsor 2 Aluminium 850 mum
/testem/det/setSizeYZ 1050 mum
/testem/det/update
#
/gun/setDefault
/testem/gun/setDefault
#
/run/verbose 2
/event/printModulo 1000
/testem/event/printModulo 1000
#
/gun/particle e-
/gun/energy 1 MeV
#
/tracking/stepMax 5 mum
/gun/rndm 0.8
/testem/tracking/stepMax 5 mum
/testem/gun/rndm 0.8
#
/run/beamOn 10
@@ -22,7 +22,7 @@
//
//
// $Id: Em3CalorHit.cc,v 1.4 2001/10/22 10:58:54 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3CalorimeterSD.cc,v 1.4 2001/10/22 10:58:54 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3DetectorConstruction.cc,v 1.5 2001/10/22 10:58:55 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3DetectorConstruction.cc,v 1.6 2002/12/12 11:19:37 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -220,6 +220,14 @@ G4Material* Air = new G4Material(name="Air" , density, ncomponents=2);
Air->AddElement(N, fractionmass=0.7);
Air->AddElement(O, fractionmass=0.3);
density = 1.205*mg/cm3;
pressure = 1.*atmosphere;
temperature = 293.*kelvin;
G4Material* Air20 = new G4Material(name="Air20" , density, ncomponents=2,
kStateGas,temperature,pressure);
Air20->AddElement(N, fractionmass=0.7);
Air20->AddElement(O, fractionmass=0.3);
//
// define a material from elements and/or others materials (mixture of mixtures)
//
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3DetectorMessenger.cc,v 1.6 2001/11/05 15:28:40 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3DetectorMessenger.cc,v 1.8 2002/12/12 11:19:38 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -44,29 +44,29 @@
Em3DetectorMessenger::Em3DetectorMessenger(Em3DetectorConstruction * Em3Det)
:Em3Detector(Em3Det)
{
Em3detDir = new G4UIdirectory("/calor/");
Em3detDir->SetGuidance("Em3 detector control.");
testemDir = new G4UIdirectory("/testem/");
testemDir->SetGuidance("UI commands specific to this example");
SizeYZCmd = new G4UIcmdWithADoubleAndUnit("/calor/setSizeYZ",this);
SizeYZCmd = new G4UIcmdWithADoubleAndUnit("/testem/det/setSizeYZ",this);
SizeYZCmd->SetGuidance("Set tranverse size of the calorimeter");
SizeYZCmd->SetParameterName("Size",false);
SizeYZCmd->SetRange("Size>0.");
SizeYZCmd->SetUnitCategory("Length");
SizeYZCmd->AvailableForStates(PreInit,Idle);
SizeYZCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
NbLayersCmd = new G4UIcmdWithAnInteger("/calor/setNbOfLayers",this);
NbLayersCmd = new G4UIcmdWithAnInteger("/testem/det/setNbOfLayers",this);
NbLayersCmd->SetGuidance("Set number of layers.");
NbLayersCmd->SetParameterName("NbLayers",false);
NbLayersCmd->SetRange("NbLayers>0 && NbLayers<500");
NbLayersCmd->AvailableForStates(PreInit,Idle);
NbLayersCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
NbAbsorCmd = new G4UIcmdWithAnInteger("/calor/setNbOfAbsor",this);
NbAbsorCmd = new G4UIcmdWithAnInteger("/testem/det/setNbOfAbsor",this);
NbAbsorCmd->SetGuidance("Set number of Absorbers.");
NbAbsorCmd->SetParameterName("NbAbsor",false);
NbAbsorCmd->SetRange("NbAbsor>0");
NbAbsorCmd->AvailableForStates(PreInit,Idle);
NbAbsorCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
AbsorCmd = new G4UIcommand("/calor/setAbsor",this);
AbsorCmd = new G4UIcommand("/testem/det/setAbsor",this);
AbsorCmd->SetGuidance("Set the absor nb, the material, the thickness.");
AbsorCmd->SetGuidance(" absor number : from 0 to NbOfAbsor-1");
AbsorCmd->SetGuidance(" material name");
@@ -92,27 +92,27 @@ Em3DetectorMessenger::Em3DetectorMessenger(Em3DetectorConstruction * Em3Det)
unitPrm->SetParameterCandidates(unitList);
AbsorCmd->SetParameter(unitPrm);
//
AbsorCmd->AvailableForStates(Idle);
AbsorCmd->AvailableForStates(G4State_Idle);
MagFieldCmd = new G4UIcmdWithADoubleAndUnit("/calor/setField",this);
MagFieldCmd = new G4UIcmdWithADoubleAndUnit("/testem/det/setField",this);
MagFieldCmd->SetGuidance("Define magnetic field.");
MagFieldCmd->SetGuidance("Magnetic field will be in Z direction.");
MagFieldCmd->SetParameterName("Bz",false);
MagFieldCmd->SetUnitCategory("Magnetic flux density");
MagFieldCmd->AvailableForStates(Idle);
MagFieldCmd->AvailableForStates(G4State_Idle);
UpdateCmd = new G4UIcmdWithoutParameter("/calor/update",this);
UpdateCmd = new G4UIcmdWithoutParameter("/testem/det/update",this);
UpdateCmd->SetGuidance("Update calorimeter geometry.");
UpdateCmd->SetGuidance("This command MUST be applied before \"beamOn\" ");
UpdateCmd->SetGuidance("if you changed geometrical value(s).");
UpdateCmd->AvailableForStates(Idle);
UpdateCmd->AvailableForStates(G4State_Idle);
MaxStepCmd = new G4UIcmdWithADoubleAndUnit("/tracking/stepMax",this);
MaxStepCmd = new G4UIcmdWithADoubleAndUnit("/testem/tracking/stepMax",this);
MaxStepCmd->SetGuidance("Set max allowed step size");
MaxStepCmd->SetParameterName("Size",false);
MaxStepCmd->SetRange("Size>0.");
MaxStepCmd->SetUnitCategory("Length");
MaxStepCmd->AvailableForStates(Idle);
MaxStepCmd->AvailableForStates(G4State_Idle);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -126,7 +126,7 @@ Em3DetectorMessenger::~Em3DetectorMessenger()
delete MagFieldCmd;
delete UpdateCmd;
delete MaxStepCmd;
delete Em3detDir;
delete testemDir;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -22,7 +22,7 @@
//
//
// $Id: Em3EventAction.cc,v 1.13 2002/06/05 12:13:04 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3EventActionMessenger.cc,v 1.5 2001/11/28 17:54:46 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3EventActionMessenger.cc,v 1.7 2002/12/12 11:19:38 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -41,19 +41,19 @@
Em3EventActionMessenger::Em3EventActionMessenger(Em3EventAction* EvAct)
:eventAction(EvAct)
{
DrawCmd = new G4UIcmdWithAString("/event/drawTracks",this);
DrawCmd = new G4UIcmdWithAString("/testem/event/drawTracks",this);
DrawCmd->SetGuidance("Draw the tracks in the event");
DrawCmd->SetGuidance(" Choice : none, charged(default), all");
DrawCmd->SetParameterName("choice",true);
DrawCmd->SetDefaultValue("all");
DrawCmd->SetCandidates("none charged all");
DrawCmd->AvailableForStates(Idle);
DrawCmd->AvailableForStates(G4State_Idle);
PrintCmd = new G4UIcmdWithAnInteger("/event/printModulo",this);
PrintCmd = new G4UIcmdWithAnInteger("/testem/event/printModulo",this);
PrintCmd->SetGuidance("Print events modulo n");
PrintCmd->SetParameterName("EventNb",false);
PrintCmd->SetRange("EventNb>0");
PrintCmd->AvailableForStates(Idle);
PrintCmd->AvailableForStates(G4State_Idle);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3PhysicsList.cc,v 1.8 2002/02/14 14:20:46 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3PhysicsList.cc,v 1.9 2002/12/12 11:19:38 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -217,7 +217,6 @@ void Em3PhysicsList::ConstructEM()
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "G4Decay.hh"
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3PhysicsListMessenger.cc,v 1.3 2001/10/22 10:58:57 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3PhysicsListMessenger.cc,v 1.5 2002/12/12 11:19:38 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -39,26 +39,26 @@
Em3PhysicsListMessenger::Em3PhysicsListMessenger(Em3PhysicsList* pPhys)
:pPhysicsList(pPhys)
{
gammaCutCmd = new G4UIcmdWithADoubleAndUnit("/run/particle/setGCut",this);
gammaCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setGCut",this);
gammaCutCmd->SetGuidance("Set gamma cut.");
gammaCutCmd->SetParameterName("Gcut",false);
gammaCutCmd->SetUnitCategory("Length");
gammaCutCmd->SetRange("Gcut>0.0");
gammaCutCmd->AvailableForStates(PreInit,Idle);
gammaCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
electCutCmd = new G4UIcmdWithADoubleAndUnit("/run/particle/setECut",this);
electCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setECut",this);
electCutCmd->SetGuidance("Set electron cut.");
electCutCmd->SetParameterName("Ecut",false);
electCutCmd->SetUnitCategory("Length");
electCutCmd->SetRange("Ecut>0.0");
electCutCmd->AvailableForStates(PreInit,Idle);
electCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
protoCutCmd = new G4UIcmdWithADoubleAndUnit("/run/particle/setPCut",this);
protoCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setPCut",this);
protoCutCmd->SetGuidance("Set proton cut.");
protoCutCmd->SetParameterName("Pcut",false);
protoCutCmd->SetUnitCategory("Length");
protoCutCmd->SetRange("Pcut>0.0");
protoCutCmd->AvailableForStates(PreInit,Idle);
protoCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -22,7 +22,7 @@
//
//
// $Id: Em3PrimaryGeneratorAction.cc,v 1.5 2001/10/22 10:58:57 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3PrimaryGeneratorMessenger.cc,v 1.5 2001/10/22 10:58:57 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3PrimaryGeneratorMessenger.cc,v 1.7 2002/12/12 11:19:38 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -41,16 +41,16 @@ Em3PrimaryGeneratorMessenger::Em3PrimaryGeneratorMessenger(
Em3PrimaryGeneratorAction* Em3Gun)
:Em3Action(Em3Gun)
{
DefaultCmd = new G4UIcmdWithoutParameter("/gun/setDefault",this);
DefaultCmd = new G4UIcmdWithoutParameter("/testem/gun/setDefault",this);
DefaultCmd->SetGuidance("set/reset kinematic defined in PrimaryGenerator");
DefaultCmd->AvailableForStates(PreInit,Idle);
DefaultCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
RndmCmd = new G4UIcmdWithADouble("/gun/rndm",this);
RndmCmd = new G4UIcmdWithADouble("/testem/gun/rndm",this);
RndmCmd->SetGuidance("random lateral extension on the beam");
RndmCmd->SetGuidance("in fraction of 0.5*sizeYZ");
RndmCmd->SetParameterName("rBeam",false);
RndmCmd->SetRange("rBeam>=0.&&rBeam<=1.");
RndmCmd->AvailableForStates(Idle);
RndmCmd->AvailableForStates(G4State_Idle);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3RunAction.cc,v 1.17 2002/06/05 16:42:24 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3RunAction.cc,v 1.19 2002/12/12 11:19:38 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -44,15 +44,7 @@
#include "g4std/iomanip"
#ifndef G4NOHIST
#include "AIDA/IAnalysisFactory.h"
#include "AIDA/ITreeFactory.h"
#include "AIDA/ITree.h"
#include "AIDA/IHistogramFactory.h"
#include "AIDA/IHistogram1D.h"
#include "AIDA/IAxis.h"
#include "AIDA/IAnnotation.h"
#include "AIDA/ITupleFactory.h"
#include "AIDA/ITuple.h"
#include "AIDA/AIDA.h"
#endif
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -64,13 +56,15 @@ Em3RunAction::Em3RunAction(Em3DetectorConstruction* det)
#ifndef G4NOHIST
// Creating the analysis factory
IAnalysisFactory* af = AIDA_createAnalysisFactory();
AIDA::IAnalysisFactory* af = AIDA_createAnalysisFactory();
// Creating the tree factory
ITreeFactory* tf = af->createTreeFactory();
AIDA::ITreeFactory* tf = af->createTreeFactory();
// Creating a tree mapped to an hbook file.
tree = tf->create("testem3.paw", false, false, "hbook");
G4bool readOnly = false;
G4bool createNew = true;
tree = tf->create("testem3.paw", "hbook", readOnly, createNew);
// Creating a histogram factory, whose histograms will be handled by the tree
hf = af->createHistogramFactory(*tree);
@@ -140,7 +134,7 @@ void Em3RunAction::bookHisto()
for (G4int k=0; k<NbOfAbsor; ++k)
{
if (histo[k]==0)
{ histo[k] = hf->create1D(id[k+1],title+id[k],nbins,vmin,vmax);
{ histo[k] = hf->createHistogram1D(id[k+1],title+id[k],nbins,vmin,vmax);
G4cout << "bookHisto: " << k << " " << histo[k] << G4endl;
}
}
@@ -155,7 +149,7 @@ void Em3RunAction::SetHisto(G4int k,G4int nbins,G4double vmin,G4double vmax)
// (re)book histograms
const G4String title = "Edep/Ebeam in absorber ";
const G4String id[] = {"0","1","2","3","4","5","6","7","8","9","10"};
histo[k] = hf->create1D(id[k+1],title+id[k],nbins,vmin,vmax);
histo[k] = hf->createHistogram1D(id[k+1],title+id[k],nbins,vmin,vmax);
G4cout << "SetHisto: " << k << " " << histo[k] << G4endl;
#endif
}
@@ -175,8 +169,13 @@ void Em3RunAction::EndOfRunAction(const G4Run* aRun)
G4double MeanEAbs,rmsEAbs,MeanLAbs,rmsLAbs;
G4long oldform = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
G4int oldprec = G4cout.precision(2);
#ifdef G4USE_STD_NAMESPACE
G4std::ios::fmtflags mode = G4cout.flags();
G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
#else
G4long mode = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
#endif
G4int prec = G4cout.precision(2);
G4cout << "\n-------------------------------------------------------------\n"
<< G4std::setw(51) << "total energy dep"
@@ -205,8 +204,8 @@ void Em3RunAction::EndOfRunAction(const G4Run* aRun)
G4cout << "\n-------------------------------------------------------------";
G4cout << G4endl;
G4cout.setf(oldform,G4std::ios::floatfield);
G4cout.precision(oldprec);
G4cout.setf(mode,G4std::ios::floatfield);
G4cout.precision(prec);
// show Rndm status
HepRandom::showEngineStatus();
@@ -242,8 +241,13 @@ void Em3RunAction::PrintDedxTables()
//print the kinetic energies
//
G4long oldform = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
G4int oldprec = G4cout.precision(3);
#ifdef G4USE_STD_NAMESPACE
G4std::ios::fmtflags mode = G4cout.flags();
G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
#else
long mode = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
#endif
G4int prec = G4cout.precision(3);
G4cout << "\n kinetic energies \n ";
for (G4int j=0; j<nbin; ++j) {
@@ -290,8 +294,8 @@ void Em3RunAction::PrintDedxTables()
G4cout << G4endl;
}
G4cout.precision(oldprec);
G4cout.setf(oldform,G4std::ios::floatfield);
G4cout.precision(prec);
G4cout.setf(mode,G4std::ios::floatfield);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: Em3RunActionMessenger.cc,v 1.8 2001/11/28 17:54:46 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3RunActionMessenger.cc,v 1.10 2002/12/12 11:19:39 maire Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -42,7 +42,7 @@
Em3RunActionMessenger::Em3RunActionMessenger(Em3RunAction* run)
:Em3Run(run)
{
HistoCmd = new G4UIcommand("/run/setHisto",this);
HistoCmd = new G4UIcommand("/testem/run/setHisto",this);
HistoCmd->SetGuidance("Set histo Edep/Ebeam in absorber k");
HistoCmd->SetGuidance(" histo=absor number : from 0 to NbOfAbsor-1");
HistoCmd->SetGuidance(" number of bins; Emin/Ebeam; Emax/Ebeam");
@@ -67,7 +67,7 @@ Em3RunActionMessenger::Em3RunActionMessenger(Em3RunAction* run)
VmaxPrm->SetParameterRange("Vmax>=0.&&Vmax<=1.");
HistoCmd->SetParameter(VmaxPrm);
//
HistoCmd->AvailableForStates(Idle);
HistoCmd->AvailableForStates(G4State_Idle);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -22,7 +22,7 @@
//
//
// $Id: Em3SteppingAction.cc,v 1.5 2001/10/22 10:58:59 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: Em3SteppingVerbose.cc,v 1.8 2001/10/22 10:58:59 maire Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+5 -3
View File
@@ -21,10 +21,10 @@
// ********************************************************************
//
//
// $Id: Em3VisManager.cc,v 1.6 2001/11/15 13:09:47 johna Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: Em3VisManager.cc,v 1.7 2002/11/13 21:39:52 duns Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
//
//
// John Allison 24th January 1998.
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -41,6 +41,7 @@
#include "G4DAWNFILE.hh"
#include "G4GAGTree.hh"
#include "G4HepRepFile.hh"
#include "G4HepRep.hh"
#include "G4RayTracer.hh"
#include "G4VRML1File.hh"
#include "G4VRML2File.hh"
@@ -97,6 +98,7 @@ void Em3VisManager::RegisterGraphicsSystems () {
RegisterGraphicsSystem (new G4DAWNFILE);
RegisterGraphicsSystem (new G4GAGTree);
RegisterGraphicsSystem (new G4HepRepFile);
RegisterGraphicsSystem (new G4HepRep);
RegisterGraphicsSystem (new G4RayTracer);
RegisterGraphicsSystem (new G4VRML1File);
RegisterGraphicsSystem (new G4VRML2File);
@@ -26,4 +26,4 @@
/tracking/storeTrajectory 1
/vis/scene/endOfEventAction accumulate
#
/event/drawTracks
/testem/event/drawTracks