Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
The container registry cleanup task is now completed and the registry can be used normally.
Open sidebar
IP
elsa
Commits
4a22dac6
Commit
4a22dac6
authored
Sep 06, 2019
by
Nikola Dinev
Browse files
Removed dead code, comment fix
parent
38bbacfd
Pipeline
#151962
passed with stages
in 1 minute and 6 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
elsa/projectors/JosephsMethod.h
View file @
4a22dac6
...
...
@@ -59,10 +59,10 @@ namespace elsa
~
JosephsMethod
()
=
default
;
protected:
/// apply
the binary
method (i.e. forward projection)
/// apply
Joseph's
method (i.e. forward projection)
void
_apply
(
const
DataContainer
<
data_t
>&
x
,
DataContainer
<
data_t
>&
Ax
)
override
;
/// apply the adjoint of
the binary
method (i.e. backward projection)
/// apply the adjoint of
Joseph's
method (i.e. backward projection)
void
_applyAdjoint
(
const
DataContainer
<
data_t
>&
y
,
DataContainer
<
data_t
>&
Aty
)
override
;
/// implement the polymorphic clone operation
...
...
elsa/projectors/TraverseAABB.cpp
View file @
4a22dac6
...
...
@@ -99,19 +99,7 @@ namespace elsa
RealVector_t
lowerCorner
=
_entryPoint
.
array
().
floor
();
lowerCorner
=
((
lowerCorner
.
array
()
==
_entryPoint
.
array
())
&&
(
_stepDirection
.
array
()
<
0.0
)).
select
(
lowerCorner
.
array
()
-
1
,
lowerCorner
);
// --> Don't use ceil, as it will not always yield the upper corner
// e.g. if hit point is (0,0). Ceil will yield (0,0), and we want (1,1)
RealVector_t
upperCorner
=
lowerCorner
.
array
()
+
1.
;
RealVector_t
distToUpperCorner
=
(
_entryPoint
-
upperCorner
).
cwiseAbs
();
RealVector_t
distToLowerCorner
=
(
_entryPoint
-
lowerCorner
).
cwiseAbs
();
// --> Is a ray is parallel to an axis and are we really close to the next Voxel?
// auto condition = ((rd.array() == 1.0) && (distToUpperCorner.array() < NEXT_VOXEL_THRESHOLD)) ||
// ((rd.array() == -1.0) && (distToLowerCorner.array() < NEXT_VOXEL_THRESHOLD));
// --> If ray is parallel and we are close, choose the next previous/next voxel
_currentPos
=
lowerCorner
;
// + condition.select(_stepDirection.template cast<real_t>(), 0);
_currentPos
=
lowerCorner
;
// check if we are still inside the aabb
if
((
_currentPos
.
array
()
>=
_aabb
.
_max
.
array
()).
any
()
||
(
_currentPos
.
array
()
<
_aabb
.
_min
.
array
()).
any
())
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment