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
b061d5ef
Commit
b061d5ef
authored
9 years ago
by
Nicola Vigano
Browse files
Options
Downloads
Patches
Plain Diff
FED's fwdproj: minor improvements
Signed-off-by:
Nicola Vigano
<
nicola.vigano@esrf.fr
>
parent
a0b38f1f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
7_fed2/gtFedFwdProjExact.m
+4
-4
4 additions, 4 deletions
7_fed2/gtFedFwdProjExact.m
7_fed2/gtFedTestLoadData_v2.m
+8
-6
8 additions, 6 deletions
7_fed2/gtFedTestLoadData_v2.m
with
12 additions
and
10 deletions
7_fed2/gtFedFwdProjExact.m
+
4
−
4
View file @
b061d5ef
...
...
@@ -92,8 +92,8 @@ function [gvb, bl] = gtFedFwdProjExact(gv, gvb, bl, fedpars, parameters, det_num
end
% Detector coordinates U,V in blob
bbort
=
bbor
(
ii
,
:)
'
;
ucbl
=
ucbl
-
bbort
(:,
ones
(
1
,
nv
));
bbor
_
t
=
bbor
(
ii
,
:)
'
;
ucbl
=
ucbl
-
bbor
_
t
(:,
ones
(
1
,
nv
));
% U,V shift relative to reference state
gvb
(
ii
)
.
ucd
=
ucbl
-
gvb
(
ii
)
.
uc0bl
-
gvb
(
ii
)
.
uc
;
...
...
@@ -109,8 +109,8 @@ function [gvb, bl] = gtFedFwdProjExact(gv, gvb, bl, fedpars, parameters, det_num
% This way of rounding is correct also for round values when mu=mod...
% is used above:
ul
=
floor
(
ucbl
);
% lower pixel indices
uh
=
ul
+
1
;
% higher pixel indices
ul
=
floor
(
ucbl
);
% lower pixel indices
uh
=
ul
+
1
;
% higher pixel indices
% uvw indices of 8 nearest neighbours (3xnx8)
ucbl8
=
[
ul
,
...
...
...
This diff is collapsed.
Click to expand it.
7_fed2/gtFedTestLoadData_v2.m
+
8
−
6
View file @
b061d5ef
...
...
@@ -290,11 +290,12 @@ for n = 1:num_dets
%%% Preallocate blob volumes
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
maxdiag
=
ceil
(
sqrt
(
grenv
*
grenv
'
));
dim_u
=
ceil
(
mean
(
grenv
(
1
:
2
)
.*
recgeo
(
1
)
.
voxsize
(
1
:
2
)
.
/
recgeo
(
n
)
.
voxsize
(
1
:
2
)));
dim_v
=
ceil
(
grenv
(
3
)
.*
recgeo
(
1
)
.
voxsize
(
3
)
.
/
recgeo
(
n
)
.
voxsize
(
3
));
for
ii
=
1
:
nbl
% Bounding box sizes and boundaries for processing
bl
(
ii
)
.
bbsize
=
[
maxdiag
,
maxdiag
,
2
]
+
2
*
bl
(
ii
)
.
addbl
;
bl
(
ii
)
.
bbsize
=
[
dim_u
,
dim_v
,
2
]
+
2
*
bl
(
ii
)
.
addbl
;
im_low_lims
=
round
(
bl
(
ii
)
.
u0im
-
bl
(
ii
)
.
bbsize
/
2
);
bl
(
ii
)
.
bbuim
=
[
im_low_lims
(
1
),
im_low_lims
(
1
)
+
bl
(
ii
)
.
bbsize
(
1
)
-
1
];
...
...
@@ -302,11 +303,12 @@ for n = 1:num_dets
bl
(
ii
)
.
bbwim
=
[
im_low_lims
(
3
),
im_low_lims
(
3
)
+
bl
(
ii
)
.
bbsize
(
3
)
-
1
];
% Blob origin and center [u, v, w]:
bl
(
ii
)
.
bbor
=
[
bl
(
ii
)
.
bbuim
(
1
)
-
1
,
bl
(
ii
)
.
bbvim
(
1
)
-
1
,
bl
(
ii
)
.
bbwim
(
1
)
-
1
]
;
bl
(
ii
)
.
bbor
=
[
bl
(
ii
)
.
bbuim
(
1
),
bl
(
ii
)
.
bbvim
(
1
),
bl
(
ii
)
.
bbwim
(
1
)
]
-
1
;
bl
(
ii
)
.
bbcent
=
[
round
(
(
bl
(
ii
)
.
bbuim
(
1
)
+
bl
(
ii
)
.
bbuim
(
2
))/
2
),
...
round
(
(
bl
(
ii
)
.
bbvim
(
1
)
+
bl
(
ii
)
.
bbvim
(
2
))/
2
),
...
round
(
(
bl
(
ii
)
.
bbwim
(
1
)
+
bl
(
ii
)
.
bbwim
(
2
))/
2
)
];
bl
(
ii
)
.
bbcent
=
[
...
round
(
(
bl
(
ii
)
.
bbuim
(
1
)
+
bl
(
ii
)
.
bbuim
(
2
))/
2
),
...
round
(
(
bl
(
ii
)
.
bbvim
(
1
)
+
bl
(
ii
)
.
bbvim
(
2
))/
2
),
...
round
(
(
bl
(
ii
)
.
bbwim
(
1
)
+
bl
(
ii
)
.
bbwim
(
2
))/
2
)
];
% Projection parameters
bl
(
ii
)
.
proj_geom
=
gtGeoProjForReconstruction
(
...
...
...
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