Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Lawrence Davou Christopher
athena
Commits
4ecc1c68
Commit
4ecc1c68
authored
6 years ago
by
lawrenceleejr
Browse files
Options
Downloads
Patches
Plain Diff
G4Extensions: Fixing typo for G4 console output
Former-commit-id: 248e659b8d8a8c714cb36ce0c7832abae50f4b40
parent
44beea96
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Simulation/G4Extensions/G4ExternalDecay/src/Pythia8ForDecays.cxx
+2
-2
2 additions, 2 deletions
...ion/G4Extensions/G4ExternalDecay/src/Pythia8ForDecays.cxx
Simulation/G4Extensions/RHadrons/src/RHadronPythiaDecayer.cxx
+4
-4
4 additions, 4 deletions
...lation/G4Extensions/RHadrons/src/RHadronPythiaDecayer.cxx
with
6 additions
and
6 deletions
Simulation/G4Extensions/G4ExternalDecay/src/Pythia8ForDecays.cxx
+
2
−
2
View file @
4ecc1c68
...
@@ -223,7 +223,7 @@ void Pythia8ForDecays::Py1ent(const G4Track& aTrack, std::vector<G4DynamicPartic
...
@@ -223,7 +223,7 @@ void Pythia8ForDecays::Py1ent(const G4Track& aTrack, std::vector<G4DynamicPartic
double
fracR
=
mRBef
/
mRHad
;
double
fracR
=
mRBef
/
mRHad
;
if
(
fracR
>=
1.
){
if
(
fracR
>=
1.
){
g
4cout
<<
"R-Hadron mass is smaller than (or the same as) the constituent sparticle! Something must be wrong!"
<<
g
4endl
;
G
4cout
<<
"R-Hadron mass is smaller than (or the same as) the constituent sparticle! Something must be wrong!"
<<
G
4endl
;
return
;
return
;
}
}
...
@@ -280,7 +280,7 @@ void Pythia8ForDecays::Py1ent(const G4Track& aTrack, std::vector<G4DynamicPartic
...
@@ -280,7 +280,7 @@ void Pythia8ForDecays::Py1ent(const G4Track& aTrack, std::vector<G4DynamicPartic
const
G4ParticleDefinition
*
particleDefinition
=
GetParticleDefinition
(
m_pythia
->
event
[
i
].
id
()
);
const
G4ParticleDefinition
*
particleDefinition
=
GetParticleDefinition
(
m_pythia
->
event
[
i
].
id
()
);
if
(
!
particleDefinition
){
if
(
!
particleDefinition
){
g
4cout
<<
"I don't know a definition for pdgid "
<<
m_pythia
->
event
[
i
].
id
()
<<
"! Skipping it..."
<<
g
4endl
;
G
4cout
<<
"I don't know a definition for pdgid "
<<
m_pythia
->
event
[
i
].
id
()
<<
"! Skipping it..."
<<
G
4endl
;
continue
;
continue
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Simulation/G4Extensions/RHadrons/src/RHadronPythiaDecayer.cxx
+
4
−
4
View file @
4ecc1c68
...
@@ -53,7 +53,7 @@ G4DecayProducts* RHadronPythiaDecayer::ImportDecayProducts(const G4Track& aTrack
...
@@ -53,7 +53,7 @@ G4DecayProducts* RHadronPythiaDecayer::ImportDecayProducts(const G4Track& aTrack
PythiaForDecays
::
Instance
()
->
ImportParticles
(
particles
);
PythiaForDecays
::
Instance
()
->
ImportParticles
(
particles
);
}
}
g
4cout
<<
"Decayed an RHadron with ID "
<<
pdgEncoding
<<
" and momentum "
<<
aTrack
.
GetMomentum
()
<<
" in Pythia. Decay products are:"
<<
g
4endl
;
G
4cout
<<
"Decayed an RHadron with ID "
<<
pdgEncoding
<<
" and momentum "
<<
aTrack
.
GetMomentum
()
<<
" in Pythia. Decay products are:"
<<
G
4endl
;
double
totalE
=
0.0
;
double
totalE
=
0.0
;
for
(
unsigned
int
i
=
0
;
i
<
particles
.
size
();
++
i
){
for
(
unsigned
int
i
=
0
;
i
<
particles
.
size
();
++
i
){
if
(
particles
[
i
])
{
if
(
particles
[
i
])
{
...
@@ -61,12 +61,12 @@ G4DecayProducts* RHadronPythiaDecayer::ImportDecayProducts(const G4Track& aTrack
...
@@ -61,12 +61,12 @@ G4DecayProducts* RHadronPythiaDecayer::ImportDecayProducts(const G4Track& aTrack
totalE
+=
particles
[
i
]
->
GetTotalEnergy
();
totalE
+=
particles
[
i
]
->
GetTotalEnergy
();
}
}
else
{
else
{
g
4cout
<<
i
<<
" null pointer!"
<<
g
4endl
;
G
4cout
<<
i
<<
" null pointer!"
<<
G
4endl
;
}
}
}
}
g
4cout
<<
"Total energy in was "
<<
etot
<<
g
4endl
;
G
4cout
<<
"Total energy in was "
<<
etot
<<
G
4endl
;
g
4cout
<<
"Total energy out is "
<<
totalE
<<
g
4endl
;
G
4cout
<<
"Total energy out is "
<<
totalE
<<
G
4endl
;
dp
->
DumpInfo
();
dp
->
DumpInfo
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment