Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
atlas
athena
Commits
6e4adcc1
Commit
6e4adcc1
authored
1 year ago
by
Your Name
Browse files
Options
Downloads
Patches
Plain Diff
adding keepStrongVertices option, see
ATLHI-483
parent
c015f615
Loading
Loading
1 merge request
!65251
adding keepStrongVertices option, see ATLHI-483
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Generators/Hijing_i/Hijing_i/Hijing.h
+1
-0
1 addition, 0 deletions
Generators/Hijing_i/Hijing_i/Hijing.h
Generators/Hijing_i/src/Hijing.cxx
+6
-4
6 additions, 4 deletions
Generators/Hijing_i/src/Hijing.cxx
with
7 additions
and
4 deletions
Generators/Hijing_i/Hijing_i/Hijing.h
+
1
−
0
View file @
6e4adcc1
...
...
@@ -81,6 +81,7 @@ protected:
bool
m_rand
{
false
};
bool
m_wide
{
false
};
// True allows particles with x,y distributions
bool
m_prand
{
false
};
//BPK mirror event randomly
bool
m_keepAllDecayVertices
{
true
};
// Limit settings
double
m_partonStoreMinPt
{
5.0
};
...
...
This diff is collapsed.
Click to expand it.
Generators/Hijing_i/src/Hijing.cxx
+
6
−
4
View file @
6e4adcc1
...
...
@@ -17,6 +17,7 @@
// - this fixed bug #30991 for release 13.1.0 and for HepMC 2.3.0 where the 'set's comparison operates
// on the barcode rather than on the pointer.
// 2008-Jul Borut Kersevan: randomizing the left<->right direction by mirroring momenta settable in jobOpts for beamgas
// 2023-Aug Aaron Angerami: adding keepAllDecayVertices option to keep decay vertices for strong decays (default=true)
#include
"Hijing_i/Hijing.h"
#include
"Hijing_i/VertexShift.h"
...
...
@@ -78,6 +79,7 @@ Hijing::Hijing(const std::string& name,
declareProperty
(
"z"
,
m_z
);
declareProperty
(
"keepSpectators"
,
m_spec
);
declareProperty
(
"randomizeP"
,
m_prand
);
//BPK randomizes the left<->right direction by mirroring momenta for beam gas
declareProperty
(
"keepAllDecayVertices"
,
m_keepAllDecayVertices
);
}
StatusCode
Hijing
::
genInitialize
()
...
...
@@ -344,7 +346,7 @@ Hijing::fillEvt(HepMC::GenEvent* evt)
v1
->
add_particle_in
(
part_t
);
evt
->
set_beam_particles
(
part_p
,
part_t
);
ATH_MSG_INFO
(
"So far so good"
);
ATH_MSG_DEBUG
(
"Hijing particles for event # "
<<
m_events
<<
":
\n
"
<<
" px, "
<<
" py, "
...
...
@@ -472,7 +474,6 @@ Hijing::fillEvt(HepMC::GenEvent* evt)
// Now compare the distance between the vertex FROM which the parent originates and the
// start of this particle
//
HepGeom
::
Point3D
<
double
>
vertex_pos
(
vertexPtrVec
[
parentOriginIndex
]
->
position
().
x
(),
vertexPtrVec
[
parentOriginIndex
]
->
position
().
y
(),
vertexPtrVec
[
parentOriginIndex
]
->
position
().
z
());
...
...
@@ -503,12 +504,12 @@ Hijing::fillEvt(HepMC::GenEvent* evt)
particleVertexIndex
=
parentOriginIndex
;
//std::cout << "ML-> case 2 distane = " << distance <<" particleVertexIndex = "<<particleVertexIndex<< std::endl;
}
if
(
distance
>
m_vertexOffsetCut
||
parentOriginIndex
!=
0
)
if
(
parentIndex
!=-
1
&&
((
distance
>
m_vertexOffsetCut
||
parentOriginIndex
!=
0
)
||
m_keepAllDecayVertices
)
)
{
// We need to create a new vertex
//
HepMC
::
GenVertexPtr
newVertex_p
=
HepMC
::
newGenVertexPtr
(
HepMC
::
FourVector
(
particleStart
.
x
(),
particleStart
.
y
(),
particleStart
.
z
(),
particleStart
.
t
()));
evt
->
add_vertex
(
newVertex_p
);
evt
->
add_vertex
(
newVertex_p
);
vertexPtrVec
.
push_back
(
newVertex_p
);
particleVertexIndex
=
vertexPtrVec
.
size
()
-
1
;
...
...
@@ -518,6 +519,7 @@ Hijing::fillEvt(HepMC::GenEvent* evt)
// Now tell the vertex about the particle that created it
//
newVertex_p
->
add_particle_in
(
particleHepPartPtr_vec
[
parentIndex
]);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Vakhtang Tsulaia
@tsulaia
mentioned in commit
12ad2ef5
·
1 year ago
mentioned in commit
12ad2ef5
mentioned in commit 12ad2ef5d824e9933e850e58dc8a1d92e1f29f62
Toggle commit list
John Derek Chapman
@jchapman
mentioned in merge request
!65676 (merged)
·
1 year ago
mentioned in merge request
!65676 (merged)
mentioned in merge request !65676
Toggle commit list
John Derek Chapman
@jchapman
mentioned in commit
8ae88cba
·
1 year ago
mentioned in commit
8ae88cba
mentioned in commit 8ae88cba5212a541cc3ff97a9c2c4976b1fe93bd
Toggle commit list
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