Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project Juggler
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
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
EIC
Project Juggler
Commits
f3f8708a
Commit
f3f8708a
authored
1 year ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: support EDM4eic v3 TrackPoint
parent
42f07f4b
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!517
feat: support EDM4eic v3 TrackPoint
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
JugTrack/src/components/TrackProjector.cpp
+10
-0
10 additions, 0 deletions
JugTrack/src/components/TrackProjector.cpp
external/algorithms/acts/include/algorithms/acts/TrackProjector.h
+10
-0
10 additions, 0 deletions
.../algorithms/acts/include/algorithms/acts/TrackProjector.h
with
20 additions
and
0 deletions
JugTrack/src/components/TrackProjector.cpp
+
10
−
0
View file @
f3f8708a
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include
"Acts/EventData/MultiTrajectoryHelpers.hpp"
#include
"Acts/EventData/MultiTrajectoryHelpers.hpp"
// Event Model related classes
// Event Model related classes
#include
"edm4eic/EDM4eicVersion.h"
#include
"edm4eic/TrackerHitCollection.h"
#include
"edm4eic/TrackerHitCollection.h"
#include
"edm4eic/TrackParametersCollection.h"
#include
"edm4eic/TrackParametersCollection.h"
#include
"edm4eic/TrajectoryCollection.h"
#include
"edm4eic/TrajectoryCollection.h"
...
@@ -178,8 +179,17 @@ namespace Jug::Reco {
...
@@ -178,8 +179,17 @@ namespace Jug::Reco {
const
float
pathLength
=
static_cast
<
float
>
(
trackstate
.
pathLength
());
const
float
pathLength
=
static_cast
<
float
>
(
trackstate
.
pathLength
());
const
float
pathLengthError
=
0
;
const
float
pathLengthError
=
0
;
#if EDM4EIC_VERSION_MAJOR >= 3
uint64_t
surface
=
0
;
// trackstate.referenceSurface().geometryId().value(); FIXME - ASAN is not happy with this
uint32_t
system
=
0
;
#endif
// Store track point
// Store track point
track_segment
.
addToPoints
({
track_segment
.
addToPoints
({
#if EDM4EIC_VERSION_MAJOR >= 3
surface
,
system
,
#endif
position
,
position
,
positionError
,
positionError
,
momentum
,
momentum
,
...
...
This diff is collapsed.
Click to expand it.
external/algorithms/acts/include/algorithms/acts/TrackProjector.h
+
10
−
0
View file @
f3f8708a
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include
"Acts/EventData/MultiTrajectoryHelpers.hpp"
#include
"Acts/EventData/MultiTrajectoryHelpers.hpp"
// Event Model related classes
// Event Model related classes
#include
"edm4eic/EDM4eicVersion.h"
#include
"edm4eic/TrackerHitCollection.h"
#include
"edm4eic/TrackerHitCollection.h"
#include
"edm4eic/TrackParametersCollection.h"
#include
"edm4eic/TrackParametersCollection.h"
#include
"edm4eic/TrajectoryCollection.h"
#include
"edm4eic/TrajectoryCollection.h"
...
@@ -179,8 +180,17 @@ namespace Jug::Reco {
...
@@ -179,8 +180,17 @@ namespace Jug::Reco {
const
float
pathLength
=
static_cast
<
float
>
(
trackstate
.
pathLength
());
const
float
pathLength
=
static_cast
<
float
>
(
trackstate
.
pathLength
());
const
float
pathLengthError
=
0
;
const
float
pathLengthError
=
0
;
#if EDM4EIC_VERSION_MAJOR >= 3
uint64_t
surface
=
0
;
// trackstate.referenceSurface().geometryId().value(); FIXME - ASAN is not happy with this
uint32_t
system
=
0
;
#endif
// Store track point
// Store track point
track_segment
.
addToPoints
({
track_segment
.
addToPoints
({
#if EDM4EIC_VERSION_MAJOR >= 3
surface
,
system
,
#endif
position
,
position
,
positionError
,
positionError
,
momentum
,
momentum
,
...
...
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