Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
calypso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
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
Show more breadcrumbs
Charlotte Cavanagh
calypso
Commits
d77ec771
Commit
d77ec771
authored
1 year ago
by
Tobias Bockh
Browse files
Options
Downloads
Patches
Plain Diff
comment out unused variables, to fix compiler warnings
parent
3d4b8e0f
No related branches found
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
+14
-14
14 additions, 14 deletions
Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
with
14 additions
and
14 deletions
Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
+
14
−
14
View file @
d77ec771
...
@@ -45,7 +45,7 @@ StatusCode KalmanFitterTool::finalize() {
...
@@ -45,7 +45,7 @@ StatusCode KalmanFitterTool::finalize() {
std
::
vector
<
TSOS4Residual
>
std
::
vector
<
TSOS4Residual
>
KalmanFitterTool
::
getUnbiasedResidual
(
const
EventContext
&
ctx
,
const
Acts
::
GeometryContext
&
gctx
,
KalmanFitterTool
::
getUnbiasedResidual
(
const
EventContext
&
ctx
,
const
Acts
::
GeometryContext
&
gctx
,
Trk
::
Track
*
inputTrack
,
double
clusz
,
const
Acts
::
BoundVector
&
inputVector
,
Trk
::
Track
*
inputTrack
,
double
clusz
,
const
Acts
::
BoundVector
&
inputVector
,
bool
isMC
,
double
origin
)
const
{
bool
/*
isMC
*/
,
double
origin
)
const
{
std
::
vector
<
TSOS4Residual
>
resi
;
std
::
vector
<
TSOS4Residual
>
resi
;
resi
.
clear
();
resi
.
clear
();
std
::
vector
<
FaserActsRecMultiTrajectory
>
myTrajectories
;
std
::
vector
<
FaserActsRecMultiTrajectory
>
myTrajectories
;
...
@@ -126,14 +126,14 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
...
@@ -126,14 +126,14 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
state
.
referenceSurface
().
getSharedPtr
(),
state
.
referenceSurface
().
getSharedPtr
(),
state
.
smoothed
(),
state
.
smoothed
(),
state
.
smoothedCovariance
());
state
.
smoothedCovariance
());
auto
covariance
=
state
.
smoothedCovariance
();
//
auto covariance = state.smoothedCovariance();
auto
H
=
state
.
effectiveProjector
();
auto
H
=
state
.
effectiveProjector
();
auto
residual
=
state
.
effectiveCalibrated
()
-
H
*
state
.
smoothed
();
auto
residual
=
state
.
effectiveCalibrated
()
-
H
*
state
.
smoothed
();
const
Tracker
::
FaserSCT_Cluster
*
cluster
=
state
.
uncalibrated
().
hit
();
const
Tracker
::
FaserSCT_Cluster
*
cluster
=
state
.
uncalibrated
().
hit
();
const
auto
&
surface
=
state
.
referenceSurface
();
//
const auto& surface = state.referenceSurface();
Acts
::
BoundVector
meas
=
state
.
projector
().
transpose
()
*
state
.
calibrated
();
Acts
::
BoundVector
meas
=
state
.
projector
().
transpose
()
*
state
.
calibrated
();
Acts
::
Vector2
local
(
meas
[
Acts
::
eBoundLoc0
],
meas
[
Acts
::
eBoundLoc1
]);
Acts
::
Vector2
local
(
meas
[
Acts
::
eBoundLoc0
],
meas
[
Acts
::
eBoundLoc1
]);
const
Acts
::
Vector3
dir
=
Acts
::
makeDirectionUnitFromPhiTheta
(
meas
[
Acts
::
eBoundPhi
],
meas
[
Acts
::
eBoundTheta
]);
//
const Acts::Vector3 dir = Acts::makeDirectionUnitFromPhiTheta(meas[Acts::eBoundPhi], meas[Acts::eBoundTheta]);
resi
.
push_back
({
local
.
x
(),
local
.
y
(),
parameter
.
position
(
gctx
).
x
(),
parameter
.
position
(
gctx
).
y
(),
parameter
.
position
(
gctx
).
z
(),
cluster
,
residual
(
Acts
::
eBoundLoc0
),
parameter
});
resi
.
push_back
({
local
.
x
(),
local
.
y
(),
parameter
.
position
(
gctx
).
x
(),
parameter
.
position
(
gctx
).
y
(),
parameter
.
position
(
gctx
).
z
(),
cluster
,
residual
(
Acts
::
eBoundLoc0
),
parameter
});
ATH_MSG_DEBUG
(
" residual/global position: "
<<
residual
(
Acts
::
eBoundLoc0
)
<<
" "
<<
parameter
.
position
(
gctx
).
x
()
<<
" "
<<
parameter
.
position
(
gctx
).
y
()
<<
" "
<<
parameter
.
position
(
gctx
).
z
());
ATH_MSG_DEBUG
(
" residual/global position: "
<<
residual
(
Acts
::
eBoundLoc0
)
<<
" "
<<
parameter
.
position
(
gctx
).
x
()
<<
" "
<<
parameter
.
position
(
gctx
).
y
()
<<
" "
<<
parameter
.
position
(
gctx
).
z
());
}
}
...
@@ -155,8 +155,8 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
...
@@ -155,8 +155,8 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
//
//
std
::
vector
<
TSOS4Residual
>
std
::
vector
<
TSOS4Residual
>
KalmanFitterTool
::
getUnbiasedResidual
(
const
EventContext
&
ctx
,
const
Acts
::
GeometryContext
&
gctx
,
KalmanFitterTool
::
getUnbiasedResidual
(
const
EventContext
&
ctx
,
const
Acts
::
GeometryContext
&
gctx
,
Trk
::
Track
*
inputTrack
,
const
Acts
::
BoundVector
&
inputVector
,
Trk
::
Track
*
inputTrack
,
const
Acts
::
BoundVector
&
/*
inputVector
*/
,
bool
isMC
,
double
origin
,
std
::
vector
<
const
Tracker
::
FaserSCT_Cluster
*>&
clusters
,
const
Acts
::
BoundTrackParameters
ini_Param
)
const
{
bool
/*
isMC
*/
,
double
origin
,
std
::
vector
<
const
Tracker
::
FaserSCT_Cluster
*>&
clusters
,
const
Acts
::
BoundTrackParameters
ini_Param
)
const
{
std
::
vector
<
TSOS4Residual
>
resi
;
std
::
vector
<
TSOS4Residual
>
resi
;
resi
.
clear
();
resi
.
clear
();
std
::
vector
<
FaserActsRecMultiTrajectory
>
myTrajectories
;
std
::
vector
<
FaserActsRecMultiTrajectory
>
myTrajectories
;
...
@@ -232,14 +232,14 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
...
@@ -232,14 +232,14 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
state
.
referenceSurface
().
getSharedPtr
(),
state
.
referenceSurface
().
getSharedPtr
(),
state
.
smoothed
(),
state
.
smoothed
(),
state
.
smoothedCovariance
());
state
.
smoothedCovariance
());
auto
covariance
=
state
.
smoothedCovariance
();
//
auto covariance = state.smoothedCovariance();
auto
H
=
state
.
effectiveProjector
();
auto
H
=
state
.
effectiveProjector
();
auto
residual
=
state
.
effectiveCalibrated
()
-
H
*
state
.
smoothed
();
auto
residual
=
state
.
effectiveCalibrated
()
-
H
*
state
.
smoothed
();
const
Tracker
::
FaserSCT_Cluster
*
cluster
=
state
.
uncalibrated
().
hit
();
const
Tracker
::
FaserSCT_Cluster
*
cluster
=
state
.
uncalibrated
().
hit
();
const
auto
&
surface
=
state
.
referenceSurface
();
//
const auto& surface = state.referenceSurface();
Acts
::
BoundVector
meas
=
state
.
projector
().
transpose
()
*
state
.
calibrated
();
Acts
::
BoundVector
meas
=
state
.
projector
().
transpose
()
*
state
.
calibrated
();
Acts
::
Vector2
local
(
meas
[
Acts
::
eBoundLoc0
],
meas
[
Acts
::
eBoundLoc1
]);
Acts
::
Vector2
local
(
meas
[
Acts
::
eBoundLoc0
],
meas
[
Acts
::
eBoundLoc1
]);
const
Acts
::
Vector3
dir
=
Acts
::
makeDirectionUnitFromPhiTheta
(
meas
[
Acts
::
eBoundPhi
],
meas
[
Acts
::
eBoundTheta
]);
//
const Acts::Vector3 dir = Acts::makeDirectionUnitFromPhiTheta(meas[Acts::eBoundPhi], meas[Acts::eBoundTheta]);
resi
.
push_back
({
local
.
x
(),
local
.
y
(),
parameter
.
position
(
gctx
).
x
(),
parameter
.
position
(
gctx
).
y
(),
parameter
.
position
(
gctx
).
z
(),
cluster
,
residual
(
Acts
::
eBoundLoc0
),
parameter
});
resi
.
push_back
({
local
.
x
(),
local
.
y
(),
parameter
.
position
(
gctx
).
x
(),
parameter
.
position
(
gctx
).
y
(),
parameter
.
position
(
gctx
).
z
(),
cluster
,
residual
(
Acts
::
eBoundLoc0
),
parameter
});
}
}
return
true
;
return
true
;
...
@@ -261,7 +261,7 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
...
@@ -261,7 +261,7 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
std
::
vector
<
TSOS4Residual
>
std
::
vector
<
TSOS4Residual
>
KalmanFitterTool
::
getUnbiasedResidual
(
const
EventContext
&
ctx
,
const
Acts
::
GeometryContext
&
gctx
,
KalmanFitterTool
::
getUnbiasedResidual
(
const
EventContext
&
ctx
,
const
Acts
::
GeometryContext
&
gctx
,
Trk
::
Track
*
inputTrack
,
const
Acts
::
BoundVector
&
inputVector
,
Trk
::
Track
*
inputTrack
,
const
Acts
::
BoundVector
&
inputVector
,
bool
isMC
,
double
origin
)
const
{
bool
/*
isMC
*/
,
double
origin
)
const
{
std
::
vector
<
TSOS4Residual
>
resi
;
std
::
vector
<
TSOS4Residual
>
resi
;
resi
.
clear
();
resi
.
clear
();
std
::
vector
<
FaserActsRecMultiTrajectory
>
myTrajectories
;
std
::
vector
<
FaserActsRecMultiTrajectory
>
myTrajectories
;
...
@@ -339,14 +339,14 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
...
@@ -339,14 +339,14 @@ KalmanFitterTool::getUnbiasedResidual(const EventContext &ctx, const Acts::Geome
state
.
referenceSurface
().
getSharedPtr
(),
state
.
referenceSurface
().
getSharedPtr
(),
state
.
smoothed
(),
state
.
smoothed
(),
state
.
smoothedCovariance
());
state
.
smoothedCovariance
());
auto
covariance
=
state
.
smoothedCovariance
();
//
auto covariance = state.smoothedCovariance();
auto
H
=
state
.
effectiveProjector
();
auto
H
=
state
.
effectiveProjector
();
auto
residual
=
state
.
effectiveCalibrated
()
-
H
*
state
.
smoothed
();
auto
residual
=
state
.
effectiveCalibrated
()
-
H
*
state
.
smoothed
();
const
Tracker
::
FaserSCT_Cluster
*
cluster
=
state
.
uncalibrated
().
hit
();
const
Tracker
::
FaserSCT_Cluster
*
cluster
=
state
.
uncalibrated
().
hit
();
const
auto
&
surface
=
state
.
referenceSurface
();
//
const auto& surface = state.referenceSurface();
Acts
::
BoundVector
meas
=
state
.
projector
().
transpose
()
*
state
.
calibrated
();
Acts
::
BoundVector
meas
=
state
.
projector
().
transpose
()
*
state
.
calibrated
();
Acts
::
Vector2
local
(
meas
[
Acts
::
eBoundLoc0
],
meas
[
Acts
::
eBoundLoc1
]);
Acts
::
Vector2
local
(
meas
[
Acts
::
eBoundLoc0
],
meas
[
Acts
::
eBoundLoc1
]);
const
Acts
::
Vector3
dir
=
Acts
::
makeDirectionUnitFromPhiTheta
(
meas
[
Acts
::
eBoundPhi
],
meas
[
Acts
::
eBoundTheta
]);
//
const Acts::Vector3 dir = Acts::makeDirectionUnitFromPhiTheta(meas[Acts::eBoundPhi], meas[Acts::eBoundTheta]);
resi
.
push_back
({
local
.
x
(),
local
.
y
(),
parameter
.
position
(
gctx
).
x
(),
parameter
.
position
(
gctx
).
y
(),
parameter
.
position
(
gctx
).
z
(),
cluster
,
residual
(
Acts
::
eBoundLoc0
),
parameter
});
resi
.
push_back
({
local
.
x
(),
local
.
y
(),
parameter
.
position
(
gctx
).
x
(),
parameter
.
position
(
gctx
).
y
(),
parameter
.
position
(
gctx
).
z
(),
cluster
,
residual
(
Acts
::
eBoundLoc0
),
parameter
});
}
}
return
true
;
return
true
;
...
@@ -550,7 +550,7 @@ KalmanFitterTool::getMeasurementsFromTrack(Trk::Track *track, std::vector<const
...
@@ -550,7 +550,7 @@ KalmanFitterTool::getMeasurementsFromTrack(Trk::Track *track, std::vector<const
}
}
std
::
tuple
<
std
::
vector
<
IndexSourceLink
>
,
std
::
vector
<
Measurement
>>
std
::
tuple
<
std
::
vector
<
IndexSourceLink
>
,
std
::
vector
<
Measurement
>>
KalmanFitterTool
::
getMeasurementsFromTrack
(
Trk
::
Track
*
track
,
Identifier
&
wafer_id
)
const
{
KalmanFitterTool
::
getMeasurementsFromTrack
(
Trk
::
Track
*
track
,
Identifier
&
/*
wafer_id
*/
)
const
{
const
int
kSize
=
1
;
const
int
kSize
=
1
;
std
::
array
<
Acts
::
BoundIndices
,
kSize
>
Indices
=
{
Acts
::
eBoundLoc0
};
std
::
array
<
Acts
::
BoundIndices
,
kSize
>
Indices
=
{
Acts
::
eBoundLoc0
};
using
ThisMeasurement
=
Acts
::
Measurement
<
IndexSourceLink
,
Acts
::
BoundIndices
,
kSize
>
;
using
ThisMeasurement
=
Acts
::
Measurement
<
IndexSourceLink
,
Acts
::
BoundIndices
,
kSize
>
;
...
...
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