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
f980d9a5
Commit
f980d9a5
authored
8 years ago
by
Nicola Vigano
Browse files
Options
Downloads
Patches
Plain Diff
gtShowFsim: fixed bug related to the recent changes in fwd_sim datastructure
Signed-off-by:
Nicola Vigano
<
nicola.vigano@esrf.fr
>
parent
23cefd06
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_ForwardSim/gtShowFsim.m
+5
-4
5 additions, 4 deletions
zUtil_ForwardSim/gtShowFsim.m
with
5 additions
and
4 deletions
zUtil_ForwardSim/gtShowFsim.m
+
5
−
4
View file @
f980d9a5
...
...
@@ -72,13 +72,14 @@ if (~isfield(grain, 'fwd_sim')) % for older versions of forward simulation
grain
.
fwd_sim
(
app
.
det_index
)
.
check
=
grain
.
check
;
grain
.
fwd_sim
(
app
.
det_index
)
.
flag
=
grain
.
flag
;
grain
.
fwd_sim
(
app
.
det_index
)
.
difspotID
=
grain
.
spotid
(
grain
.
proj
(
app
.
det_index
)
.
included
);
grain
.
fwd_sim
(
app
.
det_index
)
.
uvw
=
[
grain
.
uv_exp
,
grain
.
om_exp
];
elseif
(
~
isfield
(
grain
.
fwd_sim
,
'difspotID'
))
if
(
isfield
(
grain
,
'difspotidA'
)
&&
isfield
(
grain
,
'difspotidB'
))
grain
.
fwd_sim
(
app
.
det_index
)
.
difspotID
=
[
grain
.
difspotidA
,
grain
.
difspotidB
];
else
grain
.
fwd_sim
(
app
.
det_index
)
.
difspotID
=
grain
.
spotid
(
grain
.
proj
(
app
.
det_index
)
.
included
);
end
elseif
(
~
isfield
(
grain
,
'difspotID'
))
elseif
(
~
isfield
(
grain
.
fwd_sim
,
'difspotID'
))
gtError
(
''
,
'Missing field
''
difspotID
''
in grain... Quitting'
)
end
...
...
@@ -101,7 +102,7 @@ end
if
(
~
isfield
(
grain
,
'full'
)
||
isempty
(
grain
.
full
))
if
(
isfield
(
grain
,
'fwd_sim'
))
bb
=
grain
.
fwd_sim
(
app
.
det_index
)
.
bb
(
grain
.
proj
(
app
.
det_index
)
.
included
,
:)
;
bb
=
grain
.
fwd_sim
(
app
.
det_index
)
.
bb
;
else
bb
=
grain
.
bb_exp
;
end
...
...
@@ -1148,7 +1149,7 @@ if (strcmpi(get(h_fig, 'SelectionType'), 'normal'))
% finds in the DB intersection btw centroid XYImage and fsim candidate
% positions (xyz) using tolerances passed by tol
if
(
isfield
(
grain
,
'fwd_sim'
))
uvw_exp
=
grain
.
fwd_sim
(
det_index
)
.
uvw
(
grain
.
proj
(
det_index
)
.
included
,
:)
;
uvw_exp
=
grain
.
fwd_sim
(
det_index
)
.
uvw
;
else
uvw_exp
=
[
grain
.
uv_exp
,
grain
.
om_exp
];
end
...
...
@@ -1588,7 +1589,7 @@ function sfUpdateFullImage(hObj, ~)
% get correspondng bbox from DB
if
(
isfield
(
grain
,
'fwd_sim'
))
bb
=
grain
.
fwd_sim
(
det_index
)
.
bb
(
included
,
:)
;
bb
=
grain
.
fwd_sim
(
det_index
)
.
bb
;
ids
=
grain
.
fwd_sim
(
det_index
)
.
difspotID
;
else
bb
=
grain
.
bb_exp
;
...
...
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