Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DCT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
graintracking
DCT
Commits
3b4cf470
Commit
3b4cf470
authored
8 years ago
by
Nicola Vigano
Browse files
Options
Downloads
Patches
Plain Diff
6D-reconstruction: added few more statistics
Signed-off-by:
Nicola Vigano
<
nicola.vigano@esrf.fr
>
parent
c33aad56
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
zUtil_Deformation/Gt6DBlobReconstructor.m
+9
-2
9 additions, 2 deletions
zUtil_Deformation/Gt6DBlobReconstructor.m
with
9 additions
and
2 deletions
zUtil_Deformation/Gt6DBlobReconstructor.m
+
9
−
2
View file @
3b4cf470
...
...
@@ -43,6 +43,8 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector
self
.
statistics
.
add_task
(
'cp_dual_update_l1'
,
'CP Dual variable (l1) update'
);
self
.
statistics
.
add_task
(
'cp_dual_update_tv'
,
'CP Dual variable (TV) update'
);
self
.
statistics
.
add_task_partial
(
'cp_dual_update_tv'
,
'cp_dual_tv_reduction'
,
'Volumes reduction'
);
self
.
statistics
.
add_task_partial
(
'cp_dual_update_tv'
,
'cp_dual_tv_gradient'
,
'Gradient'
);
self
.
statistics
.
add_task_partial
(
'cp_dual_update_tv'
,
'cp_dual_tv_divergence'
,
'Divergence'
);
self
.
statistics
.
add_task
(
'cp_dual_update_ODF'
,
'CP Dual variable (ODF) update'
);
self
.
statistics
.
add_task_partial
(
'cp_dual_update_ODF'
,
'cp_dual_ODF_compute'
,
'Compute Reconstructed ODF'
);
self
.
statistics
.
add_task
(
'cp_primal_update'
,
'CP Primal variable update'
);
...
...
@@ -304,7 +306,9 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector
sES
=
sigma
*
gtMathsSumCellVolumes
(
new_enh_sol
);
self
.
statistics
.
add_timestamp
(
toc
(
c
),
'cp_dual_update_tv'
,
'cp_dual_tv_reduction'
);
c
=
tic
();
dsES
=
gtMathsGradient
(
sES
);
self
.
statistics
.
add_timestamp
(
toc
(
c
),
'cp_dual_update_tv'
,
'cp_dual_tv_gradient'
);
if
(
self
.
algo_ops_c_functions
)
q
=
gt6DUpdateDualTV_c
(
q
,
dsES
,
lambda
,
self
.
num_threads
);
...
...
@@ -315,7 +319,9 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector
end
end
c
=
tic
();
mdivq
=
-
gtMathsDivergence
(
q
);
self
.
statistics
.
add_timestamp
(
toc
(
c
),
'cp_dual_update_tv'
,
'cp_dual_tv_divergence'
);
end
function
p
=
update_dual_detector
(
self
,
p
,
proj_bls
,
sigma
,
sigma_1
)
...
...
@@ -360,8 +366,9 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector
function
[
curr_sol
,
curr_enh_sol
,
app_time
]
=
update_primal
(
self
,
curr_sol
,
curr_enh_sol
,
corr_tomo
,
corr_l1
,
tau
)
c
=
tic
();
if
(
self
.
algo_ops_c_functions
)
% We actually re-use the same allocated volumes, saving time and
% reducing problems with matlab's garbage collection
% We actually re-use the same allocated volumes, saving
% time and reducing problems with matlab's garbage
% collection
[
curr_sol
,
curr_enh_sol
]
=
gt6DUpdatePrimal_c
(
curr_sol
,
curr_enh_sol
,
corr_tomo
,
corr_l1
,
tau
,
self
.
num_threads
);
else
theta
=
1
;
...
...
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