Skip to content

Commit 67c4abe

Browse files
gcosmogcosmo
committed
Import Geant4 6.2.2 source tree
1 parent 9eb2178 commit 67c4abe

File tree

180 files changed

+5184
-4077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+5184
-4077
lines changed

‎ReleaseNotes/Patch4.6.2-2.txt

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
2+
Geant4 6.2 - patch-02 Release Notes
3+
-----------------------------------
4+
5+
26 October 2004
6+
7+
List of fixes included in this public patch since release 6.2-patch-01:
8+
9+
o Geometry:
10+
--------
11+
+ divisions:
12+
o Removed unnecessary debug printout in method
13+
G4PVDivision::CheckAndSetParamenters().
14+
+ management:
15+
o G4Region: added map for storage of materials/cuts and methods for
16+
handling registration of couples in the map, finding a couple
17+
according to a given material, clearing the map's storage.
18+
Extensions necessary to resolve correct update of material-cut
19+
couples in parameterised geometries by material.
20+
o G4LogicalVolume: added method UpdateMaterial() to refresh a
21+
material/cut couple in the corresponding region.
22+
Extension necessary to resolve correct update of material-cut
23+
couples in parameterised geometries by material.
24+
o Fixed G4RegionStore::Clean() to avoid deletion of world region.
25+
+ navigation:
26+
o G4Navigator: corrected computation of fGrandMotherExitNormal in
27+
ComputeStep() in the case where a not valid exit-normal exists.
28+
o G4GeomTestSegment: fix to correctly determine whether starting
29+
trajectory is entering or exiting the solid when the starting point
30+
is on a surface. Added additional tests on solid consistencies
31+
(from roundoff sometimes) to avoid incorrect overlap warnings.
32+
Addresses problem reports #610 and #652.
33+
o Dump out contents from the solid when a fatal G4Exception is thrown
34+
from the navigators in ComputeStep().
35+
o Invoke G4LogicalVolume::UpdateMaterial() instead of SetMaterial()
36+
for parameterised navigation in G4Navigator and specialised
37+
G4ParameterisedNavigation.
38+
Modification necessary to resolve correct update of material-cut
39+
couples in parameterised geometries by material.
40+
+ solids/CSG:
41+
o Fix in G4Cons::DistanceToIn(p,v) on fRmax surface and move in,
42+
the condition became a bit more strict && determinant >=0, i.e.
43+
intersections in addition to go in.
44+
Fixes a rare problem of dIn=dOut=0 observed in 3 events over a
45+
statistics of 10^8..
46+
o Fix in G4Sphere::DistanceToOut(p,v,...) on fRmin moving outside.
47+
The bug showed 3 events of dIn=dOut=0 for 10^7 statistics in the
48+
unit testing.
49+
o Bug fix in G4Sphere::SurfaceNormal(p) for theta normals.
50+
+ solids/specific:
51+
o G4VCSGfaceted: fix for rare anomalous situation in which
52+
DistanceToOut(p,v,..) will report kInfinity, make an additional
53+
check for the point p on the surface, in which case will report
54+
zero. Addresses problem observed in G4Polyhedra and reported in #650.
55+
56+
o Materials:
57+
---------
58+
+ Added protection in G4AtomicShells::GetNumberOfShells(Z).
59+
Fixes problem report #643.
60+
+ Recalculate ionisation parameters after set of new mean ionisation
61+
potential; added factor 2 to shell correction term.
62+
63+
o Processes/cuts:
64+
--------------
65+
+ Fixed bug in G4ProductionCutsTable for the update of materials/cuts
66+
couple for dynamic setups where material may vary, like in the case
67+
of parameterization of detectors through material.
68+
69+
o Electromagnetic processes:
70+
-------------------------
71+
+ lowenergy:
72+
o Trivial fixes for removal of redundant semicolons in the code.
73+
+ utils:
74+
o Fixed a problem of cut dependence of transmission energy of low
75+
energy e- via thin foil
76+
+ xrays:
77+
o Changed "StronglyForced" back to "Forced" in GetMeanLifeTime() for
78+
the G4Scintillation process.
79+
80+
o Hadronic Processes:
81+
------------------
82+
+ models/cascade:
83+
o Fixed bug in G4CascadeInterface for uncorrect deletion of dynamic
84+
particles. Fixes problem report #645.
85+
86+
o Optical Processes:
87+
-----------------
88+
+ Allow for unified model reflectivity parameters to also work in case
89+
of dielectric_metal surfaces; in G4OpBoundaryProcess, use GetMaterial()
90+
from G4StepPoint directly, sample reflectivity and apply unified model
91+
reflection parameters only once even for rough dielectric/metal
92+
surfaces. Fixes problem report #654.
93+
+ Fixed bug in G4PlaneVectorRand for G4OpBoundaryProcess and resample
94+
'theFacetNormal' for LobeReflection in DielectricMetal.
95+
96+
o Run:
97+
---
98+
+ Updated date to run-manager.
99+
100+
o Visualization:
101+
-------------
102+
+ OpenGL: G4OpenGLTransform3D.cc: simplified implementation for
103+
GetMatrix() to allow for porting on future CLHEP series.
104+
105+
o Examples:
106+
--------
107+
+ Updated reference outputs.
108+
+ electromagnetic/MuonProcesses
109+
o Modified HistoManager and Messenger in order to allow a multirun job.
110+
+ electromagnetic/PhotonProcesses
111+
o Modified HistoManager and Messenger in order to allow a multirun job.
112+
+ electromagnetic/TestEm2
113+
o Updated acceptance numbers in input macro.
114+
o Fixed problem in initialisation of RunAction.
115+
+ electromagnetic/TestEm4
116+
o Modifications in RunAction for histograms management for JAIDA.
117+
+ electromagnetic/TestEm6
118+
o Correctly defined all UI subdirectories.
119+
o Modifications in RunAction for histograms management for JAIDA.
120+
+ electromagnetic/TestEm10
121+
o Removed obsolete processes from PhysicsList.
122+
+ extended/field
123+
o Minor cleanup of PhysicsLists.
124+
+ extended/optical
125+
o Fixed compilation error and warnings for LXe on Linux/gcc compiler.
126+
+ novice/N05
127+
o Added protection for negative proposed step in ExN05MinEkineCuts.
128+
129+
----------------------------------------------------------------------------
130+
131+
Technical Notes
132+
---------------
133+
134+
o This patch should be applied on top of release 6.2.
135+
o Technical notes distributed for release 6.2 are also applicable and
136+
valid for this patch.
137+
138+
The code and rebuilt binary libraries for release 6.2 are available through
139+
our "Source Code" Web page: http://cern.ch/geant4
140+
141+
Please refer to the Geant4 User Documentation:
142+
http://cern.ch/geant4/G4UsersDocuments/Overview/html
143+
for further information about using Geant4.

‎examples/extended/biasing/B01/exampleB01.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
*************************************************************
3-
Geant4 version $Name: geant4-06-02 $ (25-June-2004)
3+
Geant4 version $Name: geant4-06-02-patch-02 $ (26-October-2004)
44
Copyright : Geant4 Collaboration
55
Reference : NIM A 506 (2003), 250-303
66
WWW : http://cern.ch/geant4

‎examples/extended/electromagnetic/MuonProcesses/GNUmakefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: GNUmakefile,v 1.1 2004/06/14 10:09:19 maire Exp $
1+
# $Id: GNUmakefile,v 1.2 2004/06/30 15:48:54 maire Exp $
22
# --------------------------------------------------------------
33
# GNUmakefile for examples module. Gabriele Cosmo, 06/04/98.
44
# --------------------------------------------------------------
@@ -17,17 +17,12 @@ all: lib bin
1717
#### G4ANALYSIS_USE := true
1818

1919
ifdef G4ANALYSIS_USE
20-
USE_AIDA := true
21-
endif
22-
23-
ifdef USE_AIDA
2420
CPPFLAGS += -DG4ANALYSIS_USE
25-
CPPFLAGS += -DUSE_AIDA
2621
endif
2722

2823
include $(G4INSTALL)/config/architecture.gmk
2924

30-
ifdef USE_AIDA
25+
ifdef G4ANALYSIS_USE
3126
# for the aida-config command see the README file
3227
CPPFLAGS += `aida-config --include`
3328
LDFLAGS += `aida-config --lib`
@@ -38,3 +33,7 @@ include $(G4INSTALL)/config/binmake.gmk
3833
visclean:
3934
rm -f g4*.prim g4*.eps g4*.wrl
4035
rm -f .DAWN_*
36+
37+
histclean:
38+
rm ${G4WORKDIR}/tmp/${G4SYSTEM}/${G4TARGET}/HistoManager.o
39+
rm ${G4WORKDIR}/tmp/${G4SYSTEM}/${G4TARGET}/RunAction.o

‎examples/extended/electromagnetic/MuonProcesses/History

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$Id: History,v 1.2 2004/06/16 10:46:47 maire Exp $
1+
$Id: History,v 1.4 2004/08/17 18:09:59 vnivanch Exp $
22
-------------------------------------------------------------------
33

44
=========================================================
@@ -14,8 +14,14 @@ track of all tags.
1414
----------------------------------------------------------
1515
* Reverse chronological order (last date on top), please *
1616
----------------------------------------------------------
17+
18+
17.06.04 V. Ivanchenko (muonprocesses-V06-02-01)
19+
- introduce MuNuclearBuilder and corresponding macro
20+
21+
30.06.04 mma (muonprocesses-V06-02-00)
22+
- histo management like in testem5-V06-01-04
1723

18-
16.06.04 V. Ivantchenko (muonprocesses-V06-01-01)
24+
16.06.04 V. Ivanchenko (muonprocesses-V06-01-01)
1925
- std::max in MuCrossSections
2026

2127
14.06.04 Michel Maire (muonprocesses-V06-01-00)

‎examples/extended/electromagnetic/MuonProcesses/MuonProcesses.cc

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
// ********************************************************************
2222
//
2323
//
24-
// $Id: MuonProcesses.cc,v 1.1 2004/06/14 10:09:20 maire Exp $
25-
// GEANT4 tag $Name: geant4-06-02 $
24+
// $Id: MuonProcesses.cc,v 1.2 2004/06/30 15:48:55 maire Exp $
25+
// GEANT4 tag $Name: geant4-06-02-patch-02 $
2626
//
2727
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
2828
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -74,10 +74,7 @@ int main(int argc,char** argv) {
7474
visManager->Initialize();
7575
#endif
7676

77-
HistoManager* histo = 0;
78-
#ifdef G4ANALYSIS_USE
79-
histo = new HistoManager();
80-
#endif
77+
HistoManager* histo = new HistoManager();
8178

8279
// set user action classes
8380
RunAction* run;
@@ -106,13 +103,12 @@ int main(int argc,char** argv) {
106103

107104
// job termination
108105
//
109-
#ifdef G4ANALYSIS_USE
110-
delete histo;
111-
#endif
106+
112107
#ifdef G4VIS_USE
113108
delete visManager;
114109
#endif
115-
110+
111+
delete histo;
116112
delete runManager;
117113

118114
return 0;

‎examples/extended/electromagnetic/MuonProcesses/allproc.mac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: allproc.mac,v 1.1 2004/06/14 10:09:20 maire Exp $
1+
# $Id: allproc.mac,v 1.2 2004/07/27 10:13:16 maire Exp $
22
#
33
# Macro file for "MuonProcesses.cc"
44
# (can be run in batch, without graphic)
@@ -10,7 +10,6 @@
1010
/testem/det/setSize 1 m
1111
#
1212
/testem/phys/addPhysics standard
13-
### /testem/phys/addPhysics g4v52
1413
#
1514
/testem/phys/setCuts 1 mm
1615
#

‎examples/extended/electromagnetic/MuonProcesses/include/HistoManager.hh

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@
2020
// * statement, and all its terms. *
2121
// ********************************************************************
2222
//
23-
// $Id: HistoManager.hh,v 1.1 2004/06/14 10:09:22 maire Exp $
24-
// GEANT4 tag $Name: geant4-06-02 $
23+
// $Id: HistoManager.hh,v 1.2 2004/06/30 15:48:56 maire Exp $
24+
// GEANT4 tag $Name: geant4-06-02-patch-02 $
2525
//
2626
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
2727
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
2828

2929
#ifndef HistoManager_h
3030
#define HistoManager_h 1
3131

32-
#ifdef USE_AIDA
33-
3432
#include "globals.hh"
3533

3634
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -39,53 +37,60 @@ namespace AIDA {
3937
class ITree;
4038
class IHistogramFactory;
4139
class IHistogram1D;
42-
}
40+
}
4341

4442
class HistoMessenger;
4543

46-
const G4int MaxHisto = 5;
44+
const G4int MaxHisto = 5;
4745

4846
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
4947

5048
class HistoManager
5149
{
5250
public:
53-
51+
5452
HistoManager();
5553
~HistoManager();
56-
57-
void SetFileName (G4String name) { fileName = name;};
58-
void SetFactory ();
59-
void SaveFactory ();
60-
void SetHisto (G4int, G4int, G4double, G4double, G4String unit="none");
54+
55+
void SetFileName (const G4String& name) { fileName = name;};
56+
void SetFileType (const G4String& name) { fileType = name;};
57+
void book();
58+
void save();
59+
void SetHisto (G4int,G4int,G4double,G4double,const G4String& unit="none");
60+
void FillHisto(G4int id, G4double e, G4double weight = 1.0);
6161
void RemoveHisto (G4int);
6262

63-
AIDA::ITree* GetTree() {return tree;}
64-
AIDA::IHistogramFactory* GetHistogramFactory() {return hf;}
63+
AIDA::IHistogramFactory* GetHistogramFactory() {return hf;}
6564
AIDA::IHistogram1D* GetHisto(G4int id) {return histo[id];}
66-
G4double GetHistoUnit(G4int id) {return Unit[id];}
67-
G4double GetBinWidth (G4int id) {return Width[id];}
68-
65+
66+
G4bool HistoExist (G4int id) {return exist[id];}
67+
G4String GetTitle (G4int id) {return Title[id];}
68+
G4int GetNbins (G4int id) {return Nbins[id];}
69+
G4double GetVmin (G4int id) {return Vmin[id];}
70+
G4double GetVmax (G4int id) {return Vmax[id];}
71+
G4double GetHistoUnit(G4int id) {return Unit[id];}
72+
G4double GetBinWidth (G4int id) {return Width[id];}
73+
6974
private:
70-
75+
7176
G4String fileName;
77+
G4String fileType;
7278
AIDA::ITree* tree;
73-
AIDA::IHistogramFactory* hf;
79+
AIDA::IHistogramFactory* hf;
7480
AIDA::IHistogram1D* histo[MaxHisto];
7581
G4bool exist[MaxHisto];
7682
G4String Label[MaxHisto];
7783
G4String Title[MaxHisto];
7884
G4int Nbins[MaxHisto];
7985
G4double Vmin [MaxHisto];
80-
G4double Vmax [MaxHisto];
86+
G4double Vmax [MaxHisto];
8187
G4double Unit [MaxHisto];
8288
G4double Width[MaxHisto];
83-
G4bool factoryOn;
89+
G4bool factoryOn;
8490
HistoMessenger* histoMessenger;
8591
};
8692

8793
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
8894

8995
#endif
90-
#endif
9196

‎examples/extended/electromagnetic/MuonProcesses/include/HistoMessenger.hh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@
2020
// * statement, and all its terms. *
2121
// ********************************************************************
2222
//
23-
// $Id: HistoMessenger.hh,v 1.1 2004/06/14 10:09:22 maire Exp $
24-
// GEANT4 tag $Name: geant4-06-02 $
23+
// $Id: HistoMessenger.hh,v 1.2 2004/06/30 15:48:56 maire Exp $
24+
// GEANT4 tag $Name: geant4-06-02-patch-02 $
2525
//
2626
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
2727
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
2828

2929
#ifndef HistoMessenger_h
3030
#define HistoMessenger_h 1
3131

32-
#ifdef G4ANALYSIS_USE
33-
3432
#include "G4UImessenger.hh"
3533
#include "globals.hh"
3634

@@ -59,12 +57,13 @@ class HistoMessenger: public G4UImessenger
5957

6058
G4UIdirectory* histoDir;
6159
G4UIcmdWithAString* factoryCmd;
60+
G4UIcmdWithAString* typeCmd;
6261
G4UIcommand* histoCmd;
63-
G4UIcmdWithAnInteger* rmhistoCmd;
64-
62+
G4UIcmdWithAnInteger* rmhistoCmd;
63+
6564
};
6665

6766
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
6867

6968
#endif
70-
#endif
69+

0 commit comments

Comments
 (0)