Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eicd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
eicd
Commits
b3d67f74
Commit
b3d67f74
authored
Feb 21, 2022
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
finish first rework, WIP
parent
9503ad04
No related branches found
No related tags found
1 merge request
!72
Simplify the data model to converge towards EDM4hep
Pipeline
#28216
failed
Feb 21, 2022
Stage: config
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
eic_data.yaml
+0
-28
0 additions, 28 deletions
eic_data.yaml
utils/include/eicd/vector_utils.h
+5
-2
5 additions, 2 deletions
utils/include/eicd/vector_utils.h
with
5 additions
and
30 deletions
eic_data.yaml
+
0
−
28
View file @
b3d67f74
...
...
@@ -349,30 +349,9 @@ datatypes:
-
float timeError // Error on the time
-
eic::VectorXYZ position // The global position of the hit in world coordinates [mm].
-
eic::VectorXYZ dimension // The dimension information of the cell [mm].
## TODO: deterimine if position/dimension is really what we want
## compared to position/positionError for consistency with TrackerHit
#
#
eic::CalorimeterHitLocPos
:
Description
:
"
Local
position
info
associated
with
a
calorimeter
hit"
Author
:
"
S.
Joosten"
Members
:
-
int32_t sector // Sector that this hit occured in
-
int32_t layer // Layer that the hit occured in
-
eic::VectorXYZ local // The local coordinates of the hit in the detector segment [mm].
OneToOneRelations
:
-
eic::CalorimeterHit hit // Associated calorimeter hit
ConstExtraCode
:
includes
:
"
#include
<eicd/CalorimeterHitConst.h>"
declaration
:
"
uint64_t
cellID()
const
{return
hit().cellID();}
\n
float
energy()
const
{return
hit().energy();}
\n
float
energyError()
const
{return
hit().energyError();}
\n
float
time()
const
{return
hit().time();}
\n
float
timeError()
const
{return
hit().timeError();}
\n
const
eic::VectorXYZ&
position()
const
{return
hit().position();}
\n
const
eic::VectorXYZ&
dimension()
const
{return
hit().dimension();}
\n
"
## ==========================================================================
## Clustering
...
...
@@ -402,13 +381,6 @@ datatypes:
-
float intrinsicTheta // Intrinsic cluster propagation direction polar angle [rad]
-
float intrinsicPhi // Intrinsic cluster propagation direction azimuthal angle [rad]
-
eic::CovXY intrinsicDirectionError // Error on the intrinsic cluster propagation direction
# extra utility variables to facilitate analysis
-
float theta // Cluster polar angle
-
float phi // Cluster azimuthal angle
-
float eta // Cluster pseudorapidity
# this link is deprecated and will be replaced with a more EDM4hep-style link
# TODO
-
eic::Index mcID // For MC only - associated MC particle
VectorMembers
:
-
float shapeParameters // Should be set in metadata, for now radius/skewness
-
float hitContributions // Energy contributions of the hits. Runs parallel to ::hits()
...
...
This diff is collapsed.
Click to expand it.
utils/include/eicd/vector_utils.h
+
5
−
2
View file @
b3d67f74
...
...
@@ -21,10 +21,13 @@ namespace eicd {
template
<
class
V
>
concept
VectorHasX
=
requires
(
V
v
)
{
v
.
x
;
};
template
<
class
V
>
concept
VectorHasY
=
requires
(
V
v
)
{
v
.
y
;
};
template
<
class
V
>
concept
VectorHasZ
=
requires
(
V
v
)
{
v
.
z
;
};
template
<
class
V
>
concept
ClassVector
=
requires
(
V
v
)
{
v
.
x
();
};
template
<
class
V
>
concept
Vector2D
=
VectorHasX
<
V
>&&
VectorHasY
<
V
>
&&
!
VectorHasZ
<
V
>
;
concept
Vector2D
=
VectorHasX
<
V
>&&
VectorHasY
<
V
>
&&
!
VectorHasZ
<
V
>
&&
!
ClassVector
<
V
>
;
template
<
class
V
>
concept
Vector3D
=
VectorHasX
<
V
>&&
VectorHasY
<
V
>&&
VectorHasZ
<
V
>
;
concept
Vector3D
=
VectorHasX
<
V
>&&
VectorHasY
<
V
>&&
VectorHasZ
<
V
>
&&
!
ClassVector
<
V
>
;
template
<
class
V
>
concept
VectorND
=
Vector2D
<
V
>
||
Vector3D
<
V
>
;
inline
double
etaToAngle
(
const
double
eta
)
{
...
...
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