Import Geant4 11.1.0 source tree

This commit is contained in:
Gabriele Cosmo
2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
+202 -194
View File
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
**************************************************************
Geant4 version Name: geant4-11-01-beta-01 (30-June-2022)
Geant4 version Name: geant4-11-01-ref-00 (9-December-2022)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
@@ -33,6 +33,8 @@ Registered graphics systems are:
RayTracer (RayTracer)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN, TSG_FILE)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
@@ -162,6 +164,7 @@ Apply cuts on all EM processes 0
Use combined TransportationWithMsc Disabled
Use general process 1
Enable linear polarisation for gamma 0
Enable photoeffect sampling below K-shell 1
Enable sampling of quantum entanglement 0
X-section factor for integral approach 0.8
Min kinetic energy for tables 100 eV
@@ -189,7 +192,7 @@ Lowest e+e- kinetic energy 1 keV
Lowest muon/hadron kinetic energy 1 keV
Use ICRU90 data 0
Fluctuations of dE/dx are enabled 1
Type of fluctuation model 2
Type of fluctuation model for leptons and hadrons Urban
Use built-in Birks satuaration 0
Build CSDA range enabled 0
Use cut as a final range enabled 0
@@ -240,8 +243,8 @@ conv: for gamma SubType=14 BuildTable=1
BetheHeitlerLPM : Emin= 0 eV Emax= 100 TeV ModifiedTsai
Rayl: for gamma SubType=11 BuildTable=1
Lambda table from 100 eV to 100 keV, 7 bins/decade, spline: 0
LambdaPrime table from 100 keV to 100 TeV in 63 bins
Lambda table from 100 eV to 150 keV, 7 bins/decade, spline: 0
LambdaPrime table from 150 keV to 100 TeV in 62 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermoreRayleigh : Emin= 0 eV Emax= 100 TeV CullenGenerator
@@ -723,6 +726,11 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_hypertriton
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_lambda
@@ -999,7 +1007,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 3
0 hits stored in this event
>>> Event: 4
0 hits stored in this event
32 hits stored in this event
>>> Event: 5
0 hits stored in this event
>>> Event: 6
@@ -1009,31 +1017,31 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 8
0 hits stored in this event
>>> Event: 9
0 hits stored in this event
41 hits stored in this event
>>> Event: 10
33 hits stored in this event
63 hits stored in this event
>>> Event: 11
0 hits stored in this event
>>> Event: 12
0 hits stored in this event
>>> Event: 13
0 hits stored in this event
107 hits stored in this event
>>> Event: 14
0 hits stored in this event
>>> Event: 15
146 hits stored in this event
>>> Event: 16
0 hits stored in this event
>>> Event: 16
7 hits stored in this event
>>> Event: 17
0 hits stored in this event
>>> Event: 18
17 hits stored in this event
0 hits stored in this event
>>> Event: 19
0 hits stored in this event
>>> Event: 20
0 hits stored in this event
>>> Event: 21
70 hits stored in this event
0 hits stored in this event
>>> Event: 22
0 hits stored in this event
>>> Event: 23
@@ -1043,7 +1051,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 25
0 hits stored in this event
>>> Event: 26
35 hits stored in this event
66 hits stored in this event
>>> Event: 27
0 hits stored in this event
>>> Event: 28
@@ -1065,15 +1073,15 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 36
0 hits stored in this event
>>> Event: 37
0 hits stored in this event
52 hits stored in this event
>>> Event: 38
0 hits stored in this event
>>> Event: 39
161 hits stored in this event
0 hits stored in this event
>>> Event: 40
0 hits stored in this event
>>> Event: 41
9 hits stored in this event
0 hits stored in this event
>>> Event: 42
0 hits stored in this event
>>> Event: 43
@@ -1083,15 +1091,15 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 45
0 hits stored in this event
>>> Event: 46
5 hits stored in this event
0 hits stored in this event
>>> Event: 47
0 hits stored in this event
>>> Event: 48
0 hits stored in this event
>>> Event: 49
67 hits stored in this event
>>> Event: 50
0 hits stored in this event
>>> Event: 50
149 hits stored in this event
>>> Event: 51
0 hits stored in this event
>>> Event: 52
@@ -1127,7 +1135,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 67
0 hits stored in this event
>>> Event: 68
22 hits stored in this event
0 hits stored in this event
>>> Event: 69
0 hits stored in this event
>>> Event: 70
@@ -1135,17 +1143,17 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 71
0 hits stored in this event
>>> Event: 72
0 hits stored in this event
73 hits stored in this event
>>> Event: 73
0 hits stored in this event
>>> Event: 74
121 hits stored in this event
0 hits stored in this event
>>> Event: 75
0 hits stored in this event
>>> Event: 76
0 hits stored in this event
>>> Event: 77
116 hits stored in this event
1 hits stored in this event
>>> Event: 78
0 hits stored in this event
>>> Event: 79
@@ -1153,9 +1161,9 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 80
0 hits stored in this event
>>> Event: 81
0 hits stored in this event
16 hits stored in this event
>>> Event: 82
156 hits stored in this event
145 hits stored in this event
>>> Event: 83
0 hits stored in this event
>>> Event: 84
@@ -1165,27 +1173,27 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 86
0 hits stored in this event
>>> Event: 87
17 hits stored in this event
0 hits stored in this event
>>> Event: 88
0 hits stored in this event
>>> Event: 89
0 hits stored in this event
>>> Event: 90
143 hits stored in this event
28 hits stored in this event
>>> Event: 91
0 hits stored in this event
>>> Event: 92
0 hits stored in this event
>>> Event: 93
0 hits stored in this event
5 hits stored in this event
>>> Event: 94
0 hits stored in this event
54 hits stored in this event
>>> Event: 95
0 hits stored in this event
>>> Event: 96
0 hits stored in this event
>>> Event: 97
173 hits stored in this event
0 hits stored in this event
>>> Event: 98
0 hits stored in this event
>>> Event: 99
@@ -1193,205 +1201,205 @@ See commands in /vis/modeling/trajectories/ for other options.
### Run 1 starts.
--> Event 0 starts.
>>> Event: 0
55 hits stored in this event
>>> Event: 1
225 hits stored in this event
>>> Event: 2
111 hits stored in this event
>>> Event: 3
67 hits stored in this event
>>> Event: 4
83 hits stored in this event
>>> Event: 5
173 hits stored in this event
>>> Event: 6
221 hits stored in this event
>>> Event: 7
112 hits stored in this event
>>> Event: 8
115 hits stored in this event
>>> Event: 9
3611 hits stored in this event
>>> Event: 10
151 hits stored in this event
>>> Event: 11
94 hits stored in this event
>>> Event: 12
71 hits stored in this event
>>> Event: 13
157 hits stored in this event
>>> Event: 14
71 hits stored in this event
>>> Event: 15
51 hits stored in this event
>>> Event: 16
153 hits stored in this event
>>> Event: 17
88 hits stored in this event
>>> Event: 1
110 hits stored in this event
>>> Event: 2
60 hits stored in this event
>>> Event: 3
291 hits stored in this event
>>> Event: 4
114 hits stored in this event
>>> Event: 5
82 hits stored in this event
>>> Event: 6
514 hits stored in this event
>>> Event: 7
76 hits stored in this event
>>> Event: 8
129 hits stored in this event
>>> Event: 9
71 hits stored in this event
>>> Event: 10
92 hits stored in this event
>>> Event: 11
71 hits stored in this event
>>> Event: 12
98 hits stored in this event
>>> Event: 13
100 hits stored in this event
>>> Event: 14
247 hits stored in this event
>>> Event: 15
89 hits stored in this event
>>> Event: 16
1565 hits stored in this event
>>> Event: 17
306 hits stored in this event
>>> Event: 18
84 hits stored in this event
71 hits stored in this event
>>> Event: 19
71 hits stored in this event
>>> Event: 20
85 hits stored in this event
501 hits stored in this event
>>> Event: 21
66 hits stored in this event
143 hits stored in this event
>>> Event: 22
90 hits stored in this event
135 hits stored in this event
>>> Event: 23
121 hits stored in this event
140 hits stored in this event
>>> Event: 24
100 hits stored in this event
74 hits stored in this event
>>> Event: 25
91 hits stored in this event
63 hits stored in this event
>>> Event: 26
110 hits stored in this event
169 hits stored in this event
>>> Event: 27
82 hits stored in this event
122 hits stored in this event
>>> Event: 28
81 hits stored in this event
73 hits stored in this event
>>> Event: 29
150 hits stored in this event
82 hits stored in this event
>>> Event: 30
488 hits stored in this event
126 hits stored in this event
>>> Event: 31
174 hits stored in this event
78 hits stored in this event
>>> Event: 32
59 hits stored in this event
151 hits stored in this event
>>> Event: 33
71 hits stored in this event
100 hits stored in this event
>>> Event: 34
539 hits stored in this event
116 hits stored in this event
>>> Event: 35
138 hits stored in this event
57 hits stored in this event
>>> Event: 36
293 hits stored in this event
339 hits stored in this event
>>> Event: 37
201 hits stored in this event
73 hits stored in this event
>>> Event: 38
76 hits stored in this event
>>> Event: 39
163 hits stored in this event
96 hits stored in this event
>>> Event: 40
95 hits stored in this event
609 hits stored in this event
>>> Event: 41
386 hits stored in this event
71 hits stored in this event
>>> Event: 42
68 hits stored in this event
1020 hits stored in this event
>>> Event: 43
603 hits stored in this event
59 hits stored in this event
>>> Event: 44
94 hits stored in this event
>>> Event: 45
119 hits stored in this event
>>> Event: 46
93 hits stored in this event
>>> Event: 47
63 hits stored in this event
>>> Event: 48
129 hits stored in this event
>>> Event: 49
63 hits stored in this event
>>> Event: 50
69 hits stored in this event
>>> Event: 51
78 hits stored in this event
>>> Event: 52
838 hits stored in this event
>>> Event: 53
94 hits stored in this event
>>> Event: 54
57 hits stored in this event
>>> Event: 55
102 hits stored in this event
>>> Event: 56
1484 hits stored in this event
>>> Event: 57
170 hits stored in this event
>>> Event: 58
1211 hits stored in this event
>>> Event: 59
8976 hits stored in this event
>>> Event: 60
84 hits stored in this event
>>> Event: 61
72 hits stored in this event
>>> Event: 62
83 hits stored in this event
>>> Event: 63
79 hits stored in this event
>>> Event: 64
154 hits stored in this event
>>> Event: 65
518 hits stored in this event
>>> Event: 66
128 hits stored in this event
>>> Event: 67
84 hits stored in this event
>>> Event: 68
97 hits stored in this event
>>> Event: 69
66 hits stored in this event
>>> Event: 70
115 hits stored in this event
>>> Event: 71
158 hits stored in this event
>>> Event: 72
119 hits stored in this event
>>> Event: 73
82 hits stored in this event
>>> Event: 74
70 hits stored in this event
>>> Event: 75
97 hits stored in this event
>>> Event: 76
81 hits stored in this event
>>> Event: 77
92 hits stored in this event
>>> Event: 78
112 hits stored in this event
>>> Event: 79
167 hits stored in this event
>>> Event: 80
225 hits stored in this event
>>> Event: 81
382 hits stored in this event
>>> Event: 82
98 hits stored in this event
>>> Event: 83
276 hits stored in this event
>>> Event: 84
106 hits stored in this event
>>> Event: 85
470 hits stored in this event
>>> Event: 86
62 hits stored in this event
>>> Event: 87
110 hits stored in this event
>>> Event: 88
279 hits stored in this event
>>> Event: 89
115 hits stored in this event
>>> Event: 90
95 hits stored in this event
>>> Event: 91
198 hits stored in this event
>>> Event: 92
81 hits stored in this event
>>> Event: 93
460 hits stored in this event
>>> Event: 94
393 hits stored in this event
>>> Event: 95
123 hits stored in this event
>>> Event: 96
>>> Event: 45
63 hits stored in this event
>>> Event: 46
70 hits stored in this event
>>> Event: 47
76 hits stored in this event
>>> Event: 48
61 hits stored in this event
>>> Event: 49
93 hits stored in this event
>>> Event: 50
67 hits stored in this event
>>> Event: 51
177 hits stored in this event
>>> Event: 52
79 hits stored in this event
>>> Event: 53
60 hits stored in this event
>>> Event: 54
133 hits stored in this event
>>> Event: 55
535 hits stored in this event
>>> Event: 56
105 hits stored in this event
>>> Event: 57
238 hits stored in this event
>>> Event: 58
600 hits stored in this event
>>> Event: 59
1923 hits stored in this event
>>> Event: 60
55 hits stored in this event
>>> Event: 61
180 hits stored in this event
>>> Event: 62
85 hits stored in this event
>>> Event: 63
225 hits stored in this event
>>> Event: 64
1523 hits stored in this event
>>> Event: 65
130 hits stored in this event
>>> Event: 66
78 hits stored in this event
>>> Event: 67
66 hits stored in this event
>>> Event: 68
109 hits stored in this event
>>> Event: 69
106 hits stored in this event
>>> Event: 70
80 hits stored in this event
>>> Event: 71
82 hits stored in this event
>>> Event: 72
58 hits stored in this event
>>> Event: 73
228 hits stored in this event
>>> Event: 74
71 hits stored in this event
>>> Event: 75
109 hits stored in this event
>>> Event: 76
124 hits stored in this event
>>> Event: 77
80 hits stored in this event
>>> Event: 78
441 hits stored in this event
>>> Event: 79
105 hits stored in this event
>>> Event: 80
124 hits stored in this event
>>> Event: 81
117 hits stored in this event
>>> Event: 82
116 hits stored in this event
>>> Event: 83
74 hits stored in this event
>>> Event: 84
135 hits stored in this event
>>> Event: 85
121 hits stored in this event
>>> Event: 86
94 hits stored in this event
>>> Event: 87
108 hits stored in this event
>>> Event: 88
161 hits stored in this event
>>> Event: 89
140 hits stored in this event
>>> Event: 90
57 hits stored in this event
>>> Event: 91
145 hits stored in this event
>>> Event: 92
61 hits stored in this event
>>> Event: 93
65 hits stored in this event
>>> Event: 94
111 hits stored in this event
>>> Event: 95
66 hits stored in this event
>>> Event: 96
110 hits stored in this event
>>> Event: 97
159 hits stored in this event
53 hits stored in this event
>>> Event: 98
289 hits stored in this event
349 hits stored in this event
>>> Event: 99
1618 hits stored in this event
59 hits stored in this event
### Run 2 starts.
--> Event 0 starts.
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.hh
/// \file B2/B2a/include/ActionInitialization.hh
/// \brief Definition of the B2::ActionInitialization class
#ifndef B2ActionInitialization_h
@@ -40,8 +40,8 @@ namespace B2
class ActionInitialization : public G4VUserActionInitialization
{
public:
ActionInitialization();
~ActionInitialization() override;
ActionInitialization() = default;
~ActionInitialization() override = default;
void BuildForMaster() const override;
void Build() const override;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.hh
/// \file B2/B2a/include/DetectorConstruction.hh
/// \brief Definition of the B2a::DetectorConstruction class
#ifndef B2aDetectorConstruction_h
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorMessenger.hh
/// \file B2/B2a/include/DetectorMessenger.hh
/// \brief Definition of the B2a::DetectorMessenger class
#ifndef B2aDetectorMessenger_h
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.hh
/// \file B2/B2a/include/EventAction.hh
/// \brief Definition of the B2::EventAction class
#ifndef B2EventAction_h
@@ -42,8 +42,8 @@ namespace B2
class EventAction : public G4UserEventAction
{
public:
EventAction();
~EventAction() override;
EventAction() = default;
~EventAction() override = default;
void BeginOfEventAction(const G4Event* ) override;
void EndOfEventAction(const G4Event* ) override;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.hh
/// \file B2/B2a/include/PrimaryGeneratorAction.hh
/// \brief Definition of the B2::PrimaryGeneratorAction class
#ifndef B2PrimaryGeneratorAction_h
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.hh
/// \file B2/B2a/include/RunAction.hh
/// \brief Definition of the B2::RunAction class
#ifndef B2RunAction_h
@@ -44,7 +44,7 @@ class RunAction : public G4UserRunAction
{
public:
RunAction();
~RunAction() override;
~RunAction() override = default;
void BeginOfRunAction(const G4Run* run) override;
void EndOfRunAction(const G4Run* run) override;
+4 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerHit.hh
/// \file B2/B2a/include/TrackerHit.hh
/// \brief Definition of the B2::TrackerHit class
#ifndef B2TrackerHit_h
@@ -48,9 +48,9 @@ namespace B2
class TrackerHit : public G4VHit
{
public:
TrackerHit();
TrackerHit() = default;
TrackerHit(const TrackerHit&) = default;
~TrackerHit() override;
~TrackerHit() override = default;
// operators
TrackerHit& operator=(const TrackerHit&) = default;
@@ -84,7 +84,7 @@ class TrackerHit : public G4VHit
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
typedef G4THitsCollection<TrackerHit> TrackerHitsCollection;
using TrackerHitsCollection = G4THitsCollection<TrackerHit>;
extern G4ThreadLocal G4Allocator<TrackerHit>* TrackerHitAllocator;
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerSD.hh
/// \file B2/B2a/include/TrackerSD.hh
/// \brief Definition of the B2::TrackerSD class
#ifndef B2TrackerSD_h
@@ -53,7 +53,7 @@ class TrackerSD : public G4VSensitiveDetector
public:
TrackerSD(const G4String& name,
const G4String& hitsCollectionName);
~TrackerSD() override;
~TrackerSD() override = default;
// methods from base class
void Initialize(G4HCofThisEvent* hitCollection) override;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.cc
/// \file B2/B2a/src/ActionInitialization.cc
/// \brief Implementation of the B2::ActionInitialization class
#include "ActionInitialization.hh"
@@ -37,16 +37,6 @@ namespace B2
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::~ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void ActionInitialization::BuildForMaster() const
{
SetUserAction(new RunAction);
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.cc
/// \file B2/B2a/src/DetectorConstruction.cc
/// \brief Implementation of the B2a::DetectorConstruction class
#include "DetectorConstruction.hh"
@@ -142,44 +142,37 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
<< G4GeometryTolerance::GetInstance()->GetSurfaceTolerance()/mm
<< " mm" << G4endl;
G4Box* worldS
= new G4Box("world", //its name
worldLength/2,worldLength/2,worldLength/2); //its size
G4LogicalVolume* worldLV
= new G4LogicalVolume(
worldS, //its solid
air, //its material
"World"); //its name
auto worldS = new G4Box("world", // its name
worldLength / 2, worldLength / 2, worldLength / 2); // its size
auto worldLV = new G4LogicalVolume(worldS, // its solid
air, // its material
"World"); // its name
// Must place the World Physical volume unrotated at (0,0,0).
//
G4VPhysicalVolume* worldPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
0, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
auto worldPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
// Target
G4ThreeVector positionTarget = G4ThreeVector(0,0,-(targetLength+trackerSize));
G4Tubs* targetS
= new G4Tubs("target",0.,targetRadius,targetLength,0.*deg,360.*deg);
fLogicTarget
= new G4LogicalVolume(targetS, fTargetMaterial,"Target",0,0,0);
new G4PVPlacement(0, // no rotation
positionTarget, // at (x,y,z)
fLogicTarget, // its logical volume
"Target", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
auto targetS = new G4Tubs("target", 0., targetRadius, targetLength, 0. * deg, 360. * deg);
fLogicTarget = new G4LogicalVolume(targetS, fTargetMaterial, "Target", nullptr, nullptr, nullptr);
new G4PVPlacement(nullptr, // no rotation
positionTarget, // at (x,y,z)
fLogicTarget, // its logical volume
"Target", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
G4cout << "Target is " << 2*targetLength/cm << " cm of "
<< fTargetMaterial->GetName() << G4endl;
@@ -188,23 +181,21 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
G4ThreeVector positionTracker = G4ThreeVector(0,0,0);
G4Tubs* trackerS
= new G4Tubs("tracker",0,trackerSize,trackerSize, 0.*deg, 360.*deg);
G4LogicalVolume* trackerLV
= new G4LogicalVolume(trackerS, air, "Tracker",0,0,0);
new G4PVPlacement(0, // no rotation
positionTracker, // at (x,y,z)
trackerLV, // its logical volume
"Tracker", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
auto trackerS = new G4Tubs("tracker", 0, trackerSize, trackerSize, 0. * deg, 360. * deg);
auto trackerLV = new G4LogicalVolume(trackerS, air, "Tracker", nullptr, nullptr, nullptr);
new G4PVPlacement(nullptr, // no rotation
positionTracker, // at (x,y,z)
trackerLV, // its logical volume
"Tracker", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
// Visualization attributes
G4VisAttributes* boxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
G4VisAttributes* chamberVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0));
auto boxVisAtt = new G4VisAttributes(G4Colour(1.0, 1.0, 1.0));
auto chamberVisAtt = new G4VisAttributes(G4Colour(1.0, 1.0, 0.0));
worldLV ->SetVisAttributes(boxVisAtt);
fLogicTarget ->SetVisAttributes(boxVisAtt);
@@ -241,23 +232,21 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
G4double Zposition = firstPosition + copyNo * chamberSpacing;
G4double rmax = rmaxFirst + copyNo * rmaxIncr;
G4Tubs* chamberS
= new G4Tubs("Chamber_solid", 0, rmax, halfWidth, 0.*deg, 360.*deg);
auto chamberS = new G4Tubs("Chamber_solid", 0, rmax, halfWidth, 0. * deg, 360. * deg);
fLogicChamber[copyNo] =
new G4LogicalVolume(chamberS,fChamberMaterial,"Chamber_LV",0,0,0);
new G4LogicalVolume(chamberS, fChamberMaterial, "Chamber_LV", nullptr, nullptr, nullptr);
fLogicChamber[copyNo]->SetVisAttributes(chamberVisAtt);
new G4PVPlacement(0, // no rotation
G4ThreeVector(0,0,Zposition), // at (x,y,z)
fLogicChamber[copyNo], // its logical volume
"Chamber_PV", // its name
trackerLV, // its mother volume
false, // no boolean operations
copyNo, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0, 0, Zposition), // at (x,y,z)
fLogicChamber[copyNo], // its logical volume
"Chamber_PV", // its name
trackerLV, // its mother volume
false, // no boolean operations
copyNo, // copy number
fCheckOverlaps); // checking overlaps
}
// Example of User Limits
@@ -291,8 +280,7 @@ void DetectorConstruction::ConstructSDandField()
// Sensitive detectors
G4String trackerChamberSDname = "/TrackerChamberSD";
TrackerSD* aTrackerSD = new TrackerSD(trackerChamberSDname,
"TrackerHitsCollection");
auto aTrackerSD = new TrackerSD(trackerChamberSDname, "TrackerHitsCollection");
G4SDManager::GetSDMpointer()->AddNewDetector(aTrackerSD);
// Setting aTrackerSD to all logical volumes with the same name
// of "Chamber_LV".
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorMessenger.cc
/// \file B2/B2a/src/DetectorMessenger.cc
/// \brief Implementation of the B2a::DetectorMessenger class
#include "DetectorMessenger.hh"
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.cc
/// \file B2/B2a/src/EventAction.cc
/// \brief Implementation of the B2::EventAction class
#include "EventAction.hh"
@@ -40,16 +40,6 @@ namespace B2
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::~EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventAction::BeginOfEventAction(const G4Event*)
{}
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.cc
/// \file B2/B2a/src/PrimaryGeneratorAction.cc
/// \brief Implementation of the B2::PrimaryGeneratorAction class
#include "PrimaryGeneratorAction.hh"
+1 -6
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.cc
/// \file B2/B2a/src/RunAction.cc
/// \brief Implementation of the B2::RunAction class
#include "RunAction.hh"
@@ -45,11 +45,6 @@ RunAction::RunAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunAction::~RunAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::BeginOfRunAction(const G4Run*)
{
//inform the runManager to save random number seed
+1 -10
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerHit.cc
/// \file B2/B2a/src/TrackerHit.cc
/// \brief Implementation of the B2::TrackerHit class
#include "TrackerHit.hh"
@@ -43,15 +43,6 @@ G4ThreadLocal G4Allocator<TrackerHit>* TrackerHitAllocator = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
TrackerHit::TrackerHit()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
TrackerHit::~TrackerHit() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4bool TrackerHit::operator==(const TrackerHit& right) const
{
return ( this == &right ) ? true : false;
+2 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerSD.cc
/// \file B2/B2a/src/TrackerSD.cc
/// \brief Implementation of the B2::TrackerSD class
#include "TrackerSD.hh"
@@ -48,11 +48,6 @@ TrackerSD::TrackerSD(const G4String& name,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
TrackerSD::~TrackerSD()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void TrackerSD::Initialize(G4HCofThisEvent* hce)
{
// Create hits collection
@@ -77,7 +72,7 @@ G4bool TrackerSD::ProcessHits(G4Step* aStep,
if (edep==0.) return false;
TrackerHit* newHit = new TrackerHit();
auto newHit = new TrackerHit();
newHit->SetTrackID (aStep->GetTrack()->GetTrackID());
newHit->SetChamberNb(aStep->GetPreStepPoint()->GetTouchableHandle()
+189 -181
View File
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
**************************************************************
Geant4 version Name: geant4-11-01-beta-01 (30-June-2022)
Geant4 version Name: geant4-11-01-ref-00 (9-December-2022)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
@@ -33,6 +33,8 @@ Registered graphics systems are:
RayTracer (RayTracer)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN, TSG_FILE)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
@@ -158,6 +160,7 @@ Apply cuts on all EM processes 0
Use combined TransportationWithMsc Disabled
Use general process 1
Enable linear polarisation for gamma 0
Enable photoeffect sampling below K-shell 1
Enable sampling of quantum entanglement 0
X-section factor for integral approach 0.8
Min kinetic energy for tables 100 eV
@@ -185,7 +188,7 @@ Lowest e+e- kinetic energy 1 keV
Lowest muon/hadron kinetic energy 1 keV
Use ICRU90 data 0
Fluctuations of dE/dx are enabled 1
Type of fluctuation model 2
Type of fluctuation model for leptons and hadrons Urban
Use built-in Birks satuaration 0
Build CSDA range enabled 0
Use cut as a final range enabled 0
@@ -236,8 +239,8 @@ conv: for gamma SubType=14 BuildTable=1
BetheHeitlerLPM : Emin= 0 eV Emax= 100 TeV ModifiedTsai
Rayl: for gamma SubType=11 BuildTable=1
Lambda table from 100 eV to 100 keV, 7 bins/decade, spline: 0
LambdaPrime table from 100 keV to 100 TeV in 63 bins
Lambda table from 100 eV to 150 keV, 7 bins/decade, spline: 0
LambdaPrime table from 150 keV to 100 TeV in 62 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermoreRayleigh : Emin= 0 eV Emax= 100 TeV CullenGenerator
@@ -719,6 +722,11 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_hypertriton
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_lambda
@@ -995,7 +1003,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 3
0 hits stored in this event
>>> Event: 4
0 hits stored in this event
32 hits stored in this event
>>> Event: 5
0 hits stored in this event
>>> Event: 6
@@ -1005,9 +1013,9 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 8
0 hits stored in this event
>>> Event: 9
0 hits stored in this event
41 hits stored in this event
>>> Event: 10
33 hits stored in this event
63 hits stored in this event
>>> Event: 11
0 hits stored in this event
>>> Event: 12
@@ -1017,7 +1025,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 14
0 hits stored in this event
>>> Event: 15
0 hits stored in this event
10 hits stored in this event
>>> Event: 16
0 hits stored in this event
>>> Event: 17
@@ -1031,15 +1039,15 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 21
0 hits stored in this event
>>> Event: 22
80 hits stored in this event
0 hits stored in this event
>>> Event: 23
0 hits stored in this event
>>> Event: 24
0 hits stored in this event
85 hits stored in this event
>>> Event: 25
0 hits stored in this event
>>> Event: 26
246 hits stored in this event
82 hits stored in this event
>>> Event: 27
0 hits stored in this event
>>> Event: 28
@@ -1047,7 +1055,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 29
0 hits stored in this event
>>> Event: 30
3 hits stored in this event
0 hits stored in this event
>>> Event: 31
0 hits stored in this event
>>> Event: 32
@@ -1055,7 +1063,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 33
0 hits stored in this event
>>> Event: 34
0 hits stored in this event
73 hits stored in this event
>>> Event: 35
0 hits stored in this event
>>> Event: 36
@@ -1073,9 +1081,9 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 42
0 hits stored in this event
>>> Event: 43
0 hits stored in this event
100 hits stored in this event
>>> Event: 44
31 hits stored in this event
0 hits stored in this event
>>> Event: 45
0 hits stored in this event
>>> Event: 46
@@ -1083,15 +1091,15 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 47
0 hits stored in this event
>>> Event: 48
65 hits stored in this event
0 hits stored in this event
>>> Event: 49
10 hits stored in this event
0 hits stored in this event
>>> Event: 50
0 hits stored in this event
>>> Event: 51
0 hits stored in this event
>>> Event: 52
108 hits stored in this event
12 hits stored in this event
>>> Event: 53
0 hits stored in this event
>>> Event: 54
@@ -1101,7 +1109,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 56
0 hits stored in this event
>>> Event: 57
139 hits stored in this event
0 hits stored in this event
>>> Event: 58
0 hits stored in this event
>>> Event: 59
@@ -1109,13 +1117,13 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 60
0 hits stored in this event
>>> Event: 61
13 hits stored in this event
0 hits stored in this event
>>> Event: 62
0 hits stored in this event
>>> Event: 63
0 hits stored in this event
>>> Event: 64
13 hits stored in this event
0 hits stored in this event
>>> Event: 65
0 hits stored in this event
>>> Event: 66
@@ -1125,23 +1133,23 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 68
0 hits stored in this event
>>> Event: 69
0 hits stored in this event
160 hits stored in this event
>>> Event: 70
85 hits stored in this event
0 hits stored in this event
>>> Event: 71
126 hits stored in this event
0 hits stored in this event
>>> Event: 72
0 hits stored in this event
>>> Event: 73
0 hits stored in this event
>>> Event: 74
226 hits stored in this event
170 hits stored in this event
>>> Event: 75
0 hits stored in this event
>>> Event: 76
0 hits stored in this event
55 hits stored in this event
>>> Event: 77
0 hits stored in this event
21 hits stored in this event
>>> Event: 78
0 hits stored in this event
>>> Event: 79
@@ -1155,9 +1163,9 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 83
0 hits stored in this event
>>> Event: 84
0 hits stored in this event
70 hits stored in this event
>>> Event: 85
12 hits stored in this event
0 hits stored in this event
>>> Event: 86
0 hits stored in this event
>>> Event: 87
@@ -1167,7 +1175,7 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 89
0 hits stored in this event
>>> Event: 90
34 hits stored in this event
0 hits stored in this event
>>> Event: 91
0 hits stored in this event
>>> Event: 92
@@ -1177,9 +1185,9 @@ See commands in /vis/modeling/trajectories/ for other options.
>>> Event: 94
0 hits stored in this event
>>> Event: 95
0 hits stored in this event
8 hits stored in this event
>>> Event: 96
0 hits stored in this event
7 hits stored in this event
>>> Event: 97
0 hits stored in this event
>>> Event: 98
@@ -1189,205 +1197,205 @@ See commands in /vis/modeling/trajectories/ for other options.
### Run 1 starts.
--> Event 0 starts.
>>> Event: 0
292 hits stored in this event
93 hits stored in this event
>>> Event: 1
141 hits stored in this event
89 hits stored in this event
>>> Event: 2
108 hits stored in this event
123 hits stored in this event
>>> Event: 3
291 hits stored in this event
520 hits stored in this event
>>> Event: 4
116 hits stored in this event
172 hits stored in this event
>>> Event: 5
80 hits stored in this event
162 hits stored in this event
>>> Event: 6
135 hits stored in this event
156 hits stored in this event
>>> Event: 7
66 hits stored in this event
>>> Event: 8
219 hits stored in this event
>>> Event: 9
117 hits stored in this event
>>> Event: 10
62 hits stored in this event
>>> Event: 11
547 hits stored in this event
>>> Event: 12
364 hits stored in this event
>>> Event: 13
990 hits stored in this event
>>> Event: 14
2138 hits stored in this event
>>> Event: 15
116 hits stored in this event
>>> Event: 16
1627 hits stored in this event
>>> Event: 17
1717 hits stored in this event
>>> Event: 18
58 hits stored in this event
>>> Event: 8
99 hits stored in this event
>>> Event: 9
69 hits stored in this event
>>> Event: 10
66 hits stored in this event
>>> Event: 11
201 hits stored in this event
>>> Event: 12
112 hits stored in this event
>>> Event: 13
111 hits stored in this event
>>> Event: 14
619 hits stored in this event
>>> Event: 15
209 hits stored in this event
>>> Event: 16
338 hits stored in this event
>>> Event: 17
67 hits stored in this event
>>> Event: 18
130 hits stored in this event
>>> Event: 19
346 hits stored in this event
557 hits stored in this event
>>> Event: 20
75 hits stored in this event
100 hits stored in this event
>>> Event: 21
850 hits stored in this event
732 hits stored in this event
>>> Event: 22
59 hits stored in this event
98 hits stored in this event
>>> Event: 23
1096 hits stored in this event
158 hits stored in this event
>>> Event: 24
78 hits stored in this event
85 hits stored in this event
>>> Event: 25
488 hits stored in this event
>>> Event: 26
90 hits stored in this event
>>> Event: 26
194 hits stored in this event
>>> Event: 27
479 hits stored in this event
139 hits stored in this event
>>> Event: 28
86 hits stored in this event
>>> Event: 29
222 hits stored in this event
>>> Event: 30
71 hits stored in this event
>>> Event: 29
155 hits stored in this event
>>> Event: 30
50 hits stored in this event
>>> Event: 31
81 hits stored in this event
217 hits stored in this event
>>> Event: 32
65 hits stored in this event
129 hits stored in this event
>>> Event: 33
138 hits stored in this event
57 hits stored in this event
>>> Event: 34
73 hits stored in this event
68 hits stored in this event
>>> Event: 35
95 hits stored in this event
58 hits stored in this event
>>> Event: 36
64 hits stored in this event
46 hits stored in this event
>>> Event: 37
52 hits stored in this event
94 hits stored in this event
>>> Event: 38
102 hits stored in this event
99 hits stored in this event
>>> Event: 39
63 hits stored in this event
657 hits stored in this event
>>> Event: 40
125 hits stored in this event
68 hits stored in this event
>>> Event: 41
88 hits stored in this event
>>> Event: 42
532 hits stored in this event
>>> Event: 43
107 hits stored in this event
>>> Event: 44
349 hits stored in this event
>>> Event: 45
49 hits stored in this event
>>> Event: 43
77 hits stored in this event
>>> Event: 44
409 hits stored in this event
>>> Event: 45
155 hits stored in this event
>>> Event: 46
91 hits stored in this event
115 hits stored in this event
>>> Event: 47
47 hits stored in this event
132 hits stored in this event
>>> Event: 48
79 hits stored in this event
582 hits stored in this event
>>> Event: 49
206 hits stored in this event
62 hits stored in this event
>>> Event: 50
67 hits stored in this event
77 hits stored in this event
>>> Event: 51
45 hits stored in this event
92 hits stored in this event
>>> Event: 52
78 hits stored in this event
75 hits stored in this event
>>> Event: 53
3204 hits stored in this event
>>> Event: 54
99 hits stored in this event
>>> Event: 55
101 hits stored in this event
>>> Event: 56
69 hits stored in this event
>>> Event: 57
115 hits stored in this event
>>> Event: 58
112 hits stored in this event
>>> Event: 59
159 hits stored in this event
>>> Event: 60
194 hits stored in this event
>>> Event: 61
78 hits stored in this event
>>> Event: 62
308 hits stored in this event
>>> Event: 63
83 hits stored in this event
>>> Event: 64
118 hits stored in this event
>>> Event: 65
3220 hits stored in this event
>>> Event: 66
113 hits stored in this event
>>> Event: 67
3635 hits stored in this event
>>> Event: 68
393 hits stored in this event
>>> Event: 69
163 hits stored in this event
>>> Event: 70
216 hits stored in this event
>>> Event: 71
114 hits stored in this event
>>> Event: 72
130 hits stored in this event
>>> Event: 73
123 hits stored in this event
>>> Event: 74
142 hits stored in this event
>>> Event: 75
134 hits stored in this event
>>> Event: 76
81 hits stored in this event
>>> Event: 77
128 hits stored in this event
>>> Event: 78
48 hits stored in this event
>>> Event: 79
90 hits stored in this event
>>> Event: 80
153 hits stored in this event
>>> Event: 81
115 hits stored in this event
>>> Event: 82
181 hits stored in this event
>>> Event: 83
63 hits stored in this event
>>> Event: 84
64 hits stored in this event
>>> Event: 85
116 hits stored in this event
>>> Event: 86
61 hits stored in this event
>>> Event: 87
175 hits stored in this event
>>> Event: 88
55 hits stored in this event
>>> Event: 89
70 hits stored in this event
>>> Event: 90
140 hits stored in this event
>>> Event: 91
810 hits stored in this event
>>> Event: 92
>>> Event: 54
231 hits stored in this event
>>> Event: 55
92 hits stored in this event
>>> Event: 56
207 hits stored in this event
>>> Event: 57
108 hits stored in this event
>>> Event: 58
105 hits stored in this event
>>> Event: 59
54 hits stored in this event
>>> Event: 60
86 hits stored in this event
>>> Event: 61
79 hits stored in this event
>>> Event: 62
498 hits stored in this event
>>> Event: 63
184 hits stored in this event
>>> Event: 64
63 hits stored in this event
>>> Event: 65
158 hits stored in this event
>>> Event: 66
69 hits stored in this event
>>> Event: 67
166 hits stored in this event
>>> Event: 68
116 hits stored in this event
>>> Event: 69
1574 hits stored in this event
>>> Event: 70
75 hits stored in this event
>>> Event: 71
949 hits stored in this event
>>> Event: 72
319 hits stored in this event
>>> Event: 73
61 hits stored in this event
>>> Event: 74
72 hits stored in this event
>>> Event: 75
148 hits stored in this event
>>> Event: 76
83 hits stored in this event
>>> Event: 77
71 hits stored in this event
>>> Event: 78
78 hits stored in this event
>>> Event: 79
125 hits stored in this event
>>> Event: 80
66 hits stored in this event
>>> Event: 81
86 hits stored in this event
>>> Event: 82
96 hits stored in this event
>>> Event: 83
66 hits stored in this event
>>> Event: 84
79 hits stored in this event
>>> Event: 85
96 hits stored in this event
>>> Event: 86
94 hits stored in this event
>>> Event: 87
213 hits stored in this event
>>> Event: 88
91 hits stored in this event
>>> Event: 89
63 hits stored in this event
>>> Event: 90
63 hits stored in this event
>>> Event: 91
82 hits stored in this event
>>> Event: 92
371 hits stored in this event
>>> Event: 93
241 hits stored in this event
165 hits stored in this event
>>> Event: 94
70 hits stored in this event
84 hits stored in this event
>>> Event: 95
141 hits stored in this event
86 hits stored in this event
>>> Event: 96
156 hits stored in this event
61 hits stored in this event
>>> Event: 97
750 hits stored in this event
176 hits stored in this event
>>> Event: 98
114 hits stored in this event
361 hits stored in this event
>>> Event: 99
128 hits stored in this event
108 hits stored in this event
### Run 2 starts.
--> Event 0 starts.
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.hh
/// \file B2/B2b/include/ActionInitialization.hh
/// \brief Definition of the B2::ActionInitialization class
#ifndef B2ActionInitialization_h
@@ -40,8 +40,8 @@ namespace B2
class ActionInitialization : public G4VUserActionInitialization
{
public:
ActionInitialization();
~ActionInitialization() override;
ActionInitialization() = default;
~ActionInitialization() override = default;
void BuildForMaster() const override;
void Build() const override;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ChamberParameterisation.hh
/// \file B2/B2b/include/ChamberParameterisation.hh
/// \brief Definition of the B2b::ChamberParameterisation class
#ifndef B2bChamberParameterisation_h
@@ -69,7 +69,7 @@ class ChamberParameterisation : public G4VPVParameterisation
G4double lengthInitial,
G4double lengthFinal );
~ChamberParameterisation() override;
~ChamberParameterisation() override = default;
void ComputeTransformation (const G4int copyNo,
G4VPhysicalVolume* physVol) const override;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.hh
/// \file B2/B2b/include/DetectorConstruction.hh
/// \brief Definition of the B2b::DetectorConstruction class
#ifndef B2bDetectorConstruction_h
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorMessenger.hh
/// \file B2/B2b/include/DetectorMessenger.hh
/// \brief Definition of the B2b::DetectorMessenger class
#ifndef B2bDetectorMessenger_h
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.hh
/// \file B2/B2b/include/EventAction.hh
/// \brief Definition of the B2::EventAction class
#ifndef B2EventAction_h
@@ -42,8 +42,8 @@ namespace B2
class EventAction : public G4UserEventAction
{
public:
EventAction();
~EventAction() override;
EventAction() = default;
~EventAction() override = default;
void BeginOfEventAction(const G4Event* ) override;
void EndOfEventAction(const G4Event* ) override;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.hh
/// \file B2/B2b/include/PrimaryGeneratorAction.hh
/// \brief Definition of the B2::PrimaryGeneratorAction class
#ifndef B2PrimaryGeneratorAction_h
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.hh
/// \file B2/B2b/include/RunAction.hh
/// \brief Definition of the B2::RunAction class
#ifndef B2RunAction_h
@@ -44,7 +44,7 @@ class RunAction : public G4UserRunAction
{
public:
RunAction();
~RunAction() override;
~RunAction() override = default;
void BeginOfRunAction(const G4Run* run) override;
void EndOfRunAction(const G4Run* run) override;
+4 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerHit.hh
/// \file B2/B2b/include/TrackerHit.hh
/// \brief Definition of the B2::TrackerHit class
#ifndef B2TrackerHit_h
@@ -48,9 +48,9 @@ namespace B2
class TrackerHit : public G4VHit
{
public:
TrackerHit();
TrackerHit() = default;
TrackerHit(const TrackerHit&) = default;
~TrackerHit() override;
~TrackerHit() override = default;
// operators
TrackerHit& operator=(const TrackerHit&) = default;
@@ -84,7 +84,7 @@ class TrackerHit : public G4VHit
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
typedef G4THitsCollection<TrackerHit> TrackerHitsCollection;
using TrackerHitsCollection = G4THitsCollection<TrackerHit>;
extern G4ThreadLocal G4Allocator<TrackerHit>* TrackerHitAllocator;
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerSD.hh
/// \file B2/B2b/include/TrackerSD.hh
/// \brief Definition of the B2::TrackerSD class
#ifndef B2TrackerSD_h
@@ -53,7 +53,7 @@ class TrackerSD : public G4VSensitiveDetector
public:
TrackerSD(const G4String& name,
const G4String& hitsCollectionName);
~TrackerSD() override;
~TrackerSD() override = default;
// methods from base class
void Initialize(G4HCofThisEvent* hitCollection) override;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.cc
/// \file B2/B2b/src/ActionInitialization.cc
/// \brief Implementation of the B2::ActionInitialization class
#include "ActionInitialization.hh"
@@ -37,16 +37,6 @@ namespace B2
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::~ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void ActionInitialization::BuildForMaster() const
{
SetUserAction(new RunAction);
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ChamberParameterisation.cc
/// \file B2/B2b/src/ChamberParameterisation.cc
/// \brief Implementation of the B2b::ChamberParameterisation class
#include "ChamberParameterisation.hh"
@@ -64,11 +64,6 @@ ChamberParameterisation::ChamberParameterisation(
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ChamberParameterisation::~ChamberParameterisation()
{ }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void ChamberParameterisation::ComputeTransformation
(const G4int copyNo, G4VPhysicalVolume* physVol) const
{
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.cc
/// \file B2/B2b/src/DetectorConstruction.cc
/// \brief Implementation of the B2b::DetectorConstruction class
#include "DetectorConstruction.hh"
@@ -141,44 +141,37 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
<< G4GeometryTolerance::GetInstance()->GetSurfaceTolerance()/mm
<< " mm" << G4endl;
G4Box* worldS
= new G4Box("world", //its name
worldLength/2,worldLength/2,worldLength/2); //its size
G4LogicalVolume* worldLV
= new G4LogicalVolume(
worldS, //its solid
air, //its material
"World"); //its name
auto worldS = new G4Box("world", // its name
worldLength / 2, worldLength / 2, worldLength / 2); // its size
auto worldLV = new G4LogicalVolume(worldS, // its solid
air, // its material
"World"); // its name
// Must place the World Physical volume unrotated at (0,0,0).
//
G4VPhysicalVolume* worldPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
0, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
auto worldPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
// Target
G4ThreeVector positionTarget = G4ThreeVector(0,0,-(targetLength+trackerSize));
G4Tubs* targetS
= new G4Tubs("target",0.,targetRadius,targetLength,0.*deg,360.*deg);
fLogicTarget
= new G4LogicalVolume(targetS, fTargetMaterial,"Target",0,0,0);
new G4PVPlacement(0, // no rotation
positionTarget, // at (x,y,z)
fLogicTarget, // its logical volume
"Target", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
auto targetS = new G4Tubs("target", 0., targetRadius, targetLength, 0. * deg, 360. * deg);
fLogicTarget = new G4LogicalVolume(targetS, fTargetMaterial, "Target", nullptr, nullptr, nullptr);
new G4PVPlacement(nullptr, // no rotation
positionTarget, // at (x,y,z)
fLogicTarget, // its logical volume
"Target", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
G4cout << "Target is " << 2*targetLength/cm << " cm of "
<< fTargetMaterial->GetName() << G4endl;
@@ -187,28 +180,25 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
G4ThreeVector positionTracker = G4ThreeVector(0,0,0);
G4Tubs* trackerS
= new G4Tubs("tracker",0,trackerSize,trackerSize, 0.*deg, 360.*deg);
G4LogicalVolume* trackerLV
= new G4LogicalVolume(trackerS, air, "Tracker",0,0,0);
new G4PVPlacement(0, // no rotation
positionTracker, // at (x,y,z)
trackerLV, // its logical volume
"Tracker", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
auto trackerS = new G4Tubs("tracker", 0, trackerSize, trackerSize, 0. * deg, 360. * deg);
auto trackerLV = new G4LogicalVolume(trackerS, air, "Tracker", nullptr, nullptr, nullptr);
new G4PVPlacement(nullptr, // no rotation
positionTracker, // at (x,y,z)
trackerLV, // its logical volume
"Tracker", // its name
worldLV, // its mother volume
false, // no boolean operations
0, // copy number
fCheckOverlaps); // checking overlaps
// Tracker segments
// An example of Parameterised volumes
// Dummy values for G4Tubs -- modified by parameterised volume
G4Tubs* chamberS
= new G4Tubs("tracker",0, 100*cm, 100*cm, 0.*deg, 360.*deg);
fLogicChamber
= new G4LogicalVolume(chamberS,fChamberMaterial,"Chamber",0,0,0);
auto chamberS = new G4Tubs("tracker", 0, 100 * cm, 100 * cm, 0. * deg, 360. * deg);
fLogicChamber =
new G4LogicalVolume(chamberS, fChamberMaterial, "Chamber", nullptr, nullptr, nullptr);
G4double firstPosition = -trackerSize + chamberSpacing;
G4double firstLength = trackerLength/10;
@@ -242,12 +232,12 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
// Visualization attributes
G4VisAttributes* boxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
auto boxVisAtt = new G4VisAttributes(G4Colour(1.0, 1.0, 1.0));
worldLV ->SetVisAttributes(boxVisAtt);
fLogicTarget ->SetVisAttributes(boxVisAtt);
trackerLV ->SetVisAttributes(boxVisAtt);
G4VisAttributes* chamberVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0));
auto chamberVisAtt = new G4VisAttributes(G4Colour(1.0, 1.0, 0.0));
fLogicChamber->SetVisAttributes(chamberVisAtt);
// Example of User Limits
@@ -281,8 +271,7 @@ void DetectorConstruction::ConstructSDandField()
// Sensitive detectors
G4String trackerChamberSDname = "B2/TrackerChamberSD";
TrackerSD* aTrackerSD = new TrackerSD(trackerChamberSDname,
"TrackerHitsCollection");
auto aTrackerSD = new TrackerSD(trackerChamberSDname, "TrackerHitsCollection");
G4SDManager::GetSDMpointer()->AddNewDetector(aTrackerSD);
SetSensitiveDetector( fLogicChamber, aTrackerSD );
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorMessenger.cc
/// \file B2/B2b/src/DetectorMessenger.cc
/// \brief Implementation of the B2b::DetectorMessenger class
#include "DetectorMessenger.hh"
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.cc
/// \file B2/B2b/src/EventAction.cc
/// \brief Implementation of the B2::EventAction class
#include "EventAction.hh"
@@ -40,16 +40,6 @@ namespace B2
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::~EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventAction::BeginOfEventAction(const G4Event*)
{}
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.cc
/// \file B2/B2b/src/PrimaryGeneratorAction.cc
/// \brief Implementation of the B2::PrimaryGeneratorAction class
#include "PrimaryGeneratorAction.hh"
+1 -6
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.cc
/// \file B2/B2b/src/RunAction.cc
/// \brief Implementation of the B2::RunAction class
#include "RunAction.hh"
@@ -45,11 +45,6 @@ RunAction::RunAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunAction::~RunAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::BeginOfRunAction(const G4Run*)
{
//inform the runManager to save random number seed
+1 -10
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerHit.cc
/// \file B2/B2b/src/TrackerHit.cc
/// \brief Implementation of the B2::TrackerHit class
#include "TrackerHit.hh"
@@ -43,15 +43,6 @@ G4ThreadLocal G4Allocator<TrackerHit>* TrackerHitAllocator = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
TrackerHit::TrackerHit()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
TrackerHit::~TrackerHit() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4bool TrackerHit::operator==(const TrackerHit& right) const
{
return ( this == &right ) ? true : false;
+2 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file TrackerSD.cc
/// \file B2/B2b/src/TrackerSD.cc
/// \brief Implementation of the B2::TrackerSD class
#include "TrackerSD.hh"
@@ -48,11 +48,6 @@ TrackerSD::TrackerSD(const G4String& name,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
TrackerSD::~TrackerSD()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void TrackerSD::Initialize(G4HCofThisEvent* hce)
{
// Create hits collection
@@ -77,7 +72,7 @@ G4bool TrackerSD::ProcessHits(G4Step* aStep,
if (edep==0.) return false;
TrackerHit* newHit = new TrackerHit();
auto newHit = new TrackerHit();
newHit->SetTrackID (aStep->GetTrack()->GetTrackID());
newHit->SetChamberNb(aStep->GetPreStepPoint()->GetTouchableHandle()